Merge pull request ufs-community#44 from climbfuji/dom_unified_ugwp_c…

…leanup Unified UGWP wrapper PR around ufs-community#43
climbfuji · Nov 17, 2020 · 18cda90 · 18cda90
2 parents 1848561 + 33c332c
commit 18cda90
Show file tree

Hide file tree

Showing 14 changed files with 428 additions and 2,769 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -141,6 +141,13 @@ export LDIAG_UGWP=.F.
 export DO_UGWP=.F.
 export DO_TOFD=.F.
 export GWD_OPT=1
+export DO_UGWP_V0=.F.
+export DO_UGWP_V0_OROG_ONLY=.F.
+export DO_GSL_DRAG_LS_BL=.F.
+export DO_GSL_DRAG_SS=.F.
+export DO_GSL_DRAG_TOFD=.F.
+export DO_UGWP_V1=.F.
+export DO_UGWP_V1_OROG_ONLY=.F.
 
 # PBL
 export SATMEDMF=.F.

diff --git a/tests/fv3_conf/ccpp_gsd_run.IN b/tests/fv3_conf/ccpp_gsd_run.IN
@@ -66,6 +66,6 @@ if [ $IMP_PHYSICS = 8 ]; then
   cp    @[RTPWD]/FV3_input_data_gsd/CCN_ACTIVATE.BIN .
 fi
 
