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
8586ddbb
Commit
8586ddbb
authored
6 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Add the Temperature to the output of the particles in the EAGLE cooling model.
parent
9b4f1c0f
No related branches found
No related tags found
1 merge request
!697
Add functions to calculate temperature of particles.
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/cooling/EAGLE/cooling_io.h
+15
-2
15 additions, 2 deletions
src/cooling/EAGLE/cooling_io.h
src/parallel_io.c
+5
-4
5 additions, 4 deletions
src/parallel_io.c
src/serial_io.c
+5
-4
5 additions, 4 deletions
src/serial_io.c
src/single_io.c
+5
-4
5 additions, 4 deletions
src/single_io.c
with
30 additions
and
14 deletions
src/cooling/EAGLE/cooling_io.h
+
15
−
2
View file @
8586ddbb
...
...
@@ -23,6 +23,7 @@
#include
"../config.h"
/* Local includes */
#include
"cooling.h"
#include
"io_properties.h"
#ifdef HAVE_HDF5
...
...
@@ -40,9 +41,17 @@ __attribute__((always_inline)) INLINE static void cooling_write_flavour(
}
#endif
INLINE
static
void
convert_part_T
(
const
struct
engine
*
e
,
const
struct
part
*
p
,
const
struct
xpart
*
xp
,
float
*
ret
)
{
ret
[
0
]
=
cooling_get_temperature
(
e
->
physical_constants
,
e
->
internal_units
,
e
->
cosmology
,
e
->
cooling_func
,
p
,
xp
);
}
/**
* @brief Specifies which particle fields to write to a dataset
*
* @param parts The particle array.
* @param xparts The extended data particle array.
* @param list The list of i/o properties to write.
* @param cooling The #cooling_function_data
...
...
@@ -50,9 +59,13 @@ __attribute__((always_inline)) INLINE static void cooling_write_flavour(
* @return Returns the number of fields to write.
*/
__attribute__
((
always_inline
))
INLINE
static
int
cooling_write_particles
(
const
struct
xpart
*
xparts
,
struct
io_props
*
list
,
const
struct
part
*
parts
,
const
struct
xpart
*
xparts
,
struct
io_props
*
list
,
const
struct
cooling_function_data
*
cooling
)
{
return
0
;
list
[
0
]
=
io_make_output_field_convert_part
(
"Temperature"
,
FLOAT
,
1
,
UNIT_CONV_TEMPERATURE
,
parts
,
xparts
,
convert_part_T
);
return
1
;
}
#endif
/* SWIFT_COOLING_EAGLE_IO_H */
This diff is collapsed.
Click to expand it.
src/parallel_io.c
+
5
−
4
View file @
8586ddbb
...
...
@@ -1394,8 +1394,8 @@ void write_output_parallel(struct engine* e, const char* baseName,
Nparticles
=
Ngas
;
hydro_write_particles
(
parts
,
xparts
,
list
,
&
num_fields
);
num_fields
+=
chemistry_write_particles
(
parts
,
list
+
num_fields
);
num_fields
+=
cooling_write_particles
(
xparts
,
list
+
num_fields
,
e
->
cooling_func
);
num_fields
+=
cooling_write_particles
(
parts
,
xparts
,
list
+
num_fields
,
e
->
cooling_func
);
}
else
{
/* Ok, we need to fish out the particles we want */
...
...
@@ -1418,8 +1418,9 @@ void write_output_parallel(struct engine* e, const char* baseName,
&
num_fields
);
num_fields
+=
chemistry_write_particles
(
parts_written
,
list
+
num_fields
);
num_fields
+=
cooling_write_particles
(
xparts_written
,
list
+
num_fields
,
e
->
cooling_func
);
num_fields
+=
cooling_write_particles
(
parts_written
,
xparts_written
,
list
+
num_fields
,
e
->
cooling_func
);
}
}
break
;
...
...
This diff is collapsed.
Click to expand it.
src/serial_io.c
+
5
−
4
View file @
8586ddbb
...
...
@@ -1071,8 +1071,8 @@ void write_output_serial(struct engine* e, const char* baseName,
Nparticles
=
Ngas
;
hydro_write_particles
(
parts
,
xparts
,
list
,
&
num_fields
);
num_fields
+=
chemistry_write_particles
(
parts
,
list
+
num_fields
);
num_fields
+=
cooling_write_particles
(
xparts
,
list
+
num_fields
,
e
->
cooling_func
);
num_fields
+=
cooling_write_particles
(
parts
,
xparts
,
list
+
num_fields
,
e
->
cooling_func
);
}
else
{
/* Ok, we need to fish out the particles we want */
...
...
@@ -1095,8 +1095,9 @@ void write_output_serial(struct engine* e, const char* baseName,
&
num_fields
);
num_fields
+=
chemistry_write_particles
(
parts_written
,
list
+
num_fields
);
num_fields
+=
cooling_write_particles
(
xparts_written
,
list
+
num_fields
,
e
->
cooling_func
);
num_fields
+=
cooling_write_particles
(
parts_written
,
xparts_written
,
list
+
num_fields
,
e
->
cooling_func
);
}
}
break
;
...
...
This diff is collapsed.
Click to expand it.
src/single_io.c
+
5
−
4
View file @
8586ddbb
...
...
@@ -890,8 +890,8 @@ void write_output_single(struct engine* e, const char* baseName,
N
=
Ngas
;
hydro_write_particles
(
parts
,
xparts
,
list
,
&
num_fields
);
num_fields
+=
chemistry_write_particles
(
parts
,
list
+
num_fields
);
num_fields
+=
cooling_write_particles
(
xparts
,
list
+
num_fields
,
e
->
cooling_func
);
num_fields
+=
cooling_write_particles
(
parts
,
xparts
,
list
+
num_fields
,
e
->
cooling_func
);
}
else
{
/* Ok, we need to fish out the particles we want */
...
...
@@ -914,8 +914,9 @@ void write_output_single(struct engine* e, const char* baseName,
&
num_fields
);
num_fields
+=
chemistry_write_particles
(
parts_written
,
list
+
num_fields
);
num_fields
+=
cooling_write_particles
(
xparts_written
,
list
+
num_fields
,
e
->
cooling_func
);
num_fields
+=
cooling_write_particles
(
parts_written
,
xparts_written
,
list
+
num_fields
,
e
->
cooling_func
);
}
}
break
;
...
...
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