diff --git a/Exec/science/nova/GNUmakefile b/Exec/science/nova/GNUmakefile index 8005099909..0f4d4109d3 100644 --- a/Exec/science/nova/GNUmakefile +++ b/Exec/science/nova/GNUmakefile @@ -13,9 +13,10 @@ USE_REACT = TRUE USE_DIFFUSION = TRUE USE_GRAV = TRUE -CASTRO_HOME ?= ../../.. +CASTRO_HOME := ../../.. USE_MODEL_PARSER = TRUE +MAX_NPTS_MODEL = 20000 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos EOS_DIR := helmholtz @@ -26,9 +27,7 @@ NETWORK_DIR := nova2 # Thi sets the conductivity EOS directory in $(MICROPHYSICS_HOME)/conductivity CONDUCTIVITY_DIR := stellar -PROBLEM_DIR ?= ./ - -Bpack := $(PROBLEM_DIR)/Make.package -Blocs := $(PROBLEM_DIR) +Bpack := ./Make.package +Blocs := . include $(CASTRO_HOME)/Exec/Make.Castro diff --git a/Exec/science/nova/inputs_nova_t7 b/Exec/science/nova/inputs_nova_t7 index 37df192afe..74ef46c916 100644 --- a/Exec/science/nova/inputs_nova_t7 +++ b/Exec/science/nova/inputs_nova_t7 @@ -1,11 +1,12 @@ -max_step = 1200000 +# ------------------ INPUTS TO MAIN PROGRAM ------------------- +max_step = 2000000 # PROBLEM SIZE & GEOMETRY geometry.is_periodic = 1 0 geometry.coord_sys = 0 # 0 => cart, 1 => RZ 2=>spherical geometry.prob_lo = 0 0 geometry.prob_hi = 20.480e7 10.240e7 -amr.n_cell = 640 320 +amr.n_cell = 1280 640 # >>>>>>>>>>>>> BC FLAGS <<<<<<<<<<<<<<<< # 0 = Interior 3 = Symmetry @@ -68,22 +69,22 @@ amr.v = 1 # verbosity in Amr.cpp # REFINEMENT / REGRIDDING -amr.max_level = 3 # maximum level number allowed -amr.ref_ratio = 2 2 2 2 2 # refinement ratio -amr.regrid_int = 2 2 2 2 2 # how often to regrid +amr.max_level = 2 # maximum level number allowed +amr.ref_ratio = 4 2 # refinement ratio +amr.regrid_int = 2 2 # how often to regrid amr.max_grid_size = 256 amr.blocking_factor = 64 -amr.n_error_buf = 2 2 2 2 2 # number of buffer cells in error est +amr.n_error_buf = 2 2 # number of buffer cells in error est amr.refine_grid_layout = 0 # CHECKPOINT FILES amr.check_file = chk # root name of checkpoint file -amr.check_int = 200 # number of timesteps between checkpoints +amr.check_int = 150 # number of timesteps between checkpoints # PLOTFILES amr.plot_file = plt # root name of plotfile -amr.plot_int = 5000 # number of timesteps between plotfiles +amr.plot_int = 5000 # number of timesteps between plotfiles amr.derive_plot_vars = ALL # DATA LOG @@ -112,14 +113,14 @@ integrator.abort_on_failure = 0 amr.refinement_indicators = dens temp edot -amr.refine.dens.max_level = 5 +amr.refine.dens.max_level = 2 amr.refine.dens.value_greater = 1.0e2 amr.refine.dens.field_name = density -amr.refine.temp.max_level = 5 +amr.refine.temp.max_level = 2 amr.refine.temp.value_greater = 1.0e7 amr.refine.temp.field_name = Temp -amr.refine.edot.max_level = 5 +amr.refine.edot.max_level = 2 amr.refine.edot.value_greater = 1.0e11 amr.refine.edot.field_name = enuc