ufs-community · junwang-noaa · Jul 14, 2021 · May 27, 2021 · May 27, 2021 · May 28, 2021
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_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -48,6 +48,7 @@ if [[ $MACHINE_ID == cheyenne.* ]] ; then
     BUILD_JOBS=${BUILD_JOBS:-3}
 elif [[ $MACHINE_ID == wcoss_dell_p3 ]] ; then
     BUILD_JOBS=${BUILD_JOBS:-1}
+    source $PATHTR/NEMS/src/conf/module-setup.sh.inc
 fi
 
 BUILD_JOBS=${BUILD_JOBS:-8}

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -513,7 +513,9 @@ export IMFSHALCNV=2
 export HWRF_SAMFSHAL=.F.
 export IMFDEEPCNV=2
 export HWRF_SAMFDEEP=.F.
-export RAS=.F.
+export RAS=.false.
+export RANDOM_CLDS=.false.
+export CNVCLD=.true.
 
 # Aerosol convective scavenging
 export FSCAV_AERO="'*:0.0'"

diff --git a/tests/parm/c96_HAFS_v0_hwrf.nml.IN b/tests/parm/c96_HAFS_v0_hwrf.nml.IN
@@ -116,7 +116,6 @@
   nst_anl        = .true.
   use_ufo        = .true.
   pre_rad        = .false.
-  ncld           = 5
   imp_physics    = @[IMP_PHYSICS]
   spec_adv       = .true.        ! HWRF F-A
   RHGRD          = 0.98          ! HWRF F-A

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = @[FHCYC]
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.
@@ -138,11 +137,12 @@ deflate_level=1
   satmedmf     = .true.
   isatmedmf    = 1
   lheatstrg    = @[LHEATSTRG]
-  random_clds  = .false.
+  random_clds  = @[RANDOM_CLDS]
   trans_trac   = .true.
-  cnvcld       = .true.
-  imfshalcnv   = 2
-  imfdeepcnv   = 2
+  cnvcld       = @[CNVCLD]
+  imfshalcnv   = @[IMFSHALCNV]
+  imfdeepcnv   = @[IMFDEEPCNV]
+  ras          = @[RAS]
   cdmbgwd      = @[CDMBWD]
   prslrd0      = 0.
   ivegsrc      = 1

diff --git a/tests/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = @[FHCYC]
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_csawmg.nml.IN b/tests/parm/control_csawmg.nml.IN
@@ -114,7 +114,6 @@ deflate_level=1
   use_ufo      = .true.
   pre_rad      = .false.
   crtrh        = 0.93,0.90,0.95
-  ncld         = 2
   imp_physics  = 10
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_flake.nml.IN b/tests/parm/control_flake.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = 24
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_gdas.nml.IN b/tests/parm/control_gdas.nml.IN
@@ -135,7 +135,6 @@ deflate_level=1
   fhcyc        = 1
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_noahmp.nml.IN b/tests/parm/control_noahmp.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = @[FHCYC]
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_rrtmgp.nml.IN b/tests/parm/control_rrtmgp.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = 24
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_thompson.nml.IN b/tests/parm/control_thompson.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = @[FHCYC]
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = @[IMP_PHYSICS]
   ltaerosol    = @[LTAEROSOL]
   lradar       = @[LRADAR]

diff --git a/tests/parm/control_ugwpv1.nml.IN b/tests/parm/control_ugwpv1.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = 24
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/cpt.nml.IN b/tests/parm/cpt.nml.IN
@@ -124,7 +124,6 @@
        use_ufo        = .true.
        pre_rad        = .false.
        crtrh          = 0.93,0.90,0.95
-       ncld           = 2
        imp_physics    = 10
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/csawmg3shoc127.nml.IN b/tests/parm/csawmg3shoc127.nml.IN
@@ -125,7 +125,6 @@
        use_ufo        = .true.
        pre_rad        = .false.
        crtrh          = 0.98,0.98,0.90
-       ncld           = 2
        imp_physics    = 10
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/csawmgshoc.nml.IN b/tests/parm/csawmgshoc.nml.IN
@@ -124,7 +124,6 @@
        use_ufo        = .true.
        pre_rad        = .false.
        crtrh          = 1.00,1.00,0.95
-       ncld           = 2
        imp_physics    = 10
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/esg_HAFS_v0_hwrf.nml.IN b/tests/parm/esg_HAFS_v0_hwrf.nml.IN
@@ -125,7 +125,6 @@
   nst_anl        = .true.
   use_ufo        = .true.
   pre_rad        = .false.
-  ncld           = 5
   imp_physics    = @[IMP_PHYSICS]
   spec_adv       = .true.        ! HWRF F-A
   RHGRD          = 0.98          ! HWRF F-A

diff --git a/tests/parm/gsd.nml.IN b/tests/parm/gsd.nml.IN
@@ -115,7 +115,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = @[IMP_PHYSICS]
        ltaerosol      = @[LTAEROSOL]
        lradar         = @[LRADAR]

