Skip to content

Commit

Permalink
reset to default settings
Browse files Browse the repository at this point in the history
  • Loading branch information
helenarichie committed Jan 13, 2024
1 parent 328770b commit 2f3ef5f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions builds/make.type.dust
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@ 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)

#Select if the Hydro Conserved data will reside in the GPU
#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)
2 changes: 1 addition & 1 deletion src/global/global.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/grid/cuda_boundaries.cu
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/grid/grid3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2f3ef5f

Please sign in to comment.