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
ff2cda49
Commit
ff2cda49
authored
6 years ago
by
Folkert Nobels
Browse files
Options
Downloads
Patches
Plain Diff
Add star formation tracers to the gas particles
parent
e367b496
No related branches found
No related tags found
1 merge request
!705
Star formation following Schaye08
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure.ac
+2
-2
2 additions, 2 deletions
configure.ac
src/Makefile.am
+5
-2
5 additions, 2 deletions
src/Makefile.am
src/hydro/Gadget2/hydro_part.h
+4
-0
4 additions, 0 deletions
src/hydro/Gadget2/hydro_part.h
with
11 additions
and
4 deletions
configure.ac
+
2
−
2
View file @
ff2cda49
...
@@ -1603,10 +1603,10 @@ fi
...
@@ -1603,10 +1603,10 @@ fi
case "$with_sftracers" in
case "$with_sftracers" in
none)
none)
AC_DEFINE([TRACERS_NONE], [1], [No star formation tracers function])
AC_DEFINE([
SF
TRACERS_NONE], [1], [No star formation tracers function])
;;
;;
EAGLE)
EAGLE)
AC_DEFINE([TRACERS_EAGLE], [1], [Star Formation tracers taken from the EAGLE model])
AC_DEFINE([
SF
TRACERS_EAGLE], [1], [Star Formation tracers taken from the EAGLE model])
;;
;;
*)
*)
AC_MSG_ERROR([Unknown star formation tracers choice: $with_tracers])
AC_MSG_ERROR([Unknown star formation tracers choice: $with_tracers])
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
5
−
2
View file @
ff2cda49
...
@@ -49,7 +49,8 @@ include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \
...
@@ -49,7 +49,8 @@ include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \
gravity_softened_derivatives.h vector_power.h collectgroup.h hydro_space.h sort_part.h
\
gravity_softened_derivatives.h vector_power.h collectgroup.h hydro_space.h sort_part.h
\
chemistry.h chemistry_io.h chemistry_struct.h cosmology.h restart.h space_getsid.h utilities.h
\
chemistry.h chemistry_io.h chemistry_struct.h cosmology.h restart.h space_getsid.h utilities.h
\
mesh_gravity.h cbrt.h exp10.h velociraptor_interface.h swift_velociraptor_part.h outputlist.h
\
mesh_gravity.h cbrt.h exp10.h velociraptor_interface.h swift_velociraptor_part.h outputlist.h
\
logger_io.h tracers_io.h tracers.h tracers_struct.h
logger_io.h tracers_io.h tracers.h tracers_struct.h sftracers_io.h sftracers.h
\
sftracers_struct.h
# source files for EAGLE cooling
# source files for EAGLE cooling
EAGLE_COOLING_SOURCES
=
EAGLE_COOLING_SOURCES
=
...
@@ -168,7 +169,9 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h
...
@@ -168,7 +169,9 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h
tracers/none/tracers.h tracers/none/tracers_struct.h
\
tracers/none/tracers.h tracers/none/tracers_struct.h
\
tracers/none/tracers_io.h
\
tracers/none/tracers_io.h
\
tracers/EAGLE/tracers.h tracers/EAGLE/tracers_struct.h
\
tracers/EAGLE/tracers.h tracers/EAGLE/tracers_struct.h
\
tracers/EAGLE/tracers_io.h
tracers/EAGLE/tracers_io.h
\
sftracers/none/sftracers.h
sftracers/none/sftracers_struct.h
\
sftracers/none/sftracers_io.h
# Sources and flags for regular library
# Sources and flags for regular library
...
...
This diff is collapsed.
Click to expand it.
src/hydro/Gadget2/hydro_part.h
+
4
−
0
View file @
ff2cda49
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#include
"cooling_struct.h"
#include
"cooling_struct.h"
#include
"logger.h"
#include
"logger.h"
#include
"tracers_struct.h"
#include
"tracers_struct.h"
#include
"sftracers_struct.h"
/* Extra particle data not needed during the SPH loops over neighbours. */
/* Extra particle data not needed during the SPH loops over neighbours. */
struct
xpart
{
struct
xpart
{
...
@@ -60,6 +61,9 @@ struct xpart {
...
@@ -60,6 +61,9 @@ struct xpart {
/* Additional data used by the tracers */
/* Additional data used by the tracers */
struct
tracers_xpart_data
tracers_data
;
struct
tracers_xpart_data
tracers_data
;
/* Additional data used by the tracers */
struct
sftracers_xpart_data
sftracers_data
;
/* SFR label */
/* SFR label */
float
SFR
;
float
SFR
;
...
...
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