Merge branch 'NOAA-EMC:develop' into develop

.gitignore

@@ -82,7 +82,6 @@ parm/ufs/ice_in.IN
 parm/ufs/ufs.configure.*.IN
 parm/ufs/post_itag_gfs
 parm/ufs/ww3_shel.nml.IN
-parm/wafs
 
 # Ignore sorc and logs folders from externals
 #--------------------------------------------

ci/cases/pr/C48mx500_3DVarAOWCDA.yaml

@@ -4,7 +4,7 @@ experiment:
 
 arguments:
   pslot: {{ 'pslot' | getenv }}
-  app: S2S
+  app: S2SW
   resdetatmos: 48
   resdetocean: 5.0
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
@@ -13,7 +13,7 @@ arguments:
   idate: 2021032418
   edate: 2021032500
   nens: 0
-  interval: 0
+  interval: 6
   start: warm
   yaml: {{ HOMEgfs }}/ci/cases/yamls/soca_gfs_defaults_ci.yaml
 

ci/cases/pr/C96_atm3DVar.yaml

@@ -14,7 +14,7 @@ arguments:
   nens: 0
   interval: 24
   start: cold
-  yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml
+  yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_metp_ci.yaml
 
 skip_ci_on_hosts:
   - wcoss2

ci/cases/yamls/gfs_defaults_ci.yaml

@@ -2,4 +2,7 @@ defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
-  DO_TEST_MODE: "NO"
+  DO_TEST_MODE: "YES"
+  FETCHDIR: "/NCEPDEV/emc-global/1year/David.Grumm/test_data"
+  DO_METP: "NO"
+

ci/cases/yamls/gfs_extended_ci.yaml

@@ -8,6 +8,7 @@ base:
   DO_GEMPAK: "YES"
   DO_AWIPS: "YES"
   DO_NPOESS: "YES"
+  DO_METP: "YES"
   DO_GENESIS_FSU: "NO"
   FCST_BREAKPOINTS: 192
   FHMAX_GFS: 384

ci/cases/yamls/gfs_metp_ci.yaml

@@ -0,0 +1,6 @@
+defaults:
+  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+base:
+  ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
+  DO_TEST_MODE: "NO"
+  DO_METP: "YES"

ci/cases/yamls/soca_gfs_defaults_ci.yaml

@@ -3,6 +3,7 @@ defaults:
 base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   DO_JEDIOCNVAR: "YES"
+  DO_METP: "NO"
 
 marineanl:
   SOCA_NINNER: 1