Merge HWRF version of saSAS with GFS version (NOAA-EMC#94)

Changes in this PR: * add a new regression test that uses the HWRF versions of saSAS deep and shallow convection * update how the sutils module is loaded on hera and jet * contains @MinsukJi-NOAA's unit testing branch * contains @DusanJovic-NOAA's butterfly effect branch (changes in GFDL_atmos_cubed_sphere only) Note: The changes in the ccpp-physics PR NCAR/ccpp-physics#423 lead to different results for two existing regression tests in PROD mode: fv3_ccpp_regional_c768 and fv3_ccpp_stretched_nest. In a separate comment below, I will describe in detail my investigation that allowed me to conclude that this change is acceptable. Co-authored-by: MinsukJi-NOAA <Minsuk.Ji@noaa.gov> Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
zhanglikate · Jun 5, 2020 · 1150bf5 · 1150bf5
1 parent a0c27d8
commit 1150bf5
Show file tree

Hide file tree

Showing 42 changed files with 25,652 additions and 1,829 deletions.
diff --git a/FV3 b/FV3
diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/hera.gnu/fv3
@@ -15,7 +15,8 @@ setenv NCEPLIBS /scratch2/NCEPDEV/nwprod/NCEPLIBS
 ## load contrib environment
 ## load slurm utils (arbitrary.pl  layout.pl)
 ##
-module load contrib sutils
+module use -a /contrib/sutils/modulefiles
+module load sutils
 
 ##
 ## load programming environment

diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
@@ -12,7 +12,8 @@ module-whatis "loads NEMS FV3 prerequisites for Hera/Intel"
 ## load contrib environment
 ## load slurm utils (arbitrary.pl  layout.pl)
 ##
-module load contrib sutils
+module use -a /contrib/sutils/modulefiles
+module load sutils
 
 ##
 ## load programming environment

diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/jet.intel/fv3
@@ -13,7 +13,8 @@ module purge
 ## load contrib environment
 ## load slurm utils (arbitrary.pl  layout.pl)
 ##
-module load contrib sutils
+module use -a /contrib/sutils/modulefiles
+module load sutils
 
 module load intel/18.0.5.274
 module load impi/2018.4.274

diff --git a/parm/ccpp_gfdlmp.nml.IN b/parm/ccpp_gfdlmp.nml.IN
@@ -155,7 +155,9 @@
        trans_trac     = .false.
        cnvcld         = .true.
        imfshalcnv     = @[IMFSHALCNV]
+       hwrf_samfshal  = @[HWRF_SAMFSHAL]
        imfdeepcnv     = @[IMFDEEPCNV]
+       hwrf_samfdeep  = @[HWRF_SAMFDEEP]
        cdmbgwd        = 3.5,0.25
        prslrd0        = 0.
        ivegsrc        = 1

diff --git a/parm/ccpp_regional_c768.nml.IN b/parm/ccpp_regional_c768.nml.IN
@@ -36,7 +36,7 @@
 /
 
  &fv_core_nml
-       layout   = 20,24
+       layout   = 24,20
        io_layout = 1,1
        npx      = 1729
        npy      = 1441

diff --git a/parm/ccpp_stretched-nest-input.nml.IN b/parm/ccpp_stretched-nest-input.nml.IN
@@ -8,7 +8,7 @@
 /
 
 &atmos_model_nml
-       blocksize = 32
+       blocksize = 24
        chksum_debug = .false.
        dycore_only = .false.
        fdiag = @[FDIAG]

diff --git a/parm/input_nest02.nml.IN b/parm/input_nest02.nml.IN
@@ -8,7 +8,7 @@
 /
 
 &atmos_model_nml
-       blocksize = 32
+       blocksize = 24
        chksum_debug = .false.
        dycore_only = .false.
        fdiag = @[FDIAG]

diff --git a/parm/model_configure.IN b/parm/model_configure.IN
@@ -18,7 +18,7 @@ memuse_verbose:          .false.
 atmos_nthreads:          @[THRD]
 use_hyper_thread:        .false.
 ncores_per_node:         24
-restart_interval:        0
+restart_interval:        @[RESTART_INTERVAL]
 output_1st_tstep_rst:    .false.
 
 quilting:                @[QUILTING]

diff --git a/parm/regional_c768.nml.IN b/parm/regional_c768.nml.IN
@@ -35,7 +35,7 @@
 /
 
  &fv_core_nml
-       layout   = 20,24
+       layout   = 24,20
        io_layout = 1,1
        npx      = 1729
        npy      = 1441

diff --git a/parm/stretched-nest-input.nml.IN b/parm/stretched-nest-input.nml.IN
@@ -8,7 +8,7 @@
 /
 
 &atmos_model_nml
-       blocksize = 32
+       blocksize = 24
        chksum_debug = .false.
        dycore_only = .false.
        fdiag = @[FDIAG]

diff --git a/tests/Compile_hera.intel.log b/tests/Compile_hera.intel.log
diff --git a/tests/Compile_orion.intel.log b/tests/Compile_orion.intel.log
diff --git a/tests/Compile_ut_hera.intel.log b/tests/Compile_ut_hera.intel.log
diff --git a/tests/Compile_wcoss_cray.log b/tests/Compile_wcoss_cray.log
diff --git a/tests/Compile_wcoss_dell_p3.log b/tests/Compile_wcoss_dell_p3.log
+1 −1		atmos_cubed_sphere
+1 −1		ccpp/physics
+18 −0		gfsphysics/GFS_layer/GFS_typedefs.F90
+12 −0		gfsphysics/GFS_layer/GFS_typedefs.meta
+26 −0		gfsphysics/physics/GFS_debug.F90