Merge remote-tracking branch 'EMC/develop' into fixhighrestest

JessicaMeixner-NOAA · Jan 27, 2025 · 5b97753 · 5b97753
2 parents 02ca6ae + 76cecfb
commit 5b97753
Show file tree

Hide file tree

Showing 45 changed files with 777 additions and 2,083 deletions.
diff --git a/.gitignore b/.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
 #--------------------------------------------

diff --git a/ci/cases/pr/C96_atm3DVar.yaml b/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
diff --git a/ci/cases/yamls/gfs_defaults_ci.yaml b/ci/cases/yamls/gfs_defaults_ci.yaml
@@ -3,3 +3,4 @@ defaults:
 base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   DO_TEST_MODE: "NO"
+  DO_METP: "NO"
diff --git a/ci/cases/yamls/gfs_extended_ci.yaml b/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

diff --git a/ci/cases/yamls/gfs_metp_ci.yaml b/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"
diff --git a/env/GAEA.env b/env/GAEA.env