diff --git a/src/cooling.h b/src/cooling.h index 06085e67941aef2711ad2dd56d82c78dba11d1d4..72caff33eab6970f305ba05ab7d498edddb27f48 100644 --- a/src/cooling.h +++ b/src/cooling.h @@ -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." diff --git a/src/cooling/grackle/cooling_iact.h b/src/cooling/grackle/cooling_iact.h index 502858800d177616f3e0af2afd528cca6f5830ae..5b465bf5cad1cae3c81810fb6ce346f6bedd8b09 100644 --- a/src/cooling/grackle/cooling_iact.h +++ b/src/cooling/grackle/cooling_iact.h @@ -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; */ }; diff --git a/src/hydro/Gadget2/hydro_iact.h b/src/hydro/Gadget2/hydro_iact.h index 29a86da3f959266580fcdfa458a13804af6148ec..6f839a4710af3d7e4682ba95871640cc6436b55a 100644 --- a/src/hydro/Gadget2/hydro_iact.h +++ b/src/hydro/Gadget2/hydro_iact.h @@ -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 */