Merge pull request #308 from NOAA-GFDL/162.fix-yaml-overwrites

162.fix yaml overwrites

fre/pp/tests/AM5_example/am5.yaml

@@ -38,12 +38,13 @@ fre_properties:
   - &FMSincludes         "-IFMS/fms2_io/include -IFMS/include -IFMS/mpp/include"
   - &momIncludes         "-Imom6/MOM6-examples/src/MOM6/pkg/CVMix-src/include"
 
+# compile information
+build:
+  compileYaml: "compile.yaml"
+  platformYaml: "yaml_include/platforms.yaml"
+
+
 shared:
-  # compile information
-  compile:
-    compileYaml: &compile_yaml "compile.yaml"
-    platformYaml: "yaml_include/platforms.yaml"
-
   # directories shared across tools
   directories: &shared_directories
     history_dir:  !join [/archive/$USER/, *FRE_STEM, /, *name, /, *platform, -, *target, /, history]
@@ -70,46 +71,36 @@ experiments:
   - name: "c96L65_am5f7b12r1_amip"
     pp:
       - "yaml_include/pp.c96_amip.yaml"
-    compile: *compile_yaml
+      - "yaml_include/pp-test.c96_amip.yaml"
   - name: "c96L65_am5f7b12r1_pdclim1850F"
     pp:
       - "yaml_include/pp.c96_clim.yaml"
-    compile: *compile_yaml
   - name: "c96L65_am5f7b12r1_pdclim2010F"
     pp:
       - "yaml_include/pp.c96_clim.yaml"
-    compile: *compile_yaml
   - name: "c96L65_am5f7b12r1_pdclim2010AERF"
     pp:
       - "yaml_include/pp.c96_clim.yaml"
-    compile: *compile_yaml
   - name: "c384L65_am5f7b12r1_amip"
     pp:
       - "yaml_include/pp.c384_amip.yaml"
-    compile: *compile_yaml
   - name: "c384L65_am5f7b12r1_pdclim2010F"
     pp:
       - "yaml_include/pp.c384_clim.yaml"
-    compile: *compile_yaml
   - name: "c384L65_am5f7b12r1_pdclim1850F"
     pp:
       - "yaml_include/pp.c384_clim.yaml"
-    compile: *compile_yaml
   - name: "c384L65_am5f7b12r1_pdclim2010AERF"
     pp:
       - "yaml_include/pp.c384_clim.yaml"
-    compile: *compile_yaml
   - name: "c384L65_am5f7b12r1_OM4_p25_piControl_noBLING_DynVeg"
     pp:
       - "yaml_include/pp.c384_amip.yaml"
       - "yaml_include/pp.om4.yaml"
-    compile: *compile_yaml
   - name: "c96L65_am5f7b12r1_OM4_p25_piControl_noBLING_DynVeg"
     pp:
       - "yaml_include/pp.c96_amip.yaml"
       - "yaml_include/pp.om4.yaml"
-    compile: *compile_yaml
   - name: "c96L65_am5f7b12r1_amip_cosp"
     pp:
       - "yaml_include/pp.c96_amip.yaml"
-    compile: *compile_yaml

fre/pp/tests/AM5_example/yaml_include/pp-test.c96_amip.yaml

@@ -0,0 +1,44 @@
+# local reusable variable overrides
+fre_properties:
+  - &custom_interp "200,200"
+
+# directory overrides
+#c96_amip_directories:
+directories:
+  <<: *shared_directories
+  ptmp_dir: "/ptmp/$USER"
+  pp_grid_spec: *GRID_SPEC96
+
+#c96_amip_postprocess:
+postprocess:
+  # pp setting overrides
+  settings:
+    <<: *shared_settings
+    pp_start:   *ANA_AMIP_START
+    pp_stop:    *ANA_AMIP_END
+    pp_chunk_a: *PP_AMIP_CHUNK96
+    pp_components: "atmos atmos_scalar"
+  switches:
+    <<: *shared_switches
+    do_statics: False
+
+  # main pp instructions
+  components:
+    - type: "atmos_cmip-TEST"
+      sources: "atmos_month_cmip atmos_8xdaily_cmip atmos_daily_cmip"
+      sourceGrid: "cubedsphere"
+      xyInterp: *custom_interp
+      interpMethod: "conserve_order2"
+      inputRealm: 'atmos'
+    - type: "atmos-TEST"
+      sources: "atmos_month"
+      sourceGrid: "cubedsphere"
+      xyInterp: *PP_XYINTERP96
+      interpMethod: "conserve_order2"
+      inputRealm: 'atmos'
+    - type: "atmos_level_cmip-TEST"
+      sources: "atmos_level_cmip"
+      sourceGrid: "cubedsphere"
+      xyInterp: *PP_XYINTERP96
+      interpMethod: "conserve_order2"
+      inputRealm: 'atmos'