Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
b41060a4
Commit
b41060a4
authored
Jan 12, 2018
by
lhausamm
Browse files
Remove diffusion/particle mixing functions
parent
db54fc76
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/cooling.h
View file @
b41060a4
...
...
@@ -29,16 +29,16 @@
/* Import the right cooling definition */
#if defined(COOLING_NONE)
#include
"./cooling/none/cooling_iact.h"
//
#include "./cooling/none/cooling_iact.h"
#include
"./cooling/none/cooling.h"
#elif defined(COOLING_CONST_DU)
#include
"./cooling/const_du/cooling_iact.h"
//
#include "./cooling/const_du/cooling_iact.h"
#include
"./cooling/const_du/cooling.h"
#elif defined(COOLING_CONST_LAMBDA)
#include
"./cooling/const_lambda/cooling_iact.h"
//
#include "./cooling/const_lambda/cooling_iact.h"
#include
"./cooling/const_lambda/cooling.h"
#elif defined(COOLING_GRACKLE)
#include
"./cooling/grackle/cooling_iact.h"
//
#include "./cooling/grackle/cooling_iact.h"
#include
"./cooling/grackle/cooling.h"
#else
#error "Invalid choice of cooling function."
...
...
src/cooling/grackle/cooling_iact.h
View file @
b41060a4
...
...
@@ -25,8 +25,8 @@
__attribute__
((
always_inline
))
INLINE
static
void
cooling_density_iact
(
float
wi
,
float
wj
,
struct
part
*
pi
,
struct
part
*
pj
)
{
float
diff
=
pi
->
cooling_data
.
He_density
-
pj
->
cooling_data
.
He_density
;
/*
float diff = pi->cooling_data.He_density - pj->cooling_data.He_density;
*/
pi
->
cooling_data
.
He_density
+=
wj
*
diff
;
pj
->
cooling_data
.
He_density
+=
wi
*
diff
;
/*
pi->cooling_data.He_density += wj * diff;
*/
/*
pj->cooling_data.He_density += wi * diff;
*/
};
src/hydro/Gadget2/hydro_iact.h
View file @
b41060a4
...
...
@@ -32,7 +32,6 @@
* Gadget-2 tree-code neighbours search.
*/
#include
"cooling.h"
#include
"cache.h"
#include
"minmax.h"
...
...
@@ -105,7 +104,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density(
pj
->
density
.
rot_v
[
1
]
+=
facj
*
curlvr
[
1
];
pj
->
density
.
rot_v
[
2
]
+=
facj
*
curlvr
[
2
];
cooling_density_iact
(
wi
,
wj
,
pi
,
pj
);
#ifdef DEBUG_INTERACTIONS_SPH
/* Update ngb counters */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment