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 15e724b..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' + 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' + 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, and then use these in setrun / setplot, via: + # 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)