From ac9021fccd14009ae10ad559616a7bcfc57ae35f Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Fri, 14 Nov 2025 10:37:56 -0500 Subject: [PATCH 1/2] fix comments in clawmultip_tools --- src/python/clawutil/clawmultip_tools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/python/clawutil/clawmultip_tools.py b/src/python/clawutil/clawmultip_tools.py index 15e724b..5369c37 100644 --- a/src/python/clawutil/clawmultip_tools.py +++ b/src/python/clawutil/clawmultip_tools.py @@ -286,18 +286,18 @@ def make_cases_template(): # setrun parameters: case['setrun_file'] = 'setrun_cases.py' - # setrun_case.py should contain a setrun function with case + # setrun_cases.py should contain a setrun function with case # as a keyword argument so we can pass in parameters #case['plotdir'] = None # if None, will not make plots case['plotdir'] = '_plots_%s' % case_name case['setplot_file'] = 'setplot_cases.py' - # setplot_case.py might contain a setplot function with case + # setplot_cases.py might contain a setplot function with case # as a keyword argument so we can pass in parameters # ADD CASE ENTRIES for any setrun or setplot parameters that - # are case-dependent, and then use these in setrun / setplot, via: + # are case-dependent, using this format: # case[key] = value # for each parameter caselist.append(case) From 8e158522fedc89f9f55cedb101a6a74abb894909 Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Mon, 29 Dec 2025 11:50:05 -0800 Subject: [PATCH 2/2] rename setrun_cases.py to setrun_case.py and same for setplot --- .../run_cases_clawpack.py | 10 +++++----- .../{setplot_cases.py => setplot_case.py} | 0 .../{setrun_cases.py => setrun_case.py} | 0 src/python/clawutil/clawmultip_tools.py | 9 +++++---- 4 files changed, 10 insertions(+), 9 deletions(-) rename examples/clawmultip_advection_1d_example1/{setplot_cases.py => setplot_case.py} (100%) rename examples/clawmultip_advection_1d_example1/{setrun_cases.py => setrun_case.py} (100%) diff --git a/examples/clawmultip_advection_1d_example1/run_cases_clawpack.py b/examples/clawmultip_advection_1d_example1/run_cases_clawpack.py index 061e08a..b9df8f2 100644 --- a/examples/clawmultip_advection_1d_example1/run_cases_clawpack.py +++ b/examples/clawmultip_advection_1d_example1/run_cases_clawpack.py @@ -10,7 +10,7 @@ def make_cases(): """ Create a list of the cases to be run, varying a couple rundata parameters - after setting common parameters from setrun_cases.py. + after setting common parameters from setrun_case.py. The parameters set for each case (as dictionary keys) are determined by the fact that we will use clawmultip_tools.run_one_case_clawpack() @@ -31,9 +31,9 @@ def make_cases(): case['xclawcmd'] = 'xclaw' # executable created by 'make .exe' # setrun parameters: - case['setrun_file'] = 'setrun_cases.py' + case['setrun_file'] = 'setrun_case.py' - # setrun_cases.py should contain a setrun function with case + # setrun_case.py should contain a setrun function with case # as a keyword argument so we can pass in the following values: case['order'] = order @@ -42,9 +42,9 @@ def make_cases(): #case['plotdir'] = None # if None, will not make plots case['plotdir'] = '_plots_%s' % case_name - case['setplot_file'] = 'setplot_cases.py' + case['setplot_file'] = 'setplot_case.py' - # setplot_cases.py should contain a setplot function with case + # setplot_case.py should contain a setplot function with case # as a keyword argument so we can pass in the parameters, # so that outdir and case_name can be used in the title of figures diff --git a/examples/clawmultip_advection_1d_example1/setplot_cases.py b/examples/clawmultip_advection_1d_example1/setplot_case.py similarity index 100% rename from examples/clawmultip_advection_1d_example1/setplot_cases.py rename to examples/clawmultip_advection_1d_example1/setplot_case.py diff --git a/examples/clawmultip_advection_1d_example1/setrun_cases.py b/examples/clawmultip_advection_1d_example1/setrun_case.py similarity index 100% rename from examples/clawmultip_advection_1d_example1/setrun_cases.py rename to examples/clawmultip_advection_1d_example1/setrun_case.py diff --git a/src/python/clawutil/clawmultip_tools.py b/src/python/clawutil/clawmultip_tools.py index 5369c37..fe1453e 100644 --- a/src/python/clawutil/clawmultip_tools.py +++ b/src/python/clawutil/clawmultip_tools.py @@ -285,20 +285,21 @@ def make_cases_template(): case['xclawcmd'] = 'xclaw' # executable created by 'make .exe' # setrun parameters: - case['setrun_file'] = 'setrun_cases.py' - # setrun_cases.py should contain a setrun function with case + case['setrun_file'] = 'setrun_case.py' + # setrun_case.py should contain a setrun function with case # as a keyword argument so we can pass in parameters #case['plotdir'] = None # if None, will not make plots case['plotdir'] = '_plots_%s' % case_name - case['setplot_file'] = 'setplot_cases.py' - # setplot_cases.py might contain a setplot function with case + case['setplot_file'] = 'setplot_case.py' + # setplot_case.py might contain a setplot function with case # as a keyword argument so we can pass in parameters # ADD CASE ENTRIES for any setrun or setplot parameters that # are case-dependent, using this format: # case[key] = value # for each parameter + # and then modify setrun_case.py and/or setplot_case.py to use them caselist.append(case)