Relocate config templates to dev/ space in prep for EE2

dev/ci/cases/gfsv17/marine3dvar.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 
 base:
   DOIAU: "YES"

dev/ci/cases/gfsv17/marinehyb.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 
 base:
   DOIAU: "YES"

dev/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_JEDISNOWDA: "YES"
   DO_TEST_MODE: "NO"

dev/ci/cases/yamls/gefs_defaults_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gefs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gefs/yaml/defaults.yaml
 base:
   SFS_POST: "NO"
   FHOUT_GFS: 6

dev/ci/cases/yamls/gefs_replay_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gefs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gefs/yaml/defaults.yaml
 base:
   REPLAY_ICS: "YES"
   FCST_BREAKPOINTS: ""

dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DOIAU: "YES"
   DO_JEDIATMVAR: "NO"
@@ -18,11 +18,11 @@ base:
   EUPD_CYC: "both"
   INTERVAL_GFS: 6
   SDATE_GFS: 2021122018
-  NMEM_ENS_GFS: 2 
-  NMEM_ENS_GFS_OFFSET: 0 
+  NMEM_ENS_GFS: 2
+  NMEM_ENS_GFS_OFFSET: 0
   DO_TEST_MODE: "NO"
 
 marineanl:
   SOCA_NINNER: 1
 
-  
+

dev/ci/cases/yamls/gfs_defaults_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_TEST_MODE: "YES"
   FETCHDIR: "/NCEPDEV/emc-global/1year/David.Grumm/test_data"

dev/ci/cases/yamls/gfs_extended_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 
 base:
   DO_GOES: "YES"

dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_GSISOILDA: "YES"
   DO_TEST_MODE: "YES"

dev/ci/cases/yamls/gfs_metp_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_TEST_MODE: "NO"
   DO_METP: "YES"

dev/ci/cases/yamls/sfs_defaults.yaml

@@ -1,26 +1,13 @@
+defaults:
+  !INC {{ HOMEgfs }}/dev/parm/config/sfs/yaml/defaults.yaml
 base:
-  DO_JEDIATMVAR: "NO"
-  DO_JEDIATMENS: "NO"
-  DO_JEDIOCNVAR: "NO"
-  DO_JEDISNOWDA: "NO"
-  DO_MERGENSST: "NO"
-  DO_BUFRSND: "NO"
-  DO_GEMPAK: "NO"
-  DO_AWIPS: "NO"
-  KEEPDATA: "NO"
-  DO_EXTRACTVARS: "NO"
   FHMAX_GFS: 144
-  FHMAX_HF_GFS: 0
-  FHOUT_HF_GFS: 1
   FHOUT_GFS: 24
   FHOUT_OCN_GFS: 24
   FHOUT_ICE_GFS: 24
   FCST_BREAKPOINTS: "48,96"
-  REPLAY_ICS: "NO"
   USE_OCN_ENS_PERTURB_FILES: "YES"
   USE_ATM_ENS_PERTURB_FILES: "YES"
-  HPSSARCH: "NO"
-  LOCALARCH: "NO"
 fcst:
   TYPE: "hydro"
   MONO: "mono"

dev/ci/cases/yamls/sfs_full.yaml

@@ -1,26 +1,14 @@
+defaults:
+  !INC {{ HOMEgfs }}/dev/parm/config/sfs/yaml/defaults.yaml
 base:
-  DO_JEDIATMVAR: "NO"
-  DO_JEDIATMENS: "NO"
-  DO_JEDIOCNVAR: "NO"
-  DO_JEDISNOWDA: "NO"
-  DO_MERGENSST: "NO"
-  DO_BUFRSND: "NO"
-  DO_GEMPAK: "NO"
-  DO_AWIPS: "NO"
-  KEEPDATA: "NO"
-  DO_EXTRACTVARS: "NO"
   FHMAX_GFS: 2976
