Commit b41060a4 authored by lhausamm's avatar lhausamm
Browse files

Remove diffusion/particle mixing functions

parent db54fc76
...@@ -29,16 +29,16 @@ ...@@ -29,16 +29,16 @@
/* Import the right cooling definition */ /* Import the right cooling definition */
#if defined(COOLING_NONE) #if defined(COOLING_NONE)
#include "./cooling/none/cooling_iact.h" //#include "./cooling/none/cooling_iact.h"
#include "./cooling/none/cooling.h" #include "./cooling/none/cooling.h"
#elif defined(COOLING_CONST_DU) #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" #include "./cooling/const_du/cooling.h"
#elif defined(COOLING_CONST_LAMBDA) #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" #include "./cooling/const_lambda/cooling.h"
#elif defined(COOLING_GRACKLE) #elif defined(COOLING_GRACKLE)
#include "./cooling/grackle/cooling_iact.h" //#include "./cooling/grackle/cooling_iact.h"
#include "./cooling/grackle/cooling.h" #include "./cooling/grackle/cooling.h"
#else #else
#error "Invalid choice of cooling function." #error "Invalid choice of cooling function."
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
__attribute__((always_inline)) INLINE static void cooling_density_iact( __attribute__((always_inline)) INLINE static void cooling_density_iact(
float wi, float wj, struct part *pi, struct part *pj) { 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; /* pi->cooling_data.He_density += wj * diff; */
pj->cooling_data.He_density += wi * diff; /* pj->cooling_data.He_density += wi * diff; */
}; };
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
* Gadget-2 tree-code neighbours search. * Gadget-2 tree-code neighbours search.
*/ */
#include "cooling.h"
#include "cache.h" #include "cache.h"
#include "minmax.h" #include "minmax.h"
...@@ -105,7 +104,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density( ...@@ -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[1] += facj * curlvr[1];
pj->density.rot_v[2] += facj * curlvr[2]; pj->density.rot_v[2] += facj * curlvr[2];
cooling_density_iact(wi, wj, pi, pj);
#ifdef DEBUG_INTERACTIONS_SPH #ifdef DEBUG_INTERACTIONS_SPH
/* Update ngb counters */ /* Update ngb counters */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment