Skip to content

Commit

Permalink
Unify inline post interfaces (ufs-community#1181)
Browse files Browse the repository at this point in the history 
* replace pwatclm to pwat in the all diag tables under tests/parm/diag_table.
  • Loading branch information
@WenMeng-NOAA
WenMeng-NOAA authored May 5, 2022
1 parent 846f0e4 commit f09e45b
Show file tree
Hide file tree
Showing 31 changed files with 3,896 additions and 3,891 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 6 files
+1 −1 CMakeLists.txt
+12 −15 io/inline_post.F90
+395 −101 io/post_fv3.F90
+0 −2,631 io/post_gfs.F90
+3 −1 io/post_nems_routines.F90
+1 −1 upp
334 changes: 167 additions & 167 deletions tests/RegressionTests_cheyenne.gnu.log
View file

Large diffs are not rendered by default.

1,080 changes: 540 additions & 540 deletions tests/RegressionTests_cheyenne.intel.log
View file

Large diffs are not rendered by default.

1,064 changes: 532 additions & 532 deletions tests/RegressionTests_gaea.intel.log
View file

Large diffs are not rendered by default.

328 changes: 164 additions & 164 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

1,072 changes: 536 additions & 536 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

942 changes: 471 additions & 471 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

1,084 changes: 542 additions & 542 deletions tests/RegressionTests_orion.intel.log
View file

Large diffs are not rendered by default.

728 changes: 364 additions & 364 deletions tests/RegressionTests_wcoss_cray.log
View file

Large diffs are not rendered by default.

1,108 changes: 552 additions & 556 deletions tests/RegressionTests_wcoss_dell_p3.log
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_GOCART
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_aod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_gfsv16
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_gfsv16_merra2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_gfsv16_thompson_extdiag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_hafs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_hafs_template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ ufs.hafs
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_hrrr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_hrrr_stoch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_lam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_p7.2_template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_rap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_rap_noah
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_regional
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_thompson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/diag_table/diag_table_wam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/post_itag
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
&MODEL_INPUTS
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,
/
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/post_itag_fv3lam
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
&MODEL_INPUTS
MODELNAME='FV3R'
/
&NAMPGB
KPO=47,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.,30.,20.,10.,7.,5.,3.,2.,1.,
/
3 changes: 3 additions & 0 deletions tests/parm/post_itag_hafs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
&MODEL_INPUTS
MODELNAME='FV3R'
/
&NAMPGB
KPO=47,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.,30.,20.,10.,7.,5.,3.,2.,1.,
/
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20220502
BL_DATE=20220503
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down

0 comments on commit f09e45b

Please sign in to comment.