diff --git a/builds/make.type.dust b/builds/make.type.dust index 35d595a37..a6cf1bdd0 100644 --- a/builds/make.type.dust +++ b/builds/make.type.dust @@ -15,25 +15,25 @@ DFLAGS += -DHLLC DFLAGS += -DDE DFLAGS += -DAVERAGE_SLOW_CELLS DFLAGS += -DTEMPERATURE_FLOOR -DFLAGS += -DSCALAR_FLOOR DFLAGS += -DVL # Evolve additional scalars -DFLAGS += -DSCALAR +DFLAGS += -DSCALAR +DFLAGS += -DSCALAR_FLOOR # Define dust macro -DFLAGS += -DDUST +DFLAGS += -DDUST # Apply the cooling in the GPU from precomputed tables -DFLAGS += -DCOOLING_GPU -DFLAGS += -DCLOUDY_COOLING +DFLAGS += -DCOOLING_GPU +DFLAGS += -DCLOUDY_COOLING #Measure the Timing of the different stages -#DFLAGS += -DCPU_TIME +#DFLAGS += -DCPU_TIME -DFLAGS += -DSLICES -DFLAGS += -DPROJECTION +DFLAGS += -DSLICES +DFLAGS += -DPROJECTION DFLAGS += $(OUTPUT) @@ -41,4 +41,4 @@ DFLAGS += $(OUTPUT) #and the MPI transfers are done from the GPU #If not specified, MPI_GPU is off by default #This is set in the system make.host file -DFLAGS += $(MPI_GPU) +DFLAGS += $(MPI_GPU) \ No newline at end of file diff --git a/src/global/global.h b/src/global/global.h index 18b08b71f..f7030b563 100644 --- 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 100 +#define TEMP_FLOOR 1e-3 #define DENS_FLOOR 1e-5 // in code units // Parameters for Enzo dual Energy Condition diff --git a/src/grid/cuda_boundaries.cu b/src/grid/cuda_boundaries.cu index 715840322..baf846d3c 100644 --- a/src/grid/cuda_boundaries.cu +++ b/src/grid/cuda_boundaries.cu @@ -318,7 +318,7 @@ __global__ void Wind_Boundary_kernel(Real *c_device, int nx, int ny, int nz, int d_0 = n_0 * mu * MP / DENSITY_UNIT; P_0 = n_0 * KB * T_0 / PRESSURE_UNIT; - vx = 1000 * TIME_UNIT / KPC; // km/s * (cholla unit conversion) + vx = 100 * TIME_UNIT / KPC; // km/s * (cholla unit conversion) vy = 0.0; vz = 0.0; diff --git a/src/grid/grid3D.cpp b/src/grid/grid3D.cpp index 4638942eb..a76417321 100644 --- 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 = 0.024; // Initialize the minumum dt to a tiny number + H.min_dt_slow = 1e-5; // Initialize the minumum dt to a tiny number #endif // AVERAGE_SLOW_CELLS #ifndef MPI_CHOLLA