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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
e2b65329
Commit
e2b65329
authored
Apr 26, 2018
by
lhausamm
Committed by
Loic Hausammann
Oct 8, 2018
Browse files
Options
Downloads
Patches
Plain Diff
Update grackle cooling with last grackle modifications
parent
82aa78b4
No related branches found
No related tags found
1 merge request
!629
Grackle update
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/cooling/grackle/cooling.h
+10
-17
10 additions, 17 deletions
src/cooling/grackle/cooling.h
with
10 additions
and
17 deletions
src/cooling/grackle/cooling.h
+
10
−
17
View file @
e2b65329
...
...
@@ -540,22 +540,12 @@ __attribute__((always_inline)) INLINE static gr_float cooling_rate(
/* solve chemistry */
chemistry_data
chemistry_grackle
=
cooling
->
chemistry
;
chemistry_data_storage
my_rates
=
grackle_rates
;
int
error_code
=
_solve_chemistry
(
&
chemistry_grackle
,
&
my_rates
,
&
units
,
dt
,
data
.
grid_dx
,
data
.
grid_rank
,
data
.
grid_dimension
,
data
.
grid_start
,
data
.
grid_end
,
data
.
density
,
data
.
internal_energy
,
data
.
x_velocity
,
data
.
y_velocity
,
data
.
z_velocity
,
data
.
HI_density
,
data
.
HII_density
,
data
.
HM_density
,
data
.
HeI_density
,
data
.
HeII_density
,
data
.
HeIII_density
,
data
.
H2I_density
,
data
.
H2II_density
,
data
.
DI_density
,
data
.
DII_density
,
data
.
HDI_density
,
data
.
e_density
,
data
.
metal_density
,
data
.
volumetric_heating_rate
,
data
.
specific_heating_rate
,
data
.
RT_heating_rate
,
data
.
RT_HI_ionization_rate
,
data
.
RT_HeI_ionization_rate
,
data
.
RT_HeII_ionization_rate
,
data
.
RT_H2_dissociation_rate
,
NULL
);
if
(
error_code
==
0
)
error
(
"Error in solve_chemistry."
);
// if (solve_chemistry(&units, &data, dt) == 0) {
// error("Error in solve_chemistry.");
//}
chemistry_data_storage
chemistry_rates
=
grackle_rates
;
if
(
local_solve_chemistry
(
&
chemistry_grackle
,
&
chemistry_rates
,
&
units
,
&
data
,
dt
)
==
0
)
{
error
(
"Error in solve_chemistry."
);
}
/* copy from grackle data to particle */
cooling_copy_from_grackle
(
data
,
p
,
xp
,
density
);
...
...
@@ -623,7 +613,10 @@ __attribute__((always_inline)) INLINE static gr_float cooling_time(
/* Compute cooling time */
gr_float
cooling_time
;
if
(
calculate_cooling_time
(
&
units
,
&
data
,
&
cooling_time
)
==
0
)
{
chemistry_data
chemistry_grackle
=
cooling
->
chemistry
;
chemistry_data_storage
chemistry_rates
=
grackle_rates
;
if
(
local_calculate_cooling_time
(
&
chemistry_grackle
,
&
chemistry_rates
,
&
units
,
&
data
,
&
cooling_time
)
==
0
)
{
error
(
"Error in calculate_cooling_time."
);
}
...
...
...
...
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
sign in
to comment