Add capability to read soil increments on the cubed-sphere tiles and enhance soil ice adjustment due to soil temperature increments

build_all.sh

@@ -49,7 +49,7 @@ if [[ ! -d "${DIR_ROOT}/ccpp-physics/physics" ]]; then
 fi
 
 # Collect BUILD Options
-CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}"
+CMAKE_FLAGS+=" -DENABLE_DOCS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}"
 
 # Install options; destination for built executables, libraries, CMake Package config
 CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-${DIR_ROOT}} -DCMAKE_INSTALL_BINDIR=${INSTALL_BINDIR:-exec}"
@@ -58,7 +58,7 @@ CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-${DIR_ROOT}} -DCMAKE_INS
 # The unit test data download is part of the build system. Not all machines can
 # access the EMC ftp site, so turn off the build (-DBUILD_TESTING=OFF) of the units tests accordingly.
 # Those with access to the EMC ftp site are: Orion and Hera.
-CMAKE_FLAGS+=" -DBUILD_TESTING=${BUILD_TESTING:-OFF}"
+CMAKE_FLAGS+=" -DBUILD_TESTING=${BUILD_TESTING:-ON}"
 
 # Allow users of this script to provide CMake options e.g. -DGFS=ON|OFF to build GFS specific utilities only
 CMAKE_OPTS=${CMAKE_OPTS:-}

cmake/mpiexec.hera

@@ -6,7 +6,7 @@
 #   $2+ - Executable and its arguments
 #
 
-ACCOUNT=fv3-cpu
+ACCOUNT=da-cpu
 QOS=debug
 
 NP=$1

reg_tests/global_cycle/C192.lndincsoilnoahmp.sh → reg_tests/global_cycle/C192.gsi_lndincsoilnoahmp.sh

@@ -28,7 +28,7 @@ export OCNRES=99999
 
 export COMIN=$HOMEreg/input_data_noahmp
 
-export LND_SOI_FILE=$COMIN/sfcincr_gsi
+export GSI_SOI_FILE=$COMIN/sfcincr_gsi
 
 export JCAP=1534
 export LONB=3072
@@ -51,7 +51,7 @@ $BASE_GSM/ush/global_cycle_driver.sh
 iret=$?
 if [ $iret -ne 0 ]; then
   set +x
-  echo "<<< C192 LANDINC SOIL NOAHMP CYCLE TEST FAILED. >>>"
+  echo "<<< C192 GSI based LANDINC SOIL NOAHMP CYCLE TEST FAILED. >>>"
   exit $iret
 fi
 
@@ -74,15 +74,15 @@ set +x
 if [ $test_failed -ne 0 ]; then
   echo
   echo "**********************************************"
-  echo "<<< C192 LANDINC SOIL-NOAHMP CYCLE TEST FAILED. >>>"
+  echo "<<< C192 GSI based LANDINC SOIL-NOAHMP CYCLE TEST FAILED. >>>"
   echo "**********************************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c192.lndincsoilnoahmp" $commit_num
+    $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c192.gsi_lndincsoilnoahmp" $commit_num
   fi
 else
   echo
   echo "*****************************************"
-  echo "<<< C192 LANDINC SOIL-NOAHMP CYCLE TEST PASSED. >>>"
+  echo "<<< C192 GSI based LANDINC SOIL-NOAHMP CYCLE TEST PASSED. >>>"
   echo "*****************************************"
 fi
 

reg_tests/global_cycle/C192.jedi_lndincsoilnoahmp.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+#------------------------------------------------------------------
+# Run global_cycle for a C192 case to test the ingest and
+# application of soil moisture and temperature increments
+# on the cubed-sphere grid into Noah-MP restarts, which should
+# yield identical results as compared with the GSI case.
+# Compare output to a baseline set of files using the 'nccmp' 
+# utility.
+#------------------------------------------------------------------
+
+set -x
+
+NCCMP=${NCCMP:-$(which nccmp)}
+
+export MAX_TASKS_CY=6
+
+export HOMEgfs=$NWPROD
+export BASE_GSM=$NWPROD
+
+export CYCLEXEC=$BASE_GSM/exec/global_cycle
+
+export CDATE=2019073000
+export FHOUR=00
+export DELTSFC=6
+
+export CASE=C192
+export OCNRES=99999
+
+export COMIN=$HOMEreg/input_data_noahmp
+
+export JCAP=1534
+export LONB=3072
+export LATB=1536
+
+export OROFIX=$HOMEreg/fix/$CASE
+export FIXgsm=$BASE_GSM/fix/am
+
+export DONST="NO"
+export use_ufo=.true.
+
+export DO_SFCCYCLE=".FALSE." 
+export DO_LNDINC=".TRUE." 
+export DO_SOI_INC_JEDI=".true."
+
+export VERBOSE=YES
+export CYCLVARS=FSNOL=-2.,FSNOS=99999.,
+
+$BASE_GSM/ush/global_cycle_driver.sh
+
+iret=$?
+if [ $iret -ne 0 ]; then
+  set +x
+  echo "<<< C192 JEDI based LANDINC SOIL NOAHMP CYCLE TEST FAILED. >>>"
+  exit $iret
+fi
+
+test_failed=0
+
+cd $DATA
+for files in *tile*.nc
+do
+  if [ -f $files ]; then
+    echo CHECK $files
+    $NCCMP -dmfqS $files $HOMEreg/baseline_data/c192.lndincsoilnoahmp/$files
+    iret=$?
+    if [ $iret -ne 0 ]; then
+      test_failed=1
+    fi
+  fi
+done
+
+set +x
+if [ $test_failed -ne 0 ]; then
+  echo
+  echo "**********************************************"
+  echo "<<< C192 JEDI based LANDINC SOIL-NOAHMP CYCLE TEST FAILED. >>>"
+  echo "**********************************************"
+  if [ "$UPDATE_BASELINE" = "TRUE" ]; then
+    $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c192.jedi_lndincsoilnoahmp" $commit_num
+  fi
+else
+  echo
+  echo "*****************************************"
+  echo "<<< C192 JEDI based LANDINC SOIL-NOAHMP CYCLE TEST PASSED. >>>"
+  echo "*****************************************"
+fi
+
+exit

reg_tests/global_cycle/C768.lndincsnow.sh

@@ -30,7 +30,8 @@ export FNSNOA=$COMIN/gdas.t00z.snogrb_t1534.3072.1536
 export FNACNA=$COMIN/gdas.t00z.seaice.5min.blend.grb
 export NST_FILE=$COMIN/gdas.t00z.dtfanl.nc
 
-export DO_SNO_INC=.true. # must be lower-case.
+export DO_SNO_INC_JEDI=.true. # must be lower-case.
+export DO_SOI_INC_JEDI=.false.
 export JCAP=1534
 export LONB=3072
 export LATB=1536

reg_tests/global_cycle/driver.hera.sh

@@ -29,7 +29,7 @@ module list
 
 WORK_DIR="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}"
 
-PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}"
+PROJECT_CODE="${PROJECT_CODE:-da-cpu}"
 QUEUE="${QUEUE:-batch}"
 
 #-----------------------------------------------------------------------------
@@ -64,8 +64,8 @@ TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.lndincsoilnoahmp \
-     -o $LOG_FILE -e $LOG_FILE ./C192.lndincsoilnoahmp.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gsi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.gsi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log03
 export DATA="${DATA_DIR}/test3"
@@ -79,6 +79,12 @@ export COMOUT=$DATA
 TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.frac \
       -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.fracgrid.sh)
 
+LOG_FILE=consistency.log05
+export DATA="${DATA_DIR}/test5"
+export COMOUT=$DATA
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
+
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\

reg_tests/global_cycle/driver.hercules.sh

@@ -64,8 +64,8 @@ TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.lndincsoilnoahmp \
-      -o $LOG_FILE -e $LOG_FILE ./C192.lndincsoilnoahmp.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gsi_lndincsoilnoahmp \
+      -o $LOG_FILE -e $LOG_FILE ./C192.gsi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log03
 export DATA="${DATA_DIR}/test3"
@@ -79,6 +79,12 @@ export COMOUT=$DATA
 TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.frac \
       -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.fracgrid.sh)
 
+LOG_FILE=consistency.log05
+export DATA="${DATA_DIR}/test5"
+export COMOUT=$DATA
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
+
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\

reg_tests/global_cycle/driver.jet.sh

@@ -62,8 +62,8 @@ TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.lndincsoilnoahmp \
-      --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C192.lndincsoilnoahmp.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gsi_lndincsoilnoahmp \
+      --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C192.gsi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log03
 export DATA="${DATA_DIR}/test3"
@@ -77,6 +77,12 @@ export COMOUT=$DATA
 TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.frac \
       --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.fracgrid.sh)
 
+LOG_FILE=consistency.log05
+export DATA="${DATA_DIR}/test5"
+export COMOUT=$DATA
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
+
 LOG_FILE=consistency.log
 sbatch --partition=xjet --nodes=1  -t 0:01:00 -A $PROJECT_CODE -J summary -o $LOG_FILE -e $LOG_FILE \
        --open-mode=append -q $QUEUE -d\

reg_tests/global_cycle/driver.orion.sh

@@ -62,8 +62,8 @@ TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.lndincsoilnoahmp \
-      -o $LOG_FILE -e $LOG_FILE ./C192.lndincsoilnoahmp.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gsi_lndincsoilnoahmp \
+      -o $LOG_FILE -e $LOG_FILE ./C192.gsi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log03
 export DATA="${DATA_DIR}/test3"
@@ -77,6 +77,12 @@ export COMOUT=$DATA
 TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.frac \
       -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.fracgrid.sh)
 
+LOG_FILE=consistency.log05
+export DATA="${DATA_DIR}/test5"
+export COMOUT=$DATA
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
+
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\

reg_tests/global_cycle/driver.wcoss2.sh

@@ -69,7 +69,7 @@ TEST1=$(qsub -V -o ${LOG_FILE}01 -e ${LOG_FILE}01 -q $QUEUE -A $PROJECT_CODE -l
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
 TEST2=$(qsub -V -o ${LOG_FILE}02 -e ${LOG_FILE}02 -q $QUEUE -A $PROJECT_CODE -l walltime=00:05:00 \
-        -N c192.lndincsoilnoahmp -l select=1:ncpus=12:mem=8GB $PWD/C192.lndincsoilnoahmp.sh)
+        -N c192.gsi_lndincsoilnoahmp -l select=1:ncpus=12:mem=8GB $PWD/C192.gsi_lndincsoilnoahmp.sh)
 
 export DATA="${DATA_DIR}/test3"
 export COMOUT=$DATA