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
19490f8e
Commit
19490f8e
authored
5 years ago
by
Loic Hausammann
Browse files
Options
Downloads
Patches
Plain Diff
GEAR: update pressure_floor/none API
parent
c78ba29b
No related branches found
No related tags found
1 merge request
!885
Gear merge pressure floor and GEAR star formation
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/cell.c
+1
-0
1 addition, 0 deletions
src/cell.c
src/pressure_floor/GEAR/pressure_floor.h
+1
-0
1 addition, 0 deletions
src/pressure_floor/GEAR/pressure_floor.h
src/pressure_floor/none/pressure_floor.h
+6
-8
6 additions, 8 deletions
src/pressure_floor/none/pressure_floor.h
with
8 additions
and
8 deletions
src/cell.c
+
1
−
0
View file @
19490f8e
...
...
@@ -61,6 +61,7 @@
#include
"hydro_properties.h"
#include
"memswap.h"
#include
"minmax.h"
#include
"pressure_floor.h"
#include
"scheduler.h"
#include
"space.h"
#include
"space_getsid.h"
...
...
This diff is collapsed.
Click to expand it.
src/pressure_floor/GEAR/pressure_floor.h
+
1
−
0
View file @
19490f8e
...
...
@@ -84,6 +84,7 @@ __attribute__((always_inline)) static INLINE float pressure_floor_get_physical_p
*
* @param p The #part.
* @param pressure_comoving The comoving pressure without any pressure floor.
* @param cosmo The #cosmology model.
*
* @return The physical or comoving pressure with the floor.
*/
...
...
This diff is collapsed.
Click to expand it.
src/pressure_floor/none/pressure_floor.h
+
6
−
8
View file @
19490f8e
...
...
@@ -44,13 +44,12 @@ struct pressure_floor_properties {};
*
* @param p The #part.
* @param rho The physical or comoving density.
* @param
pressure The physical pressure without any pressure floor
.
* @param
cosmo The #cosmology model
.
*
* @return The physical pressure with the floor.
*/
static
INLINE
float
pressure_floor_get_physical_pressure
(
const
struct
part
*
p
,
const
float
rho
,
const
float
pressure
)
{
static
INLINE
float
pressure_floor_get_physical_pressure
(
const
struct
part
*
p
,
const
float
rho
,
const
struct
cosmology
*
cosmo
)
{
return
pressure
;
}
...
...
@@ -61,13 +60,12 @@ static INLINE float pressure_floor_get_physical_pressure(const struct part* p,
*
* @param p The #part.
* @param rho The physical or comoving density.
* @param
pressure
The como
ving pressure without any pressure floor
.
* @param
cosmo
The
#
co
s
mo
logy model
.
*
* @return The comoving pressure with the floor.
*/
static
INLINE
float
pressure_floor_get_comoving_pressure
(
const
struct
part
*
p
,
const
float
rho
,
const
float
pressure
)
{
static
INLINE
float
pressure_floor_get_comoving_pressure
(
const
struct
part
*
p
,
const
float
rho
,
const
struct
cosmology
*
cosmo
)
{
return
pressure
;
}
...
...
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