diff --git a/fre/app/regrid_xy/regrid_xy.py b/fre/app/regrid_xy/regrid_xy.py index 76b13696b..2aa35b14c 100644 --- a/fre/app/regrid_xy/regrid_xy.py +++ b/fre/app/regrid_xy/regrid_xy.py @@ -344,9 +344,9 @@ def regrid_xy(yamlfile: str, for component in components: # If postprocess_on is not defined, it should have the default value of True # If postprocess_on is defined, check for a True or False value - if "postprocess_on" in component: + if "postprocess-on" in component: # skip component if postprocess_on = False - if not component["postprocess_on"]: + if not component["postprocess-on"]: fre_logger.warning(f"postprocess_on=False for {source} in component {component['type']}." \ "Skipping {source}") continue diff --git a/fre/app/regrid_xy/tests/test_regrid_xy.py b/fre/app/regrid_xy/tests/test_regrid_xy.py index 46091a077..2dac23486 100644 --- a/fre/app/regrid_xy/tests/test_regrid_xy.py +++ b/fre/app/regrid_xy/tests/test_regrid_xy.py @@ -38,20 +38,20 @@ "inputRealm": "atmos", "type": "pride_and_prejudice", "sources": input_files, - "postprocess_on": True}, + "postprocess-on": True}, {"xyInterp": f"{nxy},{nxy}", "interpMethod": "conserve_order2", "inputRealm": "atmos", "type": "my_component", "sources": input_files, "static": input_files_static, - "postprocess_on": True}, + "postprocess-on": True}, {"xyInterp": f"{nxy},{nxy}", "interpMethod": "conserve_order2", "inputRealm": "atmos", "type": "this_comp_is_off", "sources": input_files_donotregrid, - "postprocess_on": False} + "postprocess-on": False} ] diff --git a/fre/app/remap_pp_components/tests/test-data/yaml_ex.yaml b/fre/app/remap_pp_components/tests/test-data/yaml_ex.yaml index e138a6342..5ace86dbb 100644 --- a/fre/app/remap_pp_components/tests/test-data/yaml_ex.yaml +++ b/fre/app/remap_pp_components/tests/test-data/yaml_ex.yaml @@ -9,7 +9,7 @@ postprocess: inputRealm: "atmos" static: - source: "atmos_static_cmip" - postprocess_on: False + postprocess-on: False - type: "atmos_scalar_CNAME" sources: @@ -17,7 +17,7 @@ postprocess: inputRealm: "atmos" static: - source: "atmos_static_scalar" - postprocess_on: True + postprocess-on: True # component used to test variable filtering for history files - type: "atmos_scalar_test_vars_CNAME" @@ -28,7 +28,7 @@ postprocess: static: - source: "atmos_static_scalar_test_vars" variables: ["bk"] - postprocess_on: True + postprocess-on: True # component used to test variable filtering failure for history file (variable incorrect) - type: "atmos_scalar_test_vars_fail_CNAME" @@ -36,7 +36,7 @@ postprocess: - history_file: "atmos_scalar_test_vars_fail" variables: ["co2mass", "bk", "no_var"] inputRealm: "atmos" - postprocess_on: True + postprocess-on: True # component used to test variable filtering failure for statics - type: "atmos_scalar_static_test_vars_fail_CNAME" @@ -46,4 +46,4 @@ postprocess: static: - source: "atmos_static_scalar_test_vars_fail" variables: ["bk", "no_var"] - postprocess_on: True + postprocess-on: True diff --git a/fre/gfdl_msd_schemas b/fre/gfdl_msd_schemas index ee6a34da8..761c57f65 160000 --- a/fre/gfdl_msd_schemas +++ b/fre/gfdl_msd_schemas @@ -1 +1 @@ -Subproject commit ee6a34da83d89988c6813b24f87807099a572aee +Subproject commit 761c57f653f9a85bbfd7706d890b315aaf1f275a diff --git a/fre/list_/list_pp_components_script.py b/fre/list_/list_pp_components_script.py index c424a033a..d30965413 100644 --- a/fre/list_/list_pp_components_script.py +++ b/fre/list_/list_pp_components_script.py @@ -44,8 +44,8 @@ def list_ppcomps_subtool(yamlfile: str, experiment: str): # log the experiment names, which should show up on screen for sure fre_logger.info("Components to be post-processed:") for i in yml_dict["postprocess"]["components"]: - if "postprocess_on" in i: - if i.get("postprocess_on") is True: + if "postprocess-on" in i: + if i.get("postprocess-on") is True: fre_logger.info(' - %s', i.get("type")) else: fre_logger.info(' - %s', i.get("type")) diff --git a/fre/pp/configure_script_yaml.py b/fre/pp/configure_script_yaml.py index 0b1c77286..d2ef93d4c 100644 --- a/fre/pp/configure_script_yaml.py +++ b/fre/pp/configure_script_yaml.py @@ -75,8 +75,6 @@ def rose_init(experiment: str, platform: str, target: str) -> metomi.rose.config rose_suite = metomi.rose.config.ConfigNode() # disagreeable; these should be optional rose_suite.set(keys=['template variables', 'DO_ANALYSIS_ONLY'], value='False') - rose_suite.set(keys=['template variables', 'DO_MDTF'], value='False') - rose_suite.set(keys=['template variables', 'PP_DEFAULT_XYINTERP'], value='0,0') # set some rose suite vars rose_suite.set(keys=['template variables', 'EXPERIMENT'], value=f'"{experiment}"') @@ -122,7 +120,7 @@ def set_rose_suite(yamlfile: dict, rose_suite: metomi.rose.config.ConfigNode) -> """ pp=yamlfile.get("postprocess") dirs=yamlfile.get("directories") - analysis=yamlfile.get("analysis") + analysis=yamlfile.get("final-step-user-scripts") if dirs is not None: for key,value in dirs.items(): @@ -148,9 +146,9 @@ def set_rose_suite(yamlfile: dict, rose_suite: metomi.rose.config.ConfigNode) -> # Account for multiple scripts for refinediag # Fail if multiple scripts defined for preanalysis (not implemented yet) - if pp_key == "preanalysis": + if pp_key == "first-step-user-scripts": for k2, v2 in pp_value.items(): - switch = v2["do_preanalysis"] + switch = v2["user-script-on"] if switch is True: script = v2["script"] @@ -162,9 +160,9 @@ def set_rose_suite(yamlfile: dict, rose_suite: metomi.rose.config.ConfigNode) -> pa_scripts += f"{script} " - if pp_key == "refinediag": + if pp_key == "refinediag-user-scripts": for k2, v2 in pp_value.items(): - switch = v2["do_refinediag"] + switch = v2["user-script-on"] if switch is True: script = v2["script"] rd_scripts += f"{script} " @@ -205,16 +203,14 @@ def set_rose_suite(yamlfile: dict, rose_suite: metomi.rose.config.ConfigNode) -> do_analysis_switch = [] for an_key, an_value in analysis.items(): - an_workflow_info = an_value["workflow"] - # if analysis_on key is actually set, evaluate and save its value in a list - if "analysis_on" in an_workflow_info: - do_analysis_switch.append(an_workflow_info["analysis_on"]) - #if analysis_on key is NOT set, save its value as True in the list + # if user_script_on key is set, save its value in a list + if "user-script-on" in an_value: + do_analysis_switch.append(an_value["user-script-on"]) + # if it's not set, save its value as True (i.e. default on) else: do_analysis_switch.append("True") - # if ANY of the analysis components do not set analysis_on or set analysis_on as True, - # set DO_ANALYSIS=True in the rose_suite.conf + # if ANY of the analysis components are on set DO_ANALYSIS=True in the rose_suite.conf if any(do_analysis_switch): rose_suite.set( keys = ['template variables', 'DO_ANALYSIS'], value = 'True' ) diff --git a/fre/pp/tests/AM5_example/yaml_include/pp-test.c96_amip.yaml b/fre/pp/tests/AM5_example/yaml_include/pp-test.c96_amip.yaml index 76f078523..f6be55964 100644 --- a/fre/pp/tests/AM5_example/yaml_include/pp-test.c96_amip.yaml +++ b/fre/pp/tests/AM5_example/yaml_include/pp-test.c96_amip.yaml @@ -14,7 +14,7 @@ postprocess: xyInterp: *custom_interp interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos-TEST" sources: - history_file: "atmos_month" @@ -22,7 +22,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_level_cmip-TEST" sources: - history_file: "atmos_level_cmip" @@ -30,4 +30,4 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False diff --git a/fre/pp/tests/AM5_example/yaml_include/pp.c96_amip.yaml b/fre/pp/tests/AM5_example/yaml_include/pp.c96_amip.yaml index 3859217bd..403569400 100644 --- a/fre/pp/tests/AM5_example/yaml_include/pp.c96_amip.yaml +++ b/fre/pp/tests/AM5_example/yaml_include/pp.c96_amip.yaml @@ -60,7 +60,7 @@ postprocess: sourceGrid: "cubedsphere" interpMethod: "conserve_order1" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "land" sources: - history_file: "land_month" @@ -68,7 +68,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'land' - postprocess_on: False + postprocess-on: False - type: "land_cmip" sources: - history_file: "land_month_cmip" @@ -76,7 +76,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'land' - postprocess_on: False + postprocess-on: False - type: "tracer_level" sources: - history_file: "atmos_tracer" @@ -84,4 +84,4 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False diff --git a/fre/pp/tests/AM5_example/yaml_include/settings.yaml b/fre/pp/tests/AM5_example/yaml_include/settings.yaml index 1057fc6d5..3139938f0 100644 --- a/fre/pp/tests/AM5_example/yaml_include/settings.yaml +++ b/fre/pp/tests/AM5_example/yaml_include/settings.yaml @@ -19,19 +19,19 @@ postprocess: switches: &shared_switches clean_work: True do_atmos_plevel_masking: True - preanalysis: + first-step-user-scripts: vitals: script: "/path/to/vitals-script" inputs: ['atmos_month', 'aerosol_month'] - do_preanalysis: True - refinediag: + user-script-on: True + refinediag-user-scripts: ocean: script: "/path/to/ocean-script" inputs: ['ocean_monthly', 'ocean_bgc'] outputs: ['ocean_refined'] - do_refinediag: True + user-script-on: True aerosol: script: "/path/to/aerosol-script" inputs: ['aerosol_month'] outputs: ['aerosol_refined'] - do_refinediag: True + user-script-on: True diff --git a/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/all_ts_varlist/am5_components_varlist.yml b/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/all_ts_varlist/am5_components_varlist.yml index eec542cdf..df17718f0 100644 --- a/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/all_ts_varlist/am5_components_varlist.yml +++ b/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/all_ts_varlist/am5_components_varlist.yml @@ -24,68 +24,68 @@ postprocess: - history_file: "atmos_daily" - history_file: "atmos_month" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_cmip' sources: - history_file: "atmos_8xdaily_cmip" - history_file: "atmos_daily_cmip" - history_file: "atmos_month_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_scalar' sources: - history_file: "atmos_global_cmip" - history_file: "atmos_scalar" - postprocess_on: True + postprocess-on: True - type: 'atmos_diurnal' sources: - history_file: "atmos_diurnal" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'aerosol' sources: - history_file: "aerosol_month_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_level' sources: - history_file: "atmos_level_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_month_aer' sources: - history_file: "atmos_month_aer" <<: *regrid-c1 - postprocess_on: True + postprocess-on: True - type: 'tracer_level' sources: - history_file: "atmos_tracer" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'land' sources: - history_file: "land_month" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'land_cmip' sources: - history_file: "land_daily_cmip" - history_file: "land_month_cmip" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'land_inst' sources: - history_file: "land_month_inst" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'river' sources: - history_file: "river_daily" - history_file: "river_month" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'river_inst' sources: - history_file: "river_month_inst" <<: *regrid-land - postprocess_on: True + postprocess-on: True diff --git a/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/none_ts_varlist/am5_components_varlist.yml b/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/none_ts_varlist/am5_components_varlist.yml index 4cefec9e2..d9eb92a11 100644 --- a/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/none_ts_varlist/am5_components_varlist.yml +++ b/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/none_ts_varlist/am5_components_varlist.yml @@ -25,68 +25,68 @@ postprocess: variables: ["tasmax", "tasmin", "precip"] - history_file: "atmos_month" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_cmip' sources: - history_file: "atmos_8xdaily_cmip" - history_file: "atmos_daily_cmip" - history_file: "atmos_month_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_scalar' sources: - history_file: "atmos_global_cmip" - history_file: "atmos_scalar" - postprocess_on: True + postprocess-on: True - type: 'atmos_diurnal' sources: - history_file: "atmos_diurnal" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'aerosol' sources: - history_file: "aerosol_month_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_level' sources: - history_file: "atmos_level_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_month_aer' sources: - history_file: "atmos_month_aer" <<: *regrid-c1 - postprocess_on: True + postprocess-on: True - type: 'tracer_level' sources: - history_file: "atmos_tracer" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'land' sources: - history_file: "land_month" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'land_cmip' sources: - history_file: "land_daily_cmip" - history_file: "land_month_cmip" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'land_inst' sources: - history_file: "land_month_inst" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'river' sources: - history_file: "river_daily" - history_file: "river_month" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'river_inst' sources: - history_file: "river_month_inst" <<: *regrid-land - postprocess_on: True + postprocess-on: True diff --git a/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/some_ts_varlist/am5_components_varlist.yml b/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/some_ts_varlist/am5_components_varlist.yml index 84496be26..95bfa2a48 100644 --- a/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/some_ts_varlist/am5_components_varlist.yml +++ b/fre/tests/test_files/ascii_files/split_netcdf/atmos_daily.tile3/some_ts_varlist/am5_components_varlist.yml @@ -25,68 +25,68 @@ postprocess: variables: ["tasmax", "tasmin", "ps", "tasmin", "tas", "temp", "zsurf", "pv350K"] - history_file: "atmos_month" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_cmip' sources: - history_file: "atmos_8xdaily_cmip" - history_file: "atmos_daily_cmip" - history_file: "atmos_month_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_scalar' sources: - history_file: "atmos_global_cmip" - history_file: "atmos_scalar" - postprocess_on: True + postprocess-on: True - type: 'atmos_diurnal' sources: - history_file: "atmos_diurnal" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'aerosol' sources: - history_file: "aerosol_month_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_level' sources: - history_file: "atmos_level_cmip" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'atmos_month_aer' sources: - history_file: "atmos_month_aer" <<: *regrid-c1 - postprocess_on: True + postprocess-on: True - type: 'tracer_level' sources: - history_file: "atmos_tracer" <<: *regrid-c2 - postprocess_on: True + postprocess-on: True - type: 'land' sources: - history_file: "land_month" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'land_cmip' sources: - history_file: "land_daily_cmip" - history_file: "land_month_cmip" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'land_inst' sources: - history_file: "land_month_inst" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'river' sources: - history_file: "river_daily" - history_file: "river_month" <<: *regrid-land - postprocess_on: True + postprocess-on: True - type: 'river_inst' sources: - history_file: "river_month_inst" <<: *regrid-land - postprocess_on: True + postprocess-on: True diff --git a/fre/yamltools/tests/AM5_example/am5.yaml b/fre/yamltools/tests/AM5_example/am5.yaml index c34be59f3..1f0d78137 100644 --- a/fre/yamltools/tests/AM5_example/am5.yaml +++ b/fre/yamltools/tests/AM5_example/am5.yaml @@ -52,7 +52,7 @@ experiments: pp: - "pp_yamls/pp.c96_amip.yaml" - "pp_yamls/pp-TEST.c96_amip.yaml" - analysis: + final-step-user-scripts: - "analysis_yamls/clouds.yaml" - "analysis_yamls/land.yaml" cmor: # cmor-tool development, not part of official am5.yaml (yet) diff --git a/fre/yamltools/tests/AM5_example/pp_yamls/pp-TEST.c96_amip.yaml b/fre/yamltools/tests/AM5_example/pp_yamls/pp-TEST.c96_amip.yaml index db43e9c42..2541d61f4 100644 --- a/fre/yamltools/tests/AM5_example/pp_yamls/pp-TEST.c96_amip.yaml +++ b/fre/yamltools/tests/AM5_example/pp_yamls/pp-TEST.c96_amip.yaml @@ -14,7 +14,7 @@ postprocess: xyInterp: *custom_interp interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos-TEST" sources: - history_file: "atmos_month" @@ -22,4 +22,4 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False diff --git a/fre/yamltools/tests/AM5_example/pp_yamls/pp.c96_amip.yaml b/fre/yamltools/tests/AM5_example/pp_yamls/pp.c96_amip.yaml index 57ad65b85..6dd74748e 100644 --- a/fre/yamltools/tests/AM5_example/pp_yamls/pp.c96_amip.yaml +++ b/fre/yamltools/tests/AM5_example/pp_yamls/pp.c96_amip.yaml @@ -15,7 +15,7 @@ postprocess: xyInterp: *custom_interp interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos" sources: - history_file: "atmos_month" @@ -23,7 +23,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: True + postprocess-on: True - type: "atmos_level_cmip" sources: - history_file: "atmos_level_cmip" @@ -31,7 +31,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_level" sources: - history_file: "atmos_month" @@ -39,7 +39,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_month_aer" sources: - history_file: "atmos_month_aer" @@ -47,7 +47,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_diurnal" sources: - history_file: "atmos_diurnal" @@ -55,11 +55,11 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_scalar" sources: - history_file: "atmos_scalar" - postprocess_on: True + postprocess-on: True - type: "aerosol_cmip" xyInterp: *PP_XYINTERP96 sources: @@ -67,7 +67,7 @@ postprocess: sourceGrid: "cubedsphere" interpMethod: "conserve_order1" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "land" sources: - history_file: "land_month" @@ -75,7 +75,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'land' - postprocess_on: False + postprocess-on: False - type: "land_cmip" sources: - history_file: "land_month_cmip" @@ -83,7 +83,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'land' - postprocess_on: False + postprocess-on: False - type: "tracer_level" sources: - history_file: "atmos_tracer" @@ -91,4 +91,4 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False diff --git a/fre/yamltools/tests/esm4_cmip6_ex/pp_yamls/pp.yaml b/fre/yamltools/tests/esm4_cmip6_ex/pp_yamls/pp.yaml index 39315963c..d25d41056 100644 --- a/fre/yamltools/tests/esm4_cmip6_ex/pp_yamls/pp.yaml +++ b/fre/yamltools/tests/esm4_cmip6_ex/pp_yamls/pp.yaml @@ -16,7 +16,7 @@ postprocess: xyInterp: *custom_interp interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: True + postprocess-on: True - type: "atmos" sources: - history_file: "atmos_month" @@ -24,7 +24,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: True + postprocess-on: True - type: "atmos_level_cmip" sources: - history_file: "atmos_level_cmip" @@ -32,7 +32,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_level" sources: - history_file: "atmos_month" @@ -40,7 +40,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_month_aer" sources: - history_file: "atmos_month_aer" @@ -48,7 +48,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_diurnal" sources: - history_file: "atmos_diurnal" @@ -56,11 +56,11 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order2" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "atmos_scalar" sources: - history_file: "atmos_scalar" - postprocess_on: True + postprocess-on: True - type: "aerosol_cmip" xyInterp: *PP_XYINTERP96 sources: @@ -68,7 +68,7 @@ postprocess: sourceGrid: "cubedsphere" interpMethod: "conserve_order1" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False - type: "land" sources: - history_file: "land_month" @@ -76,7 +76,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'land' - postprocess_on: False + postprocess-on: False - type: "land_cmip" sources: - history_file: "land_month_cmip" @@ -84,7 +84,7 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'land' - postprocess_on: False + postprocess-on: False - type: "tracer_level" sources: - history_file: "atmos_tracer" @@ -92,4 +92,4 @@ postprocess: xyInterp: *PP_XYINTERP96 interpMethod: "conserve_order1" inputRealm: 'atmos' - postprocess_on: False + postprocess-on: False