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
ead71400
Commit
ead71400
authored
4 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Update the other feedback scheme's function signatures
parent
26b6b5a0
No related branches found
No related tags found
1 merge request
!1199
Isotropic and other feedback modes
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/feedback/EAGLE/feedback_iact.h
+2
-0
2 additions, 0 deletions
src/feedback/EAGLE/feedback_iact.h
src/feedback/GEAR/feedback_iact.h
+7
-4
7 additions, 4 deletions
src/feedback/GEAR/feedback_iact.h
src/feedback/none/feedback_iact.h
+4
-0
4 additions, 0 deletions
src/feedback/none/feedback_iact.h
with
13 additions
and
4 deletions
src/feedback/EAGLE/feedback_iact.h
+
2
−
0
View file @
ead71400
...
@@ -36,6 +36,7 @@
...
@@ -36,6 +36,7 @@
* @param pj Second particle (not updated).
* @param pj Second particle (not updated).
* @param xpj Extra particle data (not updated).
* @param xpj Extra particle data (not updated).
* @param cosmo The cosmological model.
* @param cosmo The cosmological model.
* @param fb_props Properties of the feedback scheme.
* @param ti_current Current integer time value
* @param ti_current Current integer time value
*/
*/
__attribute__
((
always_inline
))
INLINE
static
void
__attribute__
((
always_inline
))
INLINE
static
void
...
@@ -181,6 +182,7 @@ runner_iact_nonsym_feedback_density(const float r2, const float *dx,
...
@@ -181,6 +182,7 @@ runner_iact_nonsym_feedback_density(const float r2, const float *dx,
* @param pj Second (gas) particle.
* @param pj Second (gas) particle.
* @param xpj Extra particle data
* @param xpj Extra particle data
* @param cosmo The cosmological model.
* @param cosmo The cosmological model.
* @param fb_props Properties of the feedback scheme.
* @param ti_current Current integer time used value for seeding random number
* @param ti_current Current integer time used value for seeding random number
* generator
* generator
*/
*/
...
...
This diff is collapsed.
Click to expand it.
src/feedback/GEAR/feedback_iact.h
+
7
−
4
View file @
ead71400
...
@@ -35,15 +35,16 @@
...
@@ -35,15 +35,16 @@
* @param pj Second particle (not updated).
* @param pj Second particle (not updated).
* @param xpj Extra particle data (not updated).
* @param xpj Extra particle data (not updated).
* @param cosmo The cosmological model.
* @param cosmo The cosmological model.
* @param fb_props Properties of the feedback scheme.
* @param ti_current Current integer time value
* @param ti_current Current integer time value
*/
*/
__attribute__
((
always_inline
))
INLINE
static
void
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_feedback_density
(
const
float
r2
,
const
float
*
dx
,
runner_iact_nonsym_feedback_density
(
const
float
r2
,
const
float
*
dx
,
const
float
hi
,
const
float
hj
,
const
float
hi
,
const
float
hj
,
struct
spart
*
restrict
si
,
struct
spart
*
si
,
const
struct
part
*
pj
,
const
struct
part
*
restrict
pj
,
const
struct
x
part
*
x
pj
,
const
struct
xpart
*
restrict
xpj
,
const
struct
cosmology
*
cosmo
,
const
struct
cosmology
*
restrict
cosmo
,
const
struct
feedback_props
*
fb_props
,
const
integertime_t
ti_current
)
{
const
integertime_t
ti_current
)
{
/* Get the gas mass. */
/* Get the gas mass. */
...
@@ -79,6 +80,7 @@ runner_iact_nonsym_feedback_density(const float r2, const float *dx,
...
@@ -79,6 +80,7 @@ runner_iact_nonsym_feedback_density(const float r2, const float *dx,
* @param pj Second (gas) particle.
* @param pj Second (gas) particle.
* @param xpj Extra particle data
* @param xpj Extra particle data
* @param cosmo The cosmological model.
* @param cosmo The cosmological model.
* @param fb_props Properties of the feedback scheme.
* @param ti_current Current integer time used value for seeding random number
* @param ti_current Current integer time used value for seeding random number
* generator
* generator
*/
*/
...
@@ -88,6 +90,7 @@ runner_iact_nonsym_feedback_apply(const float r2, const float *dx,
...
@@ -88,6 +90,7 @@ runner_iact_nonsym_feedback_apply(const float r2, const float *dx,
struct
spart
*
si
,
struct
part
*
pj
,
struct
spart
*
si
,
struct
part
*
pj
,
struct
xpart
*
xpj
,
struct
xpart
*
xpj
,
const
struct
cosmology
*
cosmo
,
const
struct
cosmology
*
cosmo
,
const
struct
feedback_props
*
fb_props
,
const
integertime_t
ti_current
)
{
const
integertime_t
ti_current
)
{
const
double
e_sn
=
si
->
feedback_data
.
energy_ejected
;
const
double
e_sn
=
si
->
feedback_data
.
energy_ejected
;
...
...
This diff is collapsed.
Click to expand it.
src/feedback/none/feedback_iact.h
+
4
−
0
View file @
ead71400
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
* @param pj Second particle (not updated).
* @param pj Second particle (not updated).
* @param xp Extra particle data (not updated).
* @param xp Extra particle data (not updated).
* @param cosmo The cosmological model.
* @param cosmo The cosmological model.
* @param fb_props Properties of the feedback scheme.
* @param ti_current Current integer time value
* @param ti_current Current integer time value
*/
*/
__attribute__
((
always_inline
))
INLINE
static
void
__attribute__
((
always_inline
))
INLINE
static
void
...
@@ -40,6 +41,7 @@ runner_iact_nonsym_feedback_density(const float r2, const float *dx,
...
@@ -40,6 +41,7 @@ runner_iact_nonsym_feedback_density(const float r2, const float *dx,
struct
spart
*
si
,
const
struct
part
*
pj
,
struct
spart
*
si
,
const
struct
part
*
pj
,
const
struct
xpart
*
xp
,
const
struct
xpart
*
xp
,
const
struct
cosmology
*
cosmo
,
const
struct
cosmology
*
cosmo
,
const
struct
feedback_props
*
fb_props
,
const
integertime_t
ti_current
)
{}
const
integertime_t
ti_current
)
{}
/**
/**
...
@@ -56,6 +58,7 @@ runner_iact_nonsym_feedback_density(const float r2, const float *dx,
...
@@ -56,6 +58,7 @@ runner_iact_nonsym_feedback_density(const float r2, const float *dx,
* @param pj Second (gas) particle.
* @param pj Second (gas) particle.
* @param xp Extra particle data
* @param xp Extra particle data
* @param cosmo The cosmological model.
* @param cosmo The cosmological model.
* @param fb_props Properties of the feedback scheme.
* @param ti_current Current integer time used value for seeding random number
* @param ti_current Current integer time used value for seeding random number
* generator
* generator
*/
*/
...
@@ -65,6 +68,7 @@ runner_iact_nonsym_feedback_apply(const float r2, const float *dx,
...
@@ -65,6 +68,7 @@ runner_iact_nonsym_feedback_apply(const float r2, const float *dx,
const
struct
spart
*
si
,
struct
part
*
pj
,
const
struct
spart
*
si
,
struct
part
*
pj
,
struct
xpart
*
xp
,
struct
xpart
*
xp
,
const
struct
cosmology
*
cosmo
,
const
struct
cosmology
*
cosmo
,
const
struct
feedback_props
*
fb_props
,
const
integertime_t
ti_current
)
{}
const
integertime_t
ti_current
)
{}
#endif
/* SWIFT_NONE_FEEDBACK_IACT_H */
#endif
/* SWIFT_NONE_FEEDBACK_IACT_H */
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