Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
cbdc7888
Commit
cbdc7888
authored
6 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Temporary update to the EAGLE cooling function signatures in preparation for the actual merge.
parent
465f6eb6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/cooling/EAGLE/cooling.h
+6
-2
6 additions, 2 deletions
src/cooling/EAGLE/cooling.h
src/cooling/EAGLE/cooling_io.h
+4
-4
4 additions, 4 deletions
src/cooling/EAGLE/cooling_io.h
with
10 additions
and
6 deletions
src/cooling/EAGLE/cooling.h
+
6
−
2
View file @
cbdc7888
...
@@ -54,8 +54,10 @@ __attribute__((always_inline)) INLINE static void cooling_cool_part(
...
@@ -54,8 +54,10 @@ __attribute__((always_inline)) INLINE static void cooling_cool_part(
const
struct
phys_const
*
restrict
phys_const
,
const
struct
phys_const
*
restrict
phys_const
,
const
struct
unit_system
*
restrict
us
,
const
struct
unit_system
*
restrict
us
,
const
struct
cosmology
*
restrict
cosmo
,
const
struct
cosmology
*
restrict
cosmo
,
const
struct
hydro_props
*
hydro_props
,
const
struct
cooling_function_data
*
restrict
cooling
,
const
struct
cooling_function_data
*
restrict
cooling
,
struct
part
*
restrict
p
,
struct
xpart
*
restrict
xp
,
float
dt
)
{}
struct
part
*
restrict
p
,
struct
xpart
*
restrict
xp
,
const
float
dt
,
const
float
dt_therm
)
{}
/**
/**
* @brief Computes the cooling time-step.
* @brief Computes the cooling time-step.
...
@@ -70,7 +72,9 @@ __attribute__((always_inline)) INLINE static float cooling_timestep(
...
@@ -70,7 +72,9 @@ __attribute__((always_inline)) INLINE static float cooling_timestep(
const
struct
cooling_function_data
*
restrict
cooling
,
const
struct
cooling_function_data
*
restrict
cooling
,
const
struct
phys_const
*
restrict
phys_const
,
const
struct
phys_const
*
restrict
phys_const
,
const
struct
cosmology
*
restrict
cosmo
,
const
struct
cosmology
*
restrict
cosmo
,
const
struct
unit_system
*
restrict
us
,
const
struct
part
*
restrict
p
)
{
const
struct
unit_system
*
restrict
us
,
const
struct
hydro_props
*
hydro_props
,
const
struct
part
*
restrict
p
,
const
struct
xpart
*
restrict
xp
)
{
return
FLT_MAX
;
return
FLT_MAX
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/cooling/EAGLE/cooling_io.h
+
4
−
4
View file @
cbdc7888
...
@@ -28,13 +28,13 @@
...
@@ -28,13 +28,13 @@
#ifdef HAVE_HDF5
#ifdef HAVE_HDF5
/**
/**
* @brief Writes the current model of
SPH
to the file
* @brief Writes the current model of
cooling
to the file
* @param h_grp
sph
The HDF5 group in which to write
* @param h_grp The HDF5 group in which to write
*/
*/
__attribute__
((
always_inline
))
INLINE
static
void
cooling_write_flavour
(
__attribute__
((
always_inline
))
INLINE
static
void
cooling_write_flavour
(
hid_t
h_grp
sph
)
{
hid_t
h_grp
,
const
struct
cooling_function_data
*
cooling
)
{
io_write_attribute_s
(
h_grp
sph
,
"Cooling Model"
,
"EAGLE"
);
io_write_attribute_s
(
h_grp
,
"Cooling Model"
,
"EAGLE"
);
}
}
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment