update build

helenarichie · Jan 6, 2024 · 3fec978 · 3fec978
1 parent e12b846
commit 3fec978
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/builds/make.type.dust b/builds/make.type.dust
@@ -14,7 +14,7 @@ DFLAGS    += -DHLLC
 
 DFLAGS    += -DDE
 DFLAGS    += -DAVERAGE_SLOW_CELLS
-# DFLAGS    += -DTEMPERATURE_FLOOR
+DFLAGS    += -DTEMPERATURE_FLOOR
 DFLAGS    += -DSCALAR_FLOOR
 
 DFLAGS    += -DVL
@@ -25,8 +25,6 @@ DFLAGS += -DSCALAR
 # Define dust macro
 DFLAGS += -DDUST
 
-DFLAGS += -DSCALAR_FLOOR
-
 # Apply the cooling in the GPU from precomputed tables
 DFLAGS += -DCOOLING_GPU
 DFLAGS += -DCLOUDY_COOLING

diff --git a/src/global/global.h b/src/global/global.h
@@ -50,7 +50,7 @@ typedef double Real;
 #define LOG_FILE_NAME "run_output.log"
 
 // Conserved Floor Values
-#define TEMP_FLOOR 10
+#define TEMP_FLOOR 100
 #define DENS_FLOOR 1e-5  // in code units
 
 // Parameters for Enzo dual Energy Condition

diff --git a/src/grid/grid3D.cpp b/src/grid/grid3D.cpp
@@ -157,7 +157,7 @@ void Grid3D::Initialize(struct Parameters *P)
   C_cfl = 0.3;
 
 #ifdef AVERAGE_SLOW_CELLS
-  H.min_dt_slow = 1e-5;  // Initialize the minumum dt to a tiny number
+  H.min_dt_slow = 0.024;  // Initialize the minumum dt to a tiny number
 #endif                     // AVERAGE_SLOW_CELLS
 
 #ifndef MPI_CHOLLA

diff --git a/src/hydro/hydro_cuda.cu b/src/hydro/hydro_cuda.cu
@@ -379,7 +379,8 @@ __global__ void Update_Conserved_Variables_3D(Real *dev_conserved, Real *Q_Lx, R
 
   #endif  // GRAVITY
 
-  #if !(defined(DENSITY_FLOOR) && defined(TEMPERATURE_FLOOR))
+  // #if !(defined(DENSITY_FLOOR) && defined(TEMPERATURE_FLOOR))
+  #if !(defined(DENSITY_FLOOR))
     if (dev_conserved[id] < 0.0 || dev_conserved[id] != dev_conserved[id] || dev_conserved[4 * n_cells + id] < 0.0 ||
         dev_conserved[4 * n_cells + id] != dev_conserved[4 * n_cells + id]) {
       printf("%3d %3d %3d Thread crashed in final update. %e %e %e %e %e\n", xid + x_off, yid + y_off, zid + z_off,