Merge remote-tracking branch 'origin/develop' into ss_160

DavidHuber-NOAA · Jan 24, 2024 · 4e6757a · 4e6757a
2 parents a92833a + bef91f0
commit 4e6757a
Show file tree

Hide file tree

Showing 13 changed files with 342 additions and 109 deletions.
diff --git a/reg_tests/global_cycle/C192.lndincsoilnoahmp.sh b/reg_tests/global_cycle/C192.lndincsoilnoahmp.sh
@@ -24,6 +24,7 @@ export FHOUR=00
 export DELTSFC=6
 
 export CASE=C192
+export OCNRES=99999
 
 export COMIN=$HOMEreg/input_data_noahmp
 
@@ -33,10 +34,9 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
+export OROFIX=$HOMEreg/fix/$CASE
 export FIXgsm=$BASE_GSM/fix/am
 
-export FIXfv3=$HOMEreg/fix
-
 export DONST="NO"
 export use_ufo=.true.
 
@@ -73,9 +73,9 @@ done
 set +x
 if [ $test_failed -ne 0 ]; then
   echo
-  echo "*****************************************"
-  echo "<<< C192 LANDINC SOIL-NOAHP CYCLE TEST FAILED. >>>"
-  echo "*****************************************"
+  echo "**********************************************"
+  echo "<<< C192 LANDINC SOIL-NOAHMP CYCLE TEST FAILED. >>>"
+  echo "**********************************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
     $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c192.lndincsoilnoahmp" $commit_num
   fi

diff --git a/reg_tests/global_cycle/C48.noahmp.fracgrid.sh b/reg_tests/global_cycle/C48.noahmp.fracgrid.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+#------------------------------------------------------------------
+# Run global_cycle for a C48 case that tests the NOAHMP and
+# fractional grid options.  
+#
+# 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=2021032406
+export FHOUR=00
+export DELTSFC=6
+
+export CASE=C48
+export OCNRES=500
+
+export COMIN=$HOMEreg/input_data_c48.noahmp.frac.grid
+export FNACNA=$COMIN/gdas.t06z.seaice.5min.blend.grb
+export FNTSFA=" "
+export FNSNOA=" "
+export NST_FILE=$COMIN/gdas.t06z.dtfanl.nc
+
+export JCAP=1534
+export LONB=3072
+export LATB=1536
+
+export OROFIX=$HOMEreg/fix/$CASE
+
+export FIXgsm=$BASE_GSM/fix/am
+
+export FNAISC=$FIXgsm/IMS-NIC.blended.ice.monthly.clim.grb
+
+export DONST="YES"
+export use_ufo=.true.
+export FRAC_GRID=.true.
+
+export VERBOSE=YES
+export CYCLVARS=FSNOL=99999.,FSNOS=99999.,
+
+$BASE_GSM/ush/global_cycle_driver.sh
+
+iret=$?
+if [ $iret -ne 0 ]; then
+  set +x
+  echo "<<< C48 NOAHMP FRAC GRID 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/c48.noahmp.fracgrid/$files
+    iret=$?
+    if [ $iret -ne 0 ]; then
+      test_failed=1
+    fi
+  fi
+done
+
+set +x
+if [ $test_failed -ne 0 ]; then
+  echo
+  echo "******************************************"
+  echo "<<< C48 NOAHMP FRAC GRID TEST FAILED. >>>"
+  echo "******************************************"
+  if [ "$UPDATE_BASELINE" = "TRUE" ]; then
+    $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c48.noahmp.fracgrid" $commit_num
+  fi
+else
+  echo
+  echo "*****************************************"
+  echo "<<< C48 NOAHMP FRAC GRID TEST PASSED. >>>"
+  echo "*****************************************"
+fi
+
+exit
diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh
@@ -21,6 +21,7 @@ export FHOUR=00
 export DELTSFC=6
 
 export CASE=C768
+export OCNRES=99999
 
 export COMIN=$HOMEreg/input_data
 export FNTSFA=$COMIN/gdas.t00z.rtgssthr.grb
@@ -32,10 +33,22 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
+export OROFIX=$HOMEreg/fix/$CASE
+
 export FIXgsm=$BASE_GSM/fix/am
-export FNAISC=$FIXgsm/CFSR.SEAICE.1982.2012.monthly.clim.grb
 
