Bug fixes for WAM physics and regression tests, remove duplicate modu…

…les from ccpp-physics CMakeLists.txt (#947) *adds a new regression test control_wam_debug and fixes problems with the existing control_wam test (e.g. IAER was not set as intended).
ufs-community · Dec 30, 2021 · 538a074 · 538a074
1 parent 629be05
commit 538a074
Show file tree

Hide file tree

Showing 15 changed files with 3,650 additions and 3,853 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_gaea.intel.log b/tests/RegressionTests_gaea.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_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/parm/wam.nml.IN b/tests/parm/wam.nml.IN
@@ -36,7 +36,7 @@
        ncnst     = 11
        make_nh = @[MAKE_NH]
        fv_debug = .false.
-       molecular_diffusion=.true.    
+       molecular_diffusion=.true.
        range_warn = .false.
        reset_eta = .false.
        n_sponge = -1
@@ -131,7 +131,7 @@
        fhlwr          = 3600.
        ialb           = 1
        iems           = 1
-       IAER           = 111
+       IAER           = @[IAER]
        ico2           = 2
        isubc_sw       = 2
        isubc_lw       = 2
@@ -343,4 +343,3 @@
   md_consv_te = 1.0
   md_wait_hr  = 0.0
 /
-
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -135,6 +135,9 @@ RUN     | rap_flake_debug
 RUN     | rap_noah_sfcdiff_cires_ugwp_debug                                                                                       |                                         | fv3 |
 RUN     | rrfs_v1beta_debug                                                                                                       |                                         | fv3 |
 
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON                                       |                                         | fv3 |
+RUN     | control_wam_debug                                                                                                       |                                         | fv3 |
+
 ###################################################################################################################################################################################
 # HAFS tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
@@ -144,10 +147,10 @@ RUN     | hafs_regional_atm
 RUN     | hafs_regional_atm_ocn                                                                                                   | - wcoss2                                | fv3 |
 RUN     | hafs_regional_atm_wav                                                                                                   | - wcoss2                                | fv3 |
 RUN     | hafs_regional_atm_ocn_wav                                                                                               | - wcoss2                                | fv3 |
-RUN     | hafs_regional_1nest_atm                                                                                                 | - jet.intel wcoss2                            | fv3 |
-RUN     | hafs_regional_telescopic_2nests_atm                                                                                     | - jet.intel wcoss2                            | fv3 |
-RUN     | hafs_global_1nest_atm                                                                                                   | - jet.intel wcoss2                            | fv3 |
-RUN     | hafs_global_multiple_4nests_atm                                                                                         | - jet.intel wcoss_cray wcoss2                 | fv3 |
+RUN     | hafs_regional_1nest_atm                                                                                                 | - jet.intel wcoss2                      | fv3 |
+RUN     | hafs_regional_telescopic_2nests_atm                                                                                     | - jet.intel wcoss2                      | fv3 |
+RUN     | hafs_global_1nest_atm                                                                                                   | - jet.intel wcoss2                      | fv3 |
+RUN     | hafs_global_multiple_4nests_atm                                                                                         | - jet.intel wcoss_cray wcoss2           | fv3 |
 
 COMPILE | -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON                        | - wcoss_cray wcoss2                     | fv3 |
 RUN     | hafs_regional_docn                                                                                                      | - wcoss_cray wcoss2                     | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -465,7 +465,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20211222
+BL_DATE=20211229
 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

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -55,8 +55,8 @@ RUN     | control_ras_debug
 RUN     | control_stochy_debug                                                                                                    |                | fv3         |
 RUN     | control_debug_p7                                                                                                        |                | fv3         |
 
-#COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_2017_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON                                      |                | fv3         |
-#RUN     | fv3_multigases_debug                                                                                                    |                | fv3         |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON                                       |                | fv3         |
+RUN     | control_wam_debug                                                                                                       |                | fv3         |
 
 ##################################################################################################################################################################
 # S2S tests                                                                                                                                                      #

diff --git a/tests/tests/control_wam b/tests/tests/control_wam
@@ -20,6 +20,7 @@ export SMONTH="03"
 export SDAY="22"
 export SHOUR="06"
 export FHMAX=24
+
 export WARM_START=.true.
 export NA_INIT=0
 export EXTERNAL_IC=.false.
@@ -28,12 +29,15 @@ export MAKE_NH=.false.
 export MOUNTAIN=.true.
 export FDIAG=3
 export NSTF_NAME=0,0,1,0,5
-export INPUT_NML=wam.nml.IN
+export IAER=5111
+export DO_SAT_ADJ=.false.
+
 export FV3_RUN=wam_run.IN
 export CCPP_SUITE=FV3_GFS_v16_fv3wam
+export INPUT_NML=wam.nml.IN
 export DIAG_TABLE=diag_table_wam
 export FIELD_TABLE=field_table_wam
-export IAER=5111
+
 export QUILTING=.true.
 export OUTPUT_GRID="gaussian_grid"
 export OZ_PHYS_OLD=.false.

diff --git a/tests/tests/control_wam_debug b/tests/tests/control_wam_debug
@@ -0,0 +1,52 @@
+###############################################################################
+#
+#  Global control multigases debug test
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control multigases debug results with previous trunk version"
+
+export CNTL_DIR=control_wam_debug
+
+export LIST_FILES="sfcf019.nc \
+                   atmf019.nc"
+
+export_fv3
+export NPZ=149
+export NPZP=150
+export DT_ATMOS="225"
+export SYEAR="2021"
+export SMONTH="03"
+export SDAY="22"
+export SHOUR="06"
+
+export FHMAX=19
+export OUTPUT_FH="0 19"
+#export WRITE_DOPOST=.true.
+
+export WARM_START=.true.
+export NA_INIT=0
+export EXTERNAL_IC=.false.
+export NGGPS_IC=.false.
+export MAKE_NH=.false.
+export MOUNTAIN=.true.
+export FDIAG=3
+export NSTF_NAME=0,0,1,0,5
+export IAER=5111
+export DO_SAT_ADJ=.false.
+
+export FV3_RUN=wam_run.IN
+export CCPP_SUITE=FV3_GFS_v16_fv3wam
+export INPUT_NML=wam.nml.IN
+export DIAG_TABLE=diag_table_wam
+export FIELD_TABLE=field_table_wam
+
+export QUILTING=.true.
+export OUTPUT_GRID="gaussian_grid"
+export OZ_PHYS_OLD=.false.
+export OZ_PHYS_NEW=.true.
+export H2O_PHYS=.true.
+export NFHOUT=6
+export NFHMAX=24
+export NFHOUT_HF=6
+export FHROT=18
+2 −2		ccpp/data/CCPP_typedefs.F90
+5 −2		ccpp/data/GFS_typedefs.F90
+3 −3		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/physics