Update in-line post for RRFS and GFS (#1690)

* Rename global fv3 inline post itag and control files. * Set read merra2 as default; add SDEN in gfs control file. * Update cpld_control_run.IN for changing post_itag name.
ufs-community · Apr 14, 2023 · 2247060 · 2247060
1 parent f1feb8d
commit 2247060
Show file tree

Hide file tree

Showing 14 changed files with 3,857 additions and 3,938 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -103,9 +103,9 @@ fi
 
 #inline post
 if [[ $POSTAPP = 'global' ]]; then
-  cp    ${PATHRT}/parm/post_itag itag
-  cp    ${PATHRT}/parm/postxconfig-NT.txt postxconfig-NT.txt
-  cp    ${PATHRT}/parm/postxconfig-NT_FH00.txt postxconfig-NT_FH00.txt
+  cp    ${PATHRT}/parm/post_itag_gfs itag
+  cp    ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
+  cp    ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
   cp    ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
 fi
 

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -140,9 +140,9 @@ fi
 
 #inline post
 if [ $WRITE_DOPOST = .true. ]; then
-  cp    ${PATHRT}/parm/post_itag itag
-  cp    ${PATHRT}/parm/postxconfig-NT.txt postxconfig-NT.txt
-  cp    ${PATHRT}/parm/postxconfig-NT_FH00.txt postxconfig-NT_FH00.txt
+  cp    ${PATHRT}/parm/post_itag_gfs itag
+  cp    ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
+  cp    ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
   cp    ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
 fi
 

diff --git a/tests/parm/post_itag → tests/parm/post_itag_gfs b/tests/parm/post_itag → tests/parm/post_itag_gfs
@@ -2,5 +2,5 @@
  MODELNAME='GFS'
 /
 &NAMPGB
- KPO=57,PO=1000.,975.,950.,925.,900.,875.,850.,825.,800.,775.,750.,725.,700.,675.,650.,625.,600.,575.,550.,525.,500.,475.,450.,425.,400.,375.,350.,325.,300.,275.,250.,225.,200.,175.,150.,125.,100.,70.,50.,40.,30.,20.,15.,10.,7.,5.,3.,2.,1.,0.7,0.4,0.2,0.1,0.07,0.04,0.02,0.01,
+ KPO=57,PO=1000.,975.,950.,925.,900.,875.,850.,825.,800.,775.,750.,725.,700.,675.,650.,625.,600.,575.,550.,525.,500.,475.,450.,425.,400.,375.,350.,325.,300.,275.,250.,225.,200.,175.,150.,125.,100.,70.,50.,40.,30.,20.,15.,10.,7.,5.,3.,2.,1.,0.7,0.4,0.2,0.1,0.07,0.04,0.02,0.01,rdaod=.true.,
 /
diff --git a/tests/parm/postxconfig-NT.txt → tests/parm/postxconfig-NT-gfs.txt b/tests/parm/postxconfig-NT.txt → tests/parm/postxconfig-NT-gfs.txt
@@ -1,6 +1,6 @@
 2
 112
-209
+210
 GFSPRS
 0
 ncep_nco
@@ -7750,6 +7750,43 @@ between_first_second_limit
 ?
 ?
 ?
+1006
+SDEN_ON_SURFACE
+?
+1
+tmpl4_0
+SDEN
+?
+?
+surface
+0
+?
+0
+?
+?
+0
+?
+0
+?
+?
+?
+0
+0.0
+0
+0.0
+?
+0
+0.0
+0
+0.0
+1
+6.0
+0
+0
+0
+?
+?
+?
 GFSFLX
 0
 ncep_nco

diff --git a/tests/parm/postxconfig-NT_FH00.txt → tests/parm/postxconfig-NT-gfs_FH00.txt b/tests/parm/postxconfig-NT_FH00.txt → tests/parm/postxconfig-NT-gfs_FH00.txt
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
 fi
 
 
-BL_DATE=20230407
+BL_DATE=20230413
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
+1 −1		io/module_wrt_grid_comp.F90
+1,479 −189		io/post_fv3.F90
+10 −3		io/post_nems_routines.F90
+1 −1		upp
-Original file line number
+Diff line change
@@ Expand Up @@
     fi
-    BL_DATE=20230407
+    BL_DATE=20230413
     RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
@@ Expand Down @@