-export FIXfv3=$HOMEreg/fix
+export FNALBC2=$FIXgsm/global_albedo4.1x1.grb
+export FNALBC=$FIXgsm/global_snowfree_albedo.bosu.t1534.3072.1536.rg.grb
+export FNALBC=$FIXgsm/global_snowfree_albedo.bosu.t1534.3072.1536.rg.grb
+export FNTG3C=$FIXgsm/global_tg3clim.2.6x1.5.grb
+export FNVETC=$FIXgsm/global_vegtype.igbp.t1534.3072.1536.rg.grb
+export FNSOTC=$FIXgsm/global_soiltype.statsgo.t1534.3072.1536.rg.grb
+export FNVEGC=$FIXgsm/global_vegfrac.0.144.decpercent.grb
+export FNVMNC=$FIXgsm/global_shdmin.0.144x0.144.grb
+export FNVMXC=$FIXgsm/global_shdmax.0.144x0.144.grb
+export FNSLPC=$FIXgsm/global_slope.1x1.grb
+export FNABSC=$FIXgsm/global_mxsnoalb.uariz.t1534.3072.1536.rg.grb
+export FNAISC=$FIXgsm/CFSR.SEAICE.1982.2012.monthly.clim.grb
 
 export DONST="YES"
 export use_ufo=.true.

diff --git a/reg_tests/global_cycle/C768.lndincsnow.sh b/reg_tests/global_cycle/C768.lndincsnow.sh
@@ -22,6 +22,7 @@ export FHOUR=00
 export DELTSFC=6
 
 export CASE=C768
+export OCNRES=99999
 
 export COMIN=$HOMEreg/input_data
 export FNTSFA=$COMIN/gdas.t00z.rtgssthr.grb
@@ -34,10 +35,9 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
+export OROFIX=$HOMEreg/fix/$CASE
 export FIXgsm=$BASE_GSM/fix/am
 
-export FIXfv3=$HOMEreg/fix
-
 export DONST="NO"
 export use_ufo=.true.
 

diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh
@@ -73,10 +73,16 @@ export COMOUT=$DATA
 TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
      -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
 
+LOG_FILE=consistency.log04
+export DATA="${DATA_DIR}/test4"
+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.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\
-      afterok:$TEST1:$TEST2:$TEST3 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF

diff --git a/reg_tests/global_cycle/driver.hercules.sh b/reg_tests/global_cycle/driver.hercules.sh
@@ -27,7 +27,7 @@ module list
 
 ulimit -s unlimited
 
-export WORK_DIR="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}"
+export WORK_DIR="${WORK_DIR:-/work2/noaa/stmp/$LOGNAME}"
 
 PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}"
 QUEUE="${QUEUE:-batch}"
@@ -73,10 +73,16 @@ export COMOUT=$DATA
 TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
       -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
 
+LOG_FILE=consistency.log04
+export DATA="${DATA_DIR}/test4"
+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.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\
-      afterok:$TEST1:$TEST2:$TEST3 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF

diff --git a/reg_tests/global_cycle/driver.jet.sh b/reg_tests/global_cycle/driver.jet.sh
@@ -71,10 +71,16 @@ export COMOUT=$DATA
 TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
       --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
 
+LOG_FILE=consistency.log04
+export DATA="${DATA_DIR}/test4"
+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.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\
-       afterok:$TEST1:$TEST2:$TEST3 << EOF
+       afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}* > ./summary.log
 EOF

diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh
@@ -71,10 +71,16 @@ export COMOUT=$DATA
 TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
       -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
 
+LOG_FILE=consistency.log04
+export DATA="${DATA_DIR}/test4"
+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.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\
-      afterok:$TEST1:$TEST2:$TEST3 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF

diff --git a/reg_tests/global_cycle/driver.wcoss2.sh b/reg_tests/global_cycle/driver.wcoss2.sh
@@ -76,8 +76,13 @@ export COMOUT=$DATA
 TEST3=$(qsub -V -o ${LOG_FILE}03 -e ${LOG_FILE}03 -q $QUEUE -A $PROJECT_CODE -l walltime=00:05:00 \
         -N c768.lndincsnow -l select=1:ncpus=12:mem=8GB $PWD/C768.lndincsnow.sh)
 
+export DATA="${DATA_DIR}/test4"
+export COMOUT=$DATA
+TEST4=$(qsub -V -o ${LOG_FILE}04 -e ${LOG_FILE}04 -q $QUEUE -A $PROJECT_CODE -l walltime=00:05:00 \
+        -N c48.noahmp.frac -l select=1:ncpus=12:mem=8GB $PWD/C48.noahmp.fracgrid.sh)
+
 qsub -V -o ${LOG_FILE} -e ${LOG_FILE} -q $QUEUE -A $PROJECT_CODE -l walltime=00:01:00 \
-        -N cycle_summary -l select=1:ncpus=1:mem=100MB -W depend=afterok:$TEST1:$TEST2:$TEST3 << EOF
+        -N cycle_summary -l select=1:ncpus=1:mem=100MB -W depend=afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
 #!/bin/bash
 cd $reg_dir
 grep -a '<<<' ${LOG_FILE}?? | grep -v echo > summary.log