Add option to leave out callbacks

illinois-ceesd · Apr 11, 2022 · b719e4c · b719e4c
1 parent 2f38c9c
commit b719e4c
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 219 deletions.
diff --git a/combozzle.py b/combozzle.py
@@ -206,6 +206,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
     nrestart = 1000
     do_checkpoint = 0
     boundary_report = 0
+    do_callbacks = 0
 
     # }}}  Time stepping control
 
@@ -339,6 +340,10 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
             do_checkpoint = int(input_data["do_checkpoint"])
         except KeyError:
             pass
+        try:
+            do_callbacks = int(input_data["do_callbacks"])
+        except KeyError:
+            pass
         try:
             nviz = int(input_data["nviz"])
         except KeyError:
@@ -451,7 +456,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
         print(f"\t{single_gas_only=},{dummy_rhs_only=}")
         print(f"\t{periodic_boundary=},{adiabatic_boundary=}")
         print(f"\t{timestepping_on=}, {inviscid_only=}")
-        print(f"\t{av_on=}, {sponge_on=}")
+        print(f"\t{av_on=}, {sponge_on=}, {do_callbacks=}")
         print(f"\t{nspecies=}")
         print("---- timestepping ------")
         print(f"\tcurrent_dt = {current_dt}")
@@ -1029,6 +1034,24 @@ def my_post_step(step, t, dt, state):
 
     from mirgecom.inviscid import inviscid_flux_rusanov
 
+    def dummy_pre_step(step, t, dt, state):
+        if logmgr:
+            logmgr.tick_before()
+        return state, dt
+
+    def dummy_post_step(step, t, dt, state):
+        if logmgr:
+            set_dt(logmgr, dt)
+            logmgr.tick_after()
+        return state, dt
+
+    pre_step_func = dummy_pre_step
+    post_step_func = dummy_post_step
+
+    if do_callbacks:
+        pre_step_func = my_pre_step
+        post_step_func = my_post_step
+
     def cfd_rhs(t, state):
         cv, tseed = state
         from mirgecom.gas_model import make_fluid_state
@@ -1091,8 +1114,8 @@ def dummy_rhs(t, state):
 
         current_step, current_t, current_state = \
             advance_state(rhs=my_rhs, timestepper=timestepper,
-                          pre_step_callback=my_pre_step, istep=current_step,
-                          post_step_callback=my_post_step, dt=current_dt,
+                          pre_step_callback=pre_step_func, istep=current_step,
+                          post_step_callback=post_step_func, dt=current_dt,
                           state=make_obj_array([current_cv, temperature_seed]),
                           t=current_t, t_final=t_final)
 

diff --git a/dist_scale/3d/run_config.yaml b/dist_scale/3d/run_config.yaml
@@ -1 +1 @@
-run_config/weak_8.yaml
+./run_config/weak_16.yaml
diff --git a/dist_scale/3d/run_config/weak_1.yaml b/dist_scale/3d/run_config/weak_1.yaml
diff --git a/dist_scale/3d/run_config/weak_16.yaml b/dist_scale/3d/run_config/weak_16.yaml
diff --git a/dist_scale/3d/run_config/weak_2.yaml b/dist_scale/3d/run_config/weak_2.yaml
diff --git a/dist_scale/3d/run_config/weak_4.yaml b/dist_scale/3d/run_config/weak_4.yaml
diff --git a/dist_scale/3d/run_config/weak_8.yaml b/dist_scale/3d/run_config/weak_8.yaml
diff --git a/grid_scale/3d/p2p3_combustion_config/case_p1s1.yaml b/grid_scale/3d/p2p3_combustion_config/case_p1s1.yaml
@@ -1,4 +1,4 @@
-order: 1
+order: 2
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p1s1024.yaml b/grid_scale/3d/p2p3_combustion_config/case_p1s1024.yaml
@@ -1,4 +1,4 @@
-order: 1
+order: 2
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p1s128.yaml b/grid_scale/3d/p2p3_combustion_config/case_p1s128.yaml
@@ -1,4 +1,4 @@
-order: 1
+order: 2
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p1s256.yaml b/grid_scale/3d/p2p3_combustion_config/case_p1s256.yaml
@@ -1,4 +1,4 @@
-order: 1
+order: 2
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p1s512.yaml b/grid_scale/3d/p2p3_combustion_config/case_p1s512.yaml
@@ -1,4 +1,4 @@
-order: 1
+order: 2
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p1s64.yaml b/grid_scale/3d/p2p3_combustion_config/case_p1s64.yaml
@@ -1,4 +1,4 @@
-order: 1
+order: 2
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p1s8.yaml b/grid_scale/3d/p2p3_combustion_config/case_p1s8.yaml
@@ -1,4 +1,4 @@
-order: 1
+order: 2
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p2s1.yaml b/grid_scale/3d/p2p3_combustion_config/case_p2s1.yaml
@@ -1,4 +1,4 @@
-order: 2
+order: 3
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p2s128.yaml b/grid_scale/3d/p2p3_combustion_config/case_p2s128.yaml
@@ -1,4 +1,4 @@
-order: 2
+order: 3
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p2s256.yaml b/grid_scale/3d/p2p3_combustion_config/case_p2s256.yaml
@@ -1,4 +1,4 @@
-order: 2
+order: 3
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p2s512.yaml b/grid_scale/3d/p2p3_combustion_config/case_p2s512.yaml
@@ -1,4 +1,4 @@
-order: 2
+order: 3
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p2s64.yaml b/grid_scale/3d/p2p3_combustion_config/case_p2s64.yaml
@@ -1,4 +1,4 @@
-order: 2
+order: 3
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/p2p3_combustion_config/case_p2s8.yaml b/grid_scale/3d/p2p3_combustion_config/case_p2s8.yaml
@@ -1,4 +1,4 @@
-order: 2
+order: 3
 domain_xlen: 1.
 domain_ylen: 1.
 domain_zlen: 1.

diff --git a/grid_scale/3d/run_config b/grid_scale/3d/run_config
@@ -1 +1 @@
-p3p4_run_config
+p2p3_dummy_config
diff --git a/grid_scale/3d/run_logs b/grid_scale/3d/run_logs
@@ -1 +1 @@
-fusion_p4p5_logs
+dummy_logs