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
824efcce
Commit
824efcce
authored
6 years ago
by
Alexei Borissov
Committed by
Alexei Borissov
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fixed issues with compiling without cooling
parent
7f83b4fe
No related branches found
No related tags found
1 merge request
!593
Eagle cooling
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/cooling.c
+0
-5
0 additions, 5 deletions
src/cooling.c
src/cooling/EAGLE/cooling.c
+1
-2
1 addition, 2 deletions
src/cooling/EAGLE/cooling.c
src/cooling/EAGLE/cooling.h
+1
-2
1 addition, 2 deletions
src/cooling/EAGLE/cooling.h
with
2 additions
and
9 deletions
src/cooling.c
+
0
−
5
View file @
824efcce
...
@@ -20,11 +20,6 @@
...
@@ -20,11 +20,6 @@
/* Config parameters. */
/* Config parameters. */
#include
"../config.h"
#include
"../config.h"
#if defined(COOLING_EAGLE)
#include
"./cooling/EAGLE/cooling_struct.h"
#include
"./cooling/EAGLE/eagle_cool_tables.h"
#endif
/* This object's header. */
/* This object's header. */
#include
"cooling.h"
#include
"cooling.h"
#include
"restart.h"
#include
"restart.h"
...
...
This diff is collapsed.
Click to expand it.
src/cooling/EAGLE/cooling.c
+
1
−
2
View file @
824efcce
...
@@ -972,8 +972,7 @@ __attribute__((always_inline)) INLINE float cooling_timestep(
...
@@ -972,8 +972,7 @@ __attribute__((always_inline)) INLINE float cooling_timestep(
const
struct
cooling_function_data
*
restrict
cooling
,
const
struct
cooling_function_data
*
restrict
cooling
,
const
struct
phys_const
*
restrict
phys_const
,
const
struct
phys_const
*
restrict
phys_const
,
const
struct
cosmology
*
restrict
cosmo
,
const
struct
cosmology
*
restrict
cosmo
,
const
struct
unit_system
*
restrict
us
,
const
struct
part
*
restrict
p
,
const
struct
unit_system
*
restrict
us
,
const
struct
part
*
restrict
p
)
{
const
struct
xpart
*
restrict
xp
)
{
/* Remember to update when using an implicit integrator */
/* Remember to update when using an implicit integrator */
// const float cooling_rate = cooling->cooling_rate;
// const float cooling_rate = cooling->cooling_rate;
...
...
This diff is collapsed.
Click to expand it.
src/cooling/EAGLE/cooling.h
+
1
−
2
View file @
824efcce
...
@@ -105,8 +105,7 @@ float cooling_timestep(const struct cooling_function_data *restrict,
...
@@ -105,8 +105,7 @@ float cooling_timestep(const struct cooling_function_data *restrict,
const
struct
phys_const
*
restrict
,
const
struct
phys_const
*
restrict
,
const
struct
cosmology
*
restrict
,
const
struct
cosmology
*
restrict
,
const
struct
unit_system
*
restrict
,
const
struct
unit_system
*
restrict
,
const
struct
part
*
restrict
,
const
struct
part
*
restrict
);
const
struct
xpart
*
restrict
);
void
cooling_first_init_part
(
const
struct
phys_const
*
restrict
,
void
cooling_first_init_part
(
const
struct
phys_const
*
restrict
,
const
struct
unit_system
*
restrict
,
const
struct
unit_system
*
restrict
,
...
...
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