-  FHMAX_HF_GFS: 0
-  FHOUT_HF_GFS: 1
   FHOUT_GFS: 24
   FHOUT_OCN_GFS: 24
   FHOUT_ICE_GFS: 24
   FCST_BREAKPOINTS: ""
   REPLAY_ICS: "NO"
   USE_OCN_ENS_PERTURB_FILES: "YES"
   USE_ATM_ENS_PERTURB_FILES: "YES"
-  HPSSARCH: "NO"
-  LOCALARCH: "NO"
 fcst:
   TYPE: "hydro"
   MONO: "mono"

dev/ci/cases/yamls/soca_gfs_defaults_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_JEDIOCNVAR: "YES"
   DO_METP: "NO"

dev/ci/cases/yamls/soca_hyb_gfs_defaults_ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_JEDIOCNVAR: "YES"
   DOHYBVAR_OCN: "YES"

dev/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml

@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DOIAU: "NO"
   DO_JEDIATMVAR: "YES"

dev/ci/scripts/unittests/test_create_experiment.py

@@ -23,6 +23,7 @@ def test_create_experiment():
         if case.endswith('.yaml'):
             env['pslot'] = os.path.splitext(case)[0]
             cmd_args = ['-y', f'{yaml_dir}/{case}']
+            print(f"Running create_experiment.py for {case}")
             create_experiment(*cmd_args, env=env)
             if create_experiment.returncode:
                 print(f"FATAL ERROR: Failed to create experiment for {case}")

parm/config/gfs/config.anlstat → dev/parm/config/gfs/config.anlstat

@@ -9,7 +9,7 @@ echo "BEGIN: config.anlstat"
 source "${EXPDIR}/config.resources" anlstat
 
 export JEDI_CONFIG_YAML="${PARMgfs}/gdas/anlstat_jedi_config.yaml.j2"
-export STAT_BASE_CONFIG_YAML="${PARMgfs}/config/gfs/yaml/stat_base_config.yaml.j2"
+export STAT_BASE_CONFIG_YAML="${PARMgfs}/gdas/stat_base_config.yaml.j2"
 export JCB_BASE_YAML="${PARMgfs}/gdas/stat/aero/jcb-base.yaml.j2"
 export JCB_ALGO_YAML="${PARMgfs}/gdas/jcb-algorithms/anlstat.yaml.j2"
 export JEDIEXE="${HOMEgfs}/sorc/gdas.cd/build/bin/ioda-stats.x"

dev/workflow/setup_expt.py

@@ -174,9 +174,10 @@ def _gfs_args(parser):
         parser.add_argument('--run', help='RUN to start the experiment',
                             type=str, required=False, default='gdas')
         # --configdir is hidden from help
-        parser.add_argument('--configdir', help=SUPPRESS, type=str, required=False, default=os.path.join(_top, 'parm/config/gfs'))
-        parser.add_argument('--yaml', help='Defaults to substitute from', type=str,
-                            required=False, default=os.path.join(_top, 'parm/config/gfs/yaml/defaults.yaml'))
+        parser.add_argument('--configdir', help=SUPPRESS, type=str, required=False,
+                            default=os.path.join(_top, 'dev/parm/config/gfs'))
+        parser.add_argument('--yaml', help='Defaults to substitute from', type=str, required=False,
+                            default=os.path.join(_top, 'dev/parm/config/gfs/yaml/defaults.yaml'))
         return parser
 
     def _gfs_cycled_args(parser):
@@ -200,19 +201,21 @@ def _any_forecast_args(parser):
     def _gefs_args(parser):
         parser.add_argument('--start', help='restart mode: warm or cold', type=str,
                             choices=['warm', 'cold'], required=False, default='cold')
+        # --configdir is hidden from help
         parser.add_argument('--configdir', help=SUPPRESS, type=str, required=False,
-                            default=os.path.join(_top, 'parm/config/gefs'))
+                            default=os.path.join(_top, 'dev/parm/config/gefs'))
         parser.add_argument('--yaml', help='Defaults to substitute from', type=str, required=False,
-                            default=os.path.join(_top, 'parm/config/gefs/yaml/defaults.yaml'))
+                            default=os.path.join(_top, 'dev/parm/config/gefs/yaml/defaults.yaml'))
         return parser
 
     def _sfs_args(parser):
         parser.add_argument('--start', help='restart mode: warm or cold', type=str,
                             choices=['warm', 'cold'], required=False, default='cold')
