adding semi-lagrangian sedimentation of rain in Thompson MP as an opt…

…ion (#863) * add semi-lagrangian control namelist variables to configuration, set default values for semi-Lagrangian sedimentation of rain in Thompson MP * add nw2_tracers.F90 in MOM6 cmake file * change to FHMAX=12 in fv3_gsd for identical results in the RT test, change fv3_gsd to compare 12hour outputs Co-authored-by: jiandewang <[email protected]>
ufs-community · Oct 28, 2021 · 12cda3f · 12cda3f
1 parent 1c5d16f
commit 12cda3f
Show file tree

Hide file tree

Showing 17 changed files with 2,461 additions and 2,660 deletions.
diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
@@ -189,6 +189,7 @@ list(APPEND mom6_src_files
   MOM6/src/tracer/MOM_generic_tracer.F90
   MOM6/src/tracer/MOM_lateral_boundary_diffusion.F90
   MOM6/src/tracer/MOM_neutral_diffusion.F90
+  MOM6/src/tracer/nw2_tracers.F90
   MOM6/src/tracer/MOM_offline_aux.F90
   MOM6/src/tracer/MOM_offline_main.F90
   MOM6/src/tracer/MOM_tracer_Z_init.F90

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/default_vars.sh b/tests/default_vars.sh
@@ -507,6 +507,9 @@ export EFFR_IN=.false.
 export LRADAR=.true.
 export LTAEROSOL=.true.
 export EXT_DIAG_THOMPSON=.false.
+export sedi_semi=.false.
+export sedi_semi_update=.false.
+export sedi_semi_decfl=.false.
 
 # GWD
 export LDIAG_UGWP=.false.

diff --git a/tests/parm/control_thompson.nml.IN b/tests/parm/control_thompson.nml.IN
@@ -116,6 +116,9 @@ deflate_level=1
   ltaerosol    = @[LTAEROSOL]
   lradar       = @[LRADAR]
   ttendlim     = 0.004
+  sedi_semi    = @[sedi_semi]
+  sedi_semi_update  = @[sedi_semi_update]
+  sedi_semi_decfl = @[sedi_semi_decfl]
   ext_diag_thompson = @[EXT_DIAG_THOMPSON]
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -460,7 +460,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20211025
+BL_DATE=20211027
 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/tests/control_thompson b/tests/tests/control_thompson
@@ -45,7 +45,6 @@ export ICLIQ_SW=2
 export IOVR=3
 export LHEATSTRG=.true.
 export DO_TOFD=.true.
-
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16_thompson
 export INPUT_NML=control_thompson.nml.IN
diff --git a/tests/tests/fv3_gsd b/tests/tests/fv3_gsd
@@ -20,48 +20,24 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
                    sfcf000.tile4.nc \
                    sfcf000.tile5.nc \
                    sfcf000.tile6.nc \
-                   sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   sfcf027.tile1.nc \
-                   sfcf027.tile2.nc \
-                   sfcf027.tile3.nc \
-                   sfcf027.tile4.nc \
-                   sfcf027.tile5.nc \
-                   sfcf027.tile6.nc \
-                   sfcf048.tile1.nc \
-                   sfcf048.tile2.nc \
-                   sfcf048.tile3.nc \
-                   sfcf048.tile4.nc \
-                   sfcf048.tile5.nc \
-                   sfcf048.tile6.nc \
+                   sfcf012.tile1.nc \
+                   sfcf012.tile2.nc \
+                   sfcf012.tile3.nc \
+                   sfcf012.tile4.nc \
+                   sfcf012.tile5.nc \
+                   sfcf012.tile6.nc \
                    atmf000.tile1.nc \
                    atmf000.tile2.nc \
                    atmf000.tile3.nc \
                    atmf000.tile4.nc \
                    atmf000.tile5.nc \
                    atmf000.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   atmf027.tile1.nc \
-                   atmf027.tile2.nc \
-                   atmf027.tile3.nc \
-                   atmf027.tile4.nc \
-                   atmf027.tile5.nc \
-                   atmf027.tile6.nc \
-                   atmf048.tile1.nc \
-                   atmf048.tile2.nc \
-                   atmf048.tile3.nc \
-                   atmf048.tile4.nc \
-                   atmf048.tile5.nc \
-                   atmf048.tile6.nc \
+                   atmf012.tile1.nc \
+                   atmf012.tile2.nc \
+                   atmf012.tile3.nc \
+                   atmf012.tile4.nc \
+                   atmf012.tile5.nc \
+                   atmf012.tile6.nc \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -97,8 +73,8 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export FHMAX=48
-export OUTPUT_FH="0 24 27 48"
+export FHMAX=12
+export OUTPUT_FH="0 12"
 
 export DT_ATMOS="450"
 export IMP_PHYSICS=8
+16 −0		ccpp/data/GFS_typedefs.F90
+24 −0		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/physics