feature/orion This commit references ufs-community#96.

Per Kate's request, build with netcdfp/4.7.4 and esmflocal/8_0_0.release. Using netcdfp/4.7.4 causes the nccmp step in the regression tests to fail. Add a module swap so nccmp works. Add the c96 fv3 netcdf chgres_cube regression test to the orion driver.
GeorgeGayno-NOAA · Jul 15, 2020 · 587442c · 587442c
1 parent 1497024
commit 587442c
Show file tree

Hide file tree

Showing 14 changed files with 113 additions and 4 deletions.
diff --git a/modulefiles/build.orion b/modulefiles/build.orion
@@ -13,13 +13,16 @@ module load bacio/2.2.0
 module load sfcio/1.2.0
 module load sigio/2.2.0
 module load gfsio/1.2.0
-module load w3emc/2.5.0
+module load w3emc/2.4.0
 module load ip/3.1.0
 module load nemsiogfs/2.3.0
 module load landsfcutil/2.2.0
 module load g2/3.1.1
 module load sp/2.0.3
 export Jasper_ROOT="/apps/jasper-1.900.1"
-module load netcdf/4.7.2-parallel
-module load esmf/8.0.0_ParallelNetCDF
+
+module use -a /apps/contrib/NCEPLIBS/lib/modulefiles
+module load netcdfp/4.7.4.release
+module load esmflocal/8_0_0.release
+
 export WGRIB2_ROOT="/work/noaa/da/ggayno/save/wgrib2"
diff --git a/reg_tests/chgres_cube/c192.fv3.history.sh b/reg_tests/chgres_cube/c192.fv3.history.sh
@@ -50,8 +50,17 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output from chgres to baseline set of data.
+#
+# orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+machine=${machine:-NULL}
+if [ $machine == 'orion' ]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $DATA
 
 test_failed=0

diff --git a/reg_tests/chgres_cube/c192.gfs.grib2.sh b/reg_tests/chgres_cube/c192.gfs.grib2.sh
@@ -45,8 +45,17 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output from chgres to baseline set of data.
+#
+# orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+machine=${machine:-NULL}
+if [ $machine == 'orion' ]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $DATA
 
 test_failed=0

diff --git a/reg_tests/chgres_cube/c96.fv3.nemsio.sh b/reg_tests/chgres_cube/c96.fv3.nemsio.sh
@@ -41,8 +41,17 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output from chgres to baseline set of data.
+#
+# orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+machine=${machine:-NULL}
+if [ $machine == 'orion' ]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $DATA
 
 test_failed=0

diff --git a/reg_tests/chgres_cube/c96.fv3.netcdf.sh b/reg_tests/chgres_cube/c96.fv3.netcdf.sh
@@ -42,8 +42,17 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output from chgres to baseline set of data.
+#
+# orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+machine=${machine:-NULL}
+if [ $machine == 'orion' ]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $DATA
 
 test_failed=0

diff --git a/reg_tests/chgres_cube/c96.fv3.restart.sh b/reg_tests/chgres_cube/c96.fv3.restart.sh
@@ -51,8 +51,17 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output from chgres to baseline set of data.
+#
+# orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+machine=${machine:-NULL}
+if [ $machine == 'orion' ]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $DATA
 
 test_failed=0

diff --git a/reg_tests/chgres_cube/c96.gfs.nemsio.sh b/reg_tests/chgres_cube/c96.gfs.nemsio.sh
@@ -45,8 +45,17 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output from chgres to baseline set of data.
+#
+# orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+machine=${machine:-NULL}
+if [ $machine == 'orion' ]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $DATA
 
 test_failed=0

diff --git a/reg_tests/chgres_cube/c96.gfs.sigio.sh b/reg_tests/chgres_cube/c96.gfs.sigio.sh
@@ -47,8 +47,16 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output from chgres to baseline set of data.
+#
+# orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+if [ $machine == 'orion' ]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $DATA
 
 test_failed=0

diff --git a/reg_tests/chgres_cube/c96.regional.sh b/reg_tests/chgres_cube/c96.regional.sh
@@ -47,8 +47,17 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output from chgres to baseline set of data.
+#
+# orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+machine=${machine:-NULL}
+if [ $machine == 'orion' ]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $DATA
 
 test_failed=0

diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh
@@ -112,12 +112,20 @@ export OMP_NUM_THREADS=1  # needs to match cpus-per-task
 TEST7=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gfs.grib2 \
       --open-mode=append -o $LOG_FILE -e $LOG_FILE -d afterok:$TEST6 ./c192.gfs.grib2.sh)
 
+#-----------------------------------------------------------------------------
+# Initialize global C96 using FV3 gaussian netcdf files.
+#-----------------------------------------------------------------------------
+
+export OMP_NUM_THREADS=1  # needs to match cpus-per-task
+TEST8=$(sbatch --parsable --ntasks-per-node=6 --nodes=2 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c96.fv3.netcdf \
+      --open-mode=append -o $LOG_FILE -e $LOG_FILE -d afterok:$TEST7 ./c96.fv3.netcdf.sh)
+
 #-----------------------------------------------------------------------------
 # Create summary 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:$TEST7 << EOF
+       --open-mode=append -q $QUEUE -d afterok:$TEST8 << EOF
 #!/bin/sh
 grep -a '<<<' $LOG_FILE  > $SUM_FILE
 EOF

diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh
@@ -49,6 +49,15 @@ if [ $iret -ne 0 ]; then
   exit $iret
 fi
 
+# orion's nccmp utility does not work with the netcdf
+# required to run global_cycle.  So swap it.
+
+machine=${machine:-NULL}
+if [[ "$machine" = 'orion' ]]; then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 test_failed=0
 
 cd $DATA

diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh
@@ -50,6 +50,8 @@ export COMOUT=$DATA
 
 export NCCMP=/apps/nccmp-1.8.5/bin/nccmp
 
+export machine='orion'
+
 reg_dir=$PWD
 
 ./C768.fv3gfs.sh

diff --git a/reg_tests/grid_gen/c96.regional.sh b/reg_tests/grid_gen/c96.regional.sh
@@ -42,8 +42,16 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output to baseline set of data.
+#
+# Note: orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+if [[ "$machine" = "ORION" ]] ;then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $out_dir
 
 test_failed=0

diff --git a/reg_tests/grid_gen/c96.uniform.sh b/reg_tests/grid_gen/c96.uniform.sh
@@ -33,8 +33,16 @@ echo "Ending at: " `date`
 
 #-----------------------------------------------------------------------------
 # Compare output to baseline set of data.
+#
+# Note: orion's nccmp utility does not work with the netcdf
+# required to run ufs_utils.  So swap it.
 #-----------------------------------------------------------------------------
 
+if [[ "$machine" = "ORION" ]] ;then
+  module unload netcdfp/4.7.4.release
+  module load netcdf/4.7.2
+fi
+
 cd $out_dir
 
 test_failed=0