-if [ $GWD_OPT = 3 ] || [ $GWD_OPT = 33 ]; then
+if [ $GWD_OPT = 3 ] || [ $GWD_OPT = 33 ] || [ $GWD_OPT = 2 ] || [ $GWD_OPT = 22 ]; then
   cp @[RTPWD]/FV3_input_data_gsd/drag_suite/* INPUT/
 fi
diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN
@@ -193,6 +193,13 @@
        bl_mynn_edmf      = 1
        bl_mynn_edmf_mom  = 1
        gwd_opt        = @[GWD_OPT]
+       do_ugwp_v0           = @[DO_UGWP_V0]
+       do_ugwp_v0_orog_only = @[DO_UGWP_V0_OROG_ONLY]
+       do_gsl_drag_ls_bl    = @[DO_GSL_DRAG_LS_BL]
+       do_gsl_drag_ss       = @[DO_GSL_DRAG_SS]
+       do_gsl_drag_tofd     = @[DO_GSL_DRAG_TOFD]
+       do_ugwp_v1           = @[DO_UGWP_V1]
+       do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY]
 /
 
 &gfdl_cloud_microphysics_nml

diff --git a/tests/rt_ccpp_gsd.conf b/tests/rt_ccpp_gsd.conf
@@ -31,12 +31,14 @@ RUN     | fv3_ccpp_gf
 RUN     | fv3_ccpp_mynn                                                                                                            | standard    |                | fv3         |
 RUN     | fv3_ccpp_gsd_sar                                                                                                         | standard    |                | fv3         |
 
-COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_RAP,FV3_HRRR                                                             | standard    | hera.intel     | fv3         |
-COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_RAP,FV3_HRRR                                                             | standard    | cheyenne.intel | fv3         |
-COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_RAP,FV3_HRRR                                                             | standard    | cheyenne.gnu   | fv3         |
+COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_GSD_v0_unified_ugwp_suite,FV3_RAP,FV3_HRRR                               | standard    | hera.intel     | fv3         |
+COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_GSD_v0_unified_ugwp_suite,FV3_RAP,FV3_HRRR                               | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_GSD_v0_unified_ugwp_suite,FV3_RAP,FV3_HRRR                               | standard    | cheyenne.gnu   | fv3         |
 
 # Orographic data for drag suite (used by all three tests) staged only on hera for the moment
 RUN     | fv3_ccpp_gsd_drag_suite                                                                                                  | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gsd_unified_ugwp                                                                                                | standard    | hera.intel     |             |
+RUN     | fv3_ccpp_gsd_drag_suite_unified_ugwp                                                                                     | standard    | hera.intel     |             |
 RUN     | fv3_ccpp_rap                                                                                                             | standard    | hera.intel     | fv3         |
 RUN     | fv3_ccpp_hrrr                                                                                                            | standard    | hera.intel     | fv3         |
 

diff --git a/tests/tests/fv3_ccpp_gocart_clm b/tests/tests/fv3_ccpp_gocart_clm
@@ -68,3 +68,8 @@ export CCPP_SUITE=FV3_GFS_2017_gfdlmp
 export CCPP_LIB_DIR=ccpp/lib
 export INPUT_NML=ccpp.gocart.nml.IN
 
+# Increase the number of nodes on Cheyenne to avoid out of memory errors
+if [[ $MACHINE_ID = cheyenne.* ]]; then
+  # Use 30 instead of 36 tasks per node
+  export TPN=30
+fi
diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite b/tests/tests/fv3_ccpp_gsd_drag_suite
@@ -95,7 +95,13 @@ export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
 export GWD_OPT=3
-
+export DO_UGWP_V0=.F.
+export DO_UGWP_V0_OROG_ONLY=.F.
+export DO_GSL_DRAG_LS_BL=.T.
+export DO_GSL_DRAG_SS=.T.
+export DO_GSL_DRAG_TOFD=.T.
+export DO_UGWP_V1=.F.
+export DO_UGWP_V1_OROG_ONLY=.F.
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp b/tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp
@@ -0,0 +1,107 @@
+###############################################################################
+#
+#  FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM + GSD DRAG) test
+#
+###############################################################################
+
+export TEST_DESCR="Compare unified_ugwp FV3 CCPP GSD + DRAG results with previous trunk version"
+
+export CNTL_DIR=fv3_gsd_drag_suite
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+                   atmos_4xdaily.tile2.nc \
+                   atmos_4xdaily.tile3.nc \
+                   atmos_4xdaily.tile4.nc \
+                   atmos_4xdaily.tile5.nc \
+                   atmos_4xdaily.tile6.nc \
+                   phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   phyf024.tile1.nc \
+                   phyf024.tile2.nc \
+                   phyf024.tile3.nc \
+                   phyf024.tile4.nc \
+                   phyf024.tile5.nc \
+                   phyf024.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   dynf024.tile1.nc \
+                   dynf024.tile2.nc \
+                   dynf024.tile3.nc \
+                   dynf024.tile4.nc \
+                   dynf024.tile5.nc \
+                   dynf024.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc"
+
+export_fv3
+
+export FHMAX=24
+export FDIAG=3
+
+export DT_ATMOS="600"
+export IMP_PHYSICS=8
+export DNATS=0
+export DO_SAT_ADJ=.F.
+export LRADAR=.T.
+export LTAEROSOL=.T.
+
+export FV3_RUN=ccpp_gsd_run.IN
+export CCPP_SUITE=FV3_GSD_v0_unified_ugwp_suite
+export CCPP_LIB_DIR=ccpp/lib
+export INPUT_NML=ccpp_gsd.nml.IN
+
+export HYBEDMF=.F.
+export DO_MYNNEDMF=.T.
+export IMFSHALCNV=3
+export IMFDEEPCNV=3
+export LSM=3
+export LSOIL_LSM=9
+export GWD_OPT=2
+export DO_UGWP_V0=.F.
+export DO_UGWP_V0_OROG_ONLY=.F.
+export DO_GSL_DRAG_LS_BL=.T.
+export DO_GSL_DRAG_SS=.T.
+export DO_GSL_DRAG_TOFD=.T.
+export DO_UGWP_V1=.F.
+export DO_UGWP_V1_OROG_ONLY=.F.
+
+export WLCLK=30
+
diff --git a/tests/tests/fv3_ccpp_gsd_unified_ugwp b/tests/tests/fv3_ccpp_gsd_unified_ugwp
@@ -0,0 +1,131 @@
+###############################################################################
+#
+#  FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM) full (0-48h) test
+#
+###############################################################################
+
+export TEST_DESCR="Compare unified_ugwp FV3 CCPP GSD results with previous trunk version"
+
+export CNTL_DIR=fv3_gsd
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+                   atmos_4xdaily.tile2.nc \
+                   atmos_4xdaily.tile3.nc \
+                   atmos_4xdaily.tile4.nc \
+                   atmos_4xdaily.tile5.nc \
+                   atmos_4xdaily.tile6.nc \
+                   phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   phyf024.tile1.nc \
+                   phyf024.tile2.nc \
+                   phyf024.tile3.nc \
+                   phyf024.tile4.nc \
+                   phyf024.tile5.nc \
+                   phyf024.tile6.nc \
+                   phyf027.tile1.nc \
+                   phyf027.tile2.nc \
+                   phyf027.tile3.nc \
+                   phyf027.tile4.nc \
+                   phyf027.tile5.nc \
+                   phyf027.tile6.nc \
+                   phyf048.tile1.nc \
+                   phyf048.tile2.nc \
+                   phyf048.tile3.nc \
+                   phyf048.tile4.nc \
+                   phyf048.tile5.nc \
+                   phyf048.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   dynf024.tile1.nc \
+                   dynf024.tile2.nc \
+                   dynf024.tile3.nc \
+                   dynf024.tile4.nc \
+                   dynf024.tile5.nc \
+                   dynf024.tile6.nc \
+                   dynf027.tile1.nc \
+                   dynf027.tile2.nc \
+                   dynf027.tile3.nc \
+                   dynf027.tile4.nc \
+                   dynf027.tile5.nc \
+                   dynf027.tile6.nc \
+                   dynf048.tile1.nc \
+                   dynf048.tile2.nc \
+                   dynf048.tile3.nc \
+                   dynf048.tile4.nc \
+                   dynf048.tile5.nc \
+                   dynf048.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc"
+
+export_fv3
+
+export FHMAX=48
+export FDIAG=3
+
+export DT_ATMOS="600"
+export IMP_PHYSICS=8
+export DNATS=0
+export DO_SAT_ADJ=.F.
+export LRADAR=.T.
+export LTAEROSOL=.T.
+
+export FV3_RUN=ccpp_gsd_run.IN
+export CCPP_SUITE=FV3_GSD_v0_unified_ugwp_suite
+export CCPP_LIB_DIR=ccpp/lib
+export INPUT_NML=ccpp_gsd.nml.IN
+
+export HYBEDMF=.F.
+export DO_MYNNEDMF=.T.
+export IMFSHALCNV=3
+export IMFDEEPCNV=3
+export LSM=3
+export LSOIL_LSM=9
+export GWD_OPT=2
+export DO_UGWP_V0=.T.
+export DO_UGWP_V0_OROG_ONLY=.F.
+export DO_GSL_DRAG_LS_BL=.F.
+export DO_GSL_DRAG_SS=.F.
+export DO_GSL_DRAG_TOFD=.F.
+export DO_UGWP_V1=.F.
+export DO_UGWP_V1_OROG_ONLY=.F.
+
+export WLCLK=30
+
diff --git a/tests/tests/fv3_ccpp_hrrr b/tests/tests/fv3_ccpp_hrrr
@@ -96,7 +96,13 @@ export IMFDEEPCNV=-1
 export LSM=3
 export LSOIL_LSM=9
 export GWD_OPT=3
-
+export DO_UGWP_V0=.F.
+export DO_UGWP_V0_OROG_ONLY=.F.
+export DO_GSL_DRAG_LS_BL=.T.
+export DO_GSL_DRAG_SS=.T.
+export DO_GSL_DRAG_TOFD=.T.
+export DO_UGWP_V1=.F.
+export DO_UGWP_V1_OROG_ONLY=.F.
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_rap b/tests/tests/fv3_ccpp_rap
@@ -96,7 +96,13 @@ export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
 export GWD_OPT=3
-
+export DO_UGWP_V0=.F.
+export DO_UGWP_V0_OROG_ONLY=.F.
+export DO_GSL_DRAG_LS_BL=.T.
+export DO_GSL_DRAG_SS=.T.
+export DO_GSL_DRAG_TOFD=.T.
+export DO_UGWP_V1=.F.
+export DO_UGWP_V1_OROG_ONLY=.F.
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_rrfs_v1beta b/tests/tests/fv3_ccpp_rrfs_v1beta
@@ -119,6 +119,13 @@ export IMFDEEPCNV=-1
 export LSM=2
 export LSOIL_LSM=4
 #export GWD_OPT=3
+#export DO_UGWP_V0=.F.
+#export DO_UGWP_V0_OROG_ONLY=.F.
+#export DO_GSL_DRAG_LS_BL=.T.
+#export DO_GSL_DRAG_SS=.T.
+#export DO_GSL_DRAG_TOFD=.T.
+#export DO_UGWP_V1=.F.
+#export DO_UGWP_V1_OROG_ONLY=.F.
 export DO_MYNNSFCLAY=.T.
 
 

diff --git a/tests/tests/fv3_ccpp_rrfs_v1beta_debug b/tests/tests/fv3_ccpp_rrfs_v1beta_debug
@@ -95,6 +95,13 @@ export IMFDEEPCNV=-1
 export LSM=2
 export LSOIL_LSM=4
 #export GWD_OPT=3
+#export DO_UGWP_V0=.F.
+#export DO_UGWP_V0_OROG_ONLY=.F.
+#export DO_GSL_DRAG_LS_BL=.T.
+#export DO_GSL_DRAG_SS=.T.
+#export DO_GSL_DRAG_TOFD=.T.
+#export DO_UGWP_V1=.F.
+#export DO_UGWP_V1_OROG_ONLY=.F.
 export DO_MYNNSFCLAY=.T.