+        # --configdir is hidden from help
         parser.add_argument('--configdir', help=SUPPRESS, type=str, required=False,
-                            default=os.path.join(_top, 'parm/config/sfs'))
+                            default=os.path.join(_top, 'dev/parm/config/sfs'))
         parser.add_argument('--yaml', help='Defaults to substitute from', type=str, required=False,
-                            default=os.path.join(_top, 'parm/config/sfs/yaml/defaults.yaml'))
+                            default=os.path.join(_top, 'dev/parm/config/sfs/yaml/defaults.yaml'))
         return parser
 
     description = """

docs/source/setup.rst

@@ -55,7 +55,7 @@ where:
    * ``$IDATE`` is the initial start date of your run (first cycle CDATE, YYYYMMDDCC)
    * ``$EDATE`` is the ending date of your run (YYYYMMDDCC) and is the last cycle that will complete [default: $IDATE]
    * ``$PSLOT`` is the name of your experiment [default: test]
-   * ``$CONFIGDIR`` is the path to the ``/config`` folder under the copy of the system you're using [default: $TOP_OF_CLONE/parm/config/]
+   * ``$CONFIGDIR`` is the path to the ``/config`` folder under the copy of the system you're using [default: $TOP_OF_CLONE/dev/parm/config/]
    * ``$RESDETATMOS`` is the resolution of the atmosphere component of the system (i.e. 768 for C768) [default: 384]
    * ``$RESDETOCEAN`` is the resolution of the ocean component of the system (i.e. 0.25 for 1/4 degree) [default: 0.; determined based on atmosphere resolution]
    * ``$INTERVAL_GFS`` is the forecast interval in hours [default: 6]
@@ -177,7 +177,7 @@ where:
    * ``$NENS`` is the number of ensemble members [default: 20]
    * ``$RUN`` is the starting phase [default: gdas]
    * ``$PSLOT`` is the name of your experiment [default: test]
-   * ``$CONFIGDIR`` is the path to the config folder under the copy of the system you're using [default: $TOP_OF_CLONE/parm/config/]
+   * ``$CONFIGDIR`` is the path to the config folder under the copy of the system you're using [default: $TOP_OF_CLONE/dev/parm/config/]
    * ``$COMROOT`` is the path to your experiment output directory. Your ``ROTDIR`` (rotating com directory) will be created using ``COMROOT`` and ``PSLOT``. [default: $HOME]
    * ``$EXPDIR`` is the path to your experiment directory where your configs will be placed and where you will find your workflow monitoring files (i.e. rocoto database and xml file). DO NOT include PSLOT folder at end of path, it will be built for you. [default: $HOME]
    * ``$ICSDIR`` is the path to the ICs for your run if generated separately. [default: None]
@@ -187,7 +187,7 @@ Example:
 ::
 
    cd dev/workflow
-   ./setup_expt.py gfs cycled --pslot test --configdir /home/Joe.Schmo/git/global-workflow/parm/config --idate 2020010100 --edate 2020010118 --comroot /some_large_disk_area/Joe.Schmo/comroot --expdir /some_safe_disk_area/Joe.Schmo/expdir --resdetatmos 384 --resensatmos 192 --nens 80 --interval 6
+   ./setup_expt.py gfs cycled --pslot test --configdir /home/Joe.Schmo/git/global-workflow/dev/parm/config --idate 2020010100 --edate 2020010118 --comroot /some_large_disk_area/Joe.Schmo/comroot --expdir /some_safe_disk_area/Joe.Schmo/expdir --resdetatmos 384 --resensatmos 192 --nens 80 --interval 6
 
 Example ``setup_expt.py`` on Orion: