Use hpc-stack on Orion, Jet and WCOSS-Dell

Update build to use the hpc-stack on Orion, Jet and WCOSS-Dell. Issue #152.
ufs-community · Nov 23, 2020 · 74daf3f · 74daf3f
1 parent 91159ad
commit 74daf3f
Show file tree

Hide file tree

Showing 28 changed files with 48 additions and 156 deletions.
diff --git a/build_all.sh b/build_all.sh
@@ -22,14 +22,6 @@ fi
 
 CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON"
 
-if [[ "$compiler" == "intel" ]]; then
-  if [[ "$target" != "wcoss_cray" && \
-        "$target" != "gaea" && \
-        "$target" != "odin" ]]; then
-    CMAKE_FLAGS+=" -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_C_COMPILER=icc"
-  fi
-fi
-
 rm -fr ./build
 mkdir ./build && cd ./build
 

diff --git a/modulefiles/build.cheyenne.intel b/modulefiles/build.cheyenne.intel
@@ -28,3 +28,6 @@ module load wgrib2/2.0.8
 module load netcdf/4.7.4
 
 setenv ESMFMKFILE /glade/p/ral/jntp/GMTB/tools/NCEPLIBS-ufs-v2.0.0/intel-19.1.1/mpt-2.19/lib64/esmf.mk
+
+setenv CMAKE_C_COMPILER icc
+setenv CMAKE_Fortran_COMPILER ifort
diff --git a/modulefiles/build.gaea.intel b/modulefiles/build.gaea.intel
@@ -17,6 +17,6 @@ prepend-path CMAKE_PREFIX_PATH /ncrc/home2/Rahul.Mahajan/dev/opt
 prepend-path LD_LIBRARY_PATH /ncrc/home2/Rahul.Mahajan/dev/opt/lib
 prepend-path LD_LIBRARY_PATH /ncrc/home2/Rahul.Mahajan/dev/opt/lib64
 
-setenv CMAKE_C_COMPIELR cc
-setenv CMAKE_CXX_COMPIELR CC
-setenv CMAKE_Fortran_COMPIELR ftn
+setenv CMAKE_C_COMPILER cc
+setenv CMAKE_CXX_COMPILER CC
+setenv CMAKE_Fortran_COMPILER ftn
diff --git a/modulefiles/build.jet.intel b/modulefiles/build.jet.intel
@@ -2,20 +2,18 @@
 ## Build and run module for Jet
 #############################################################
 module load cmake/3.16.1
-module load intel/18.0.5.274
-module load impi/2018.4.274
-module load szip/2.1
-module load hdf5/1.10.5
-module load netcdf/4.7.0
 
-setenv CC icc
-setenv FC ifort
-setenv CXX icpc
+module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/v1.0.0-beta1/modulefiles/stack
+module load hpc/1.0.0-beta1
+module load hpc-intel/18.0.5.274
+module load hpc-impi/2018.4.274
 
-setenv ESMFMKFILE /lfs4/HFIP/hfv3gfs/software/NCEPLIBS-ufs-v2.0.0/intel-18.0.5.274/impi-2018.4.274/lib64/esmf.mk
-setenv Jasper_ROOT /lfs4/HFIP/hfv3gfs/software/NCEPLIBS-ufs-v2.0.0/intel-18.0.5.274/impi-2018.4.274
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load nccmp/1.8.7.0
+module load esmf/8_1_0_beta_snapshot_21
+module load jasper/2.0.15
 
-module use /lfs4/HFIP/hfv3gfs/software/NCEPLIBS-ufs-v2.0.0/intel-18.0.5.274/impi-2018.4.274/modules
 module load w3nco/2.4.1
 module load w3emc/2.7.3
 module load sp/2.3.3

diff --git a/modulefiles/build.orion.intel b/modulefiles/build.orion.intel
@@ -2,11 +2,14 @@
 ## Build module for Orion
 #############################################################
 
-module load cmake/3.15.4
-module load intel/2020
-module load impi/2020
+module load cmake/3.17.3
+
+module use /apps/contrib/NCEP/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+
+module load hpc/1.0.0-beta1
+module load hpc-intel/2018.4
+module load hpc-impi/2018.4
 
-module use /apps/contrib/NCEPLIBS/orion/cmake/install/NCEPLIBS-v1.2.0/modules
 module load bacio/2.4.1
 module load g2/3.4.1
 module load ip/3.3.3
@@ -21,9 +24,11 @@ module load nemsiogfs/2.5.3
 module load landsfcutil/2.4.1
 module load wgrib2/2.0.8
 
-setenv Jasper_ROOT /apps/jasper-1.900.1
-
-module use -a /apps/contrib/NCEPLIBS/lib/modulefiles
-module load netcdfp/4.7.4.release
-module load esmflocal/8_0_0.release
+module load jasper/2.0.15
+module load zlib/1.2.11
+module load png/1.6.35
 
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load nccmp/1.8.7.0
+module load esmf/8_1_0_beta_snapshot_27
diff --git a/modulefiles/build.stampede.intel b/modulefiles/build.stampede.intel
@@ -39,3 +39,6 @@ module load g2
 module load wgrib2
 
 #setenv ESMFMKFILE /work/00315/tg455890/stampede2/regional_fv3/NCEPLIBS_SRWv2.0/lib64/esmf.mk
+
+setenv CMAKE_Fortran_COMPILER ifort
+setenv CMAKE_C_COMPILER icc
diff --git a/modulefiles/build.wcoss_dell_p3.intel b/modulefiles/build.wcoss_dell_p3.intel
@@ -5,22 +5,22 @@
 module load lsf/10.1
 module load HPSS/5.0.2.5
 module load cmake/3.16.2
-module load ips/18.0.1.163
-module load impi/18.0.1
 
-module load jasper/1.900.29
-setenv Jasper_ROOT /usrx/local/prod/packages/gnu/4.8.5/jasper/1.900.29
+module use /usrx/local/nceplibs/dev/hpc-stack/test/hpc-stack/modulefiles/stack
 
-module use /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
-module load netcdf_parallel/4.7.4
+module load hpc/1.0.0-beta1
+module load hpc-ips/18.0.1.163
+module load hpc-impi/18.0.1
 
-module use /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/soft/modulefiles
-module load esmf/8.0.0_ParallelNetCDF
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
 
-module use /usrx/local/dev/modulefiles
-module load prod_util/1.1.3
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load nccmp/1.8.7.0
+module load esmf/8_1_0_beta_snapshot_27
 
-module use /usrx/local/nceplibs/dev/NCEPLIBS/cmake/install/NCEPLIBS-v1.2.0/modules
 module load bacio/2.4.1
 module load g2/3.4.1
 module load ip/3.3.3
@@ -34,3 +34,6 @@ module load sigio/2.3.2
 module load nemsiogfs/2.5.3
 module load landsfcutil/2.4.1
 module load wgrib2/2.0.8
+
+module use /usrx/local/dev/modulefiles
+module load prod_util/1.1.3
diff --git a/reg_tests/chgres_cube/README b/reg_tests/chgres_cube/README
@@ -6,13 +6,14 @@ be resolved or explained before merging.
 To run the regression tests:
 
 1) Build chgres_cube program.  Go to ./sorc and
-   invoke 'build_chgres_cube.sh' with no arguments.
+   invoke 'build_all.sh' with no arguments.
 2) Invoke driver script for your machine.  See script
    prolog for details.  Supported machines are:
    - Hera (driver.hera.sh)
    - WCOSS-Cray (driver.cray.sh)
    - WCOSS-Dell (driver.dell.sh)
    - Jet (driver.jet.sh)
+   - Orion (driver.orion.sh)
 
 A series of daisy-chained tests will run.  A test fails 
 if the output files differ from the baseline set of files

diff --git a/reg_tests/chgres_cube/c192.fv3.history.sh b/reg_tests/chgres_cube/c192.fv3.history.sh
@@ -52,17 +52,8 @@ 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
@@ -47,17 +47,8 @@ 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
@@ -43,17 +43,8 @@ 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
@@ -44,17 +44,8 @@ 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
@@ -53,17 +53,8 @@ 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
@@ -47,17 +47,8 @@ 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
@@ -49,16 +49,8 @@ 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
@@ -49,17 +49,8 @@ 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
 
 mv out.sfc.tile7.nc out.sfc.tile1.nc

diff --git a/reg_tests/chgres_cube/driver.dell.sh b/reg_tests/chgres_cube/driver.dell.sh
@@ -47,8 +47,6 @@ SUM_FILE=summary.log
 
 rm -f $LOG_FILE $SUM_FILE
 
-export NCCMP=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/util/nccmp/nccmp-nc4.7.4/src/nccmp
-
 export OMP_STACKSIZE=1024M
 
 export APRUN=mpirun

diff --git a/reg_tests/chgres_cube/driver.jet.sh b/reg_tests/chgres_cube/driver.jet.sh
@@ -43,8 +43,6 @@ export HOMEufs=$PWD/../..
 
 export HOMEreg=/lfs4/HFIP/emcda/George.Gayno/reg_tests/chgres_cube
 
-export NCCMP=/apps/nccmp/1.8.5/intel/18.0.5.274/bin/nccmp
-
 LOG_FILE=regression.log
 SUM_FILE=summary.log
 rm -f $LOG_FILE $SUM_FILE

diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh
@@ -43,8 +43,6 @@ export HOMEufs=$PWD/../..
 
 export HOMEreg=/work/noaa/da/ggayno/save/ufs_utils.git/reg_tests/chgres_cube
 
-export NCCMP=/apps/nccmp-1.8.5/bin/nccmp
-
 LOG_FILE=regression.log
 SUM_FILE=summary.log
 rm -f $LOG_FILE $SUM_FILE

diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh
@@ -51,15 +51,6 @@ 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.dell.sh b/reg_tests/global_cycle/driver.dell.sh
@@ -53,8 +53,6 @@ export NWPROD=$PWD/../..
 
 export COMOUT=$DATA
 
-export NCCMP=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/util/nccmp/nccmp-nc4.7.4/src/nccmp
-
 reg_dir=$PWD
 
 ./C768.fv3gfs.sh

diff --git a/reg_tests/global_cycle/driver.jet.sh b/reg_tests/global_cycle/driver.jet.sh
@@ -51,8 +51,6 @@ export NWPROD=$PWD/../..
 
 export COMOUT=$DATA
 
-export NCCMP=/apps/nccmp/1.8.5/intel/18.0.5.274/bin/nccmp
-
 reg_dir=$PWD
 
 ./C768.fv3gfs.sh

diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh
@@ -50,10 +50,6 @@ export NWPROD=$PWD/../..
 
 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.uniform.sh b/reg_tests/grid_gen/c96.uniform.sh
@@ -35,16 +35,8 @@ 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/C96
 
 test_failed=0