diff --git a/tests/parm/gsd_rrtmgp.nml.IN b/tests/parm/gsd_rrtmgp.nml.IN
@@ -115,7 +115,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = @[IMP_PHYSICS]
        ltaerosol      = @[LTAEROSOL]
        lradar         = @[LRADAR]

diff --git a/tests/parm/gsd_sar.nml.IN b/tests/parm/gsd_sar.nml.IN
@@ -136,7 +136,6 @@
      nst_anl        = .true.
      use_ufo        = .true.
      pre_rad        = .false.
-     ncld           = 5
      imp_physics    = 8
 !     ttendlim       = 0.005
      ttendlim       = 50.0

diff --git a/tests/parm/input.benchmark_v16.nml.IN b/tests/parm/input.benchmark_v16.nml.IN
@@ -122,7 +122,6 @@
   fhcyc        = 24
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/input.mom6_ccpp.nml.IN b/tests/parm/input.mom6_ccpp.nml.IN
@@ -128,7 +128,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 1
        imp_physics    = 99
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/input_nest02.nml.IN b/tests/parm/input_nest02.nml.IN
@@ -116,7 +116,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 11
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/multi_gases.nml.IN b/tests/parm/multi_gases.nml.IN
@@ -125,7 +125,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 1
        imp_physics    = 99
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/regional.nml.IN b/tests/parm/regional.nml.IN
@@ -129,7 +129,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 8
        ltaerosol      = .F.
        ttendlim       = -999.0

diff --git a/tests/parm/regional_c768.nml.IN b/tests/parm/regional_c768.nml.IN
@@ -119,7 +119,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 11
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/regional_rrtmgp.nml.IN b/tests/parm/regional_rrtmgp.nml.IN
@@ -129,7 +129,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 8
        ltaerosol      = .F.
        ttendlim       = -999.0

diff --git a/tests/parm/stretched-input.nml.IN b/tests/parm/stretched-input.nml.IN
@@ -117,7 +117,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 11
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/stretched-nest-input.nml.IN b/tests/parm/stretched-nest-input.nml.IN
@@ -126,7 +126,6 @@
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 11
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -7,7 +7,7 @@ COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled,FV3_GFS_v15p2_coupled,FV3
 
 RUN     | cpld_control                                                                                                            | - wcoss_cray                            | fv3 |
 RUN     | cpld_restart                                                                                                            | - wcoss_cray                            |     | cpld_control
-#RUN     | cpld_2threads                                                                                                           | - wcoss_cray                            |     |
+RUN     | cpld_2threads                                                                                                           | - wcoss_cray                            |     |
 RUN     | cpld_decomp                                                                                                             | - wcoss_cray jet.intel                  |     |
 RUN     | cpld_ca                                                                                                                 | - wcoss_cray                            | fv3 |
 

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -414,7 +414,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210708
+BL_DATE=20210712
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/tests/control_ras b/tests/tests/control_ras
@@ -27,11 +27,13 @@ export SDAY=22
 export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
+export WRITE_DOPOST=.T.
 export IAER=5111
 
 export RAS=.T.
 export IMFDEEPCNV=-1
+export CNVCLD=.F.
+export RANDOM_CLDS=.T.
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16_ras

diff --git a/tests/tests/control_ras_debug b/tests/tests/control_ras_debug
@@ -28,6 +28,8 @@ export IAER=5111
 
 export RAS=.T.
 export IMFDEEPCNV=-1
+export CNVCLD=.F.
+export RANDOM_CLDS=.T.
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16_ras
+43 −30		atmos_model.F90
+71 −69		ccpp/data/GFS_typedefs.F90
+23 −37		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/physics
+0 −1		ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
+0 −1		ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst.xml
+92 −0		ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst_flake.xml
+0 −1		ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
+0 −1		ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+0 −1		ccpp/suites/suite_FV3_GFS_v15_ras.xml
+0 −1		ccpp/suites/suite_FV3_GFS_v15_rasmgshoc.xml
+0 −1		ccpp/suites/suite_FV3_GFS_v15plusras.xml
+0 −1		ccpp/suites/suite_FV3_GFS_v16_ras.xml
+95 −0		ccpp/suites/suite_FV3_GFSv17alpha_cpldnsstras.xml
+96 −0		ccpp/suites/suite_FV3_GFSv17alpha_cpldnsstras_flake.xml
+92 −0		ccpp/suites/suite_FV3_GFSv17alpha_cpldnsstrasnoshal.xml
+95 −0		ccpp/suites/suite_FV3_GFSv17alpha_cpldnsstsas.xml
+94 −0		ccpp/suites/suite_FV3_GFSv17alpha_ras.xml
+95 −0		ccpp/suites/suite_FV3_GFSv17alpha_ras_flake.xml
+94 −0		ccpp/suites/suite_FV3_GFSv17alpha_sas.xml
+261 −182		io/FV3GFS_io.F90
+136 −134		stochastic_physics/stochastic_physics_wrapper.F90