feature/coldstart

Merge branch 'develop' into feature/coldstart See #9
GeorgeGayno-NOAA · Oct 22, 2020 · 7836381 · 7836381
2 parents 26ec5c9 + 21543e0
commit 7836381
Show file tree

Hide file tree

Showing 46 changed files with 125 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,39 @@
+
+# UFS_UTILS
+
+Utilities for the NCEP models. This is part of the
+[NCEPLIBS](https://github.com/NOAA-EMC/NCEPLIBS) project.
+
+## Authors
+
+NCEP/EMC developers.
+
+Code manager: George Gayno
+
+## Installing
+
+```
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=/path/to/install ..
+make -j2
+make install
+```
+
+## Disclaimer
+
+The United States Department of Commerce (DOC) GitHub project code is
+provided on an "as is" basis and the user assumes responsibility for
+its use. DOC has relinquished control of the information and no longer
+has responsibility to protect the integrity, confidentiality, or
+availability of the information. Any claims against the Department of
+Commerce stemming from the use of its GitHub project will be governed
+by all applicable Federal law. Any reference to specific commercial
+products, processes, or services by service mark, trademark,
+manufacturer, or otherwise, does not constitute or imply their
+endorsement, recommendation or favoring by the Department of
+Commerce. The Department of Commerce seal and logo, or the seal and
+logo of a DOC bureau, shall not be used in any manner to imply
+endorsement of any commercial product or activity by DOC or the United
+States Government.
+
diff --git a/build_all.sh b/build_all.sh
@@ -2,6 +2,7 @@
 set -eux
 
 target=${target:-"NULL"}
+compiler=${compiler:-"intel"}
 
 export MOD_PATH
 
@@ -14,7 +15,7 @@ else
  set +x
  source ./sorc/machine-setup.sh
  module use ./modulefiles
- module load build.$target > /dev/null 2>&1
+ module load build.$target.$compiler > /dev/null 2>&1
  module list
  set -x
 fi
@@ -28,8 +29,10 @@ cd ./build
 
 CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON"
 
-if [[ "$target" != "wcoss_cray" && "$target" != "odin" ]]; then
-  CMAKE_FLAGS+=" -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_C_COMPILER=icc"
+if [[ "$compiler" == "intel" ]]; then
+  if [[ "$target" != "wcoss_cray" && "$target" != "odin" ]]; then
+    CMAKE_FLAGS+=" -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_C_COMPILER=icc"
+  fi
 fi
 
 cmake .. ${CMAKE_FLAGS}

diff --git a/driver_scripts/driver_grid.cray.sh b/driver_scripts/driver_grid.cray.sh
@@ -58,7 +58,7 @@
 
 source ../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 #-----------------------------------------------------------------------

diff --git a/driver_scripts/driver_grid.dell.sh b/driver_scripts/driver_grid.dell.sh
@@ -60,7 +60,7 @@
 
 source ../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 #-----------------------------------------------------------------------

diff --git a/driver_scripts/driver_grid.hera.sh b/driver_scripts/driver_grid.hera.sh
@@ -58,9 +58,10 @@
 
 set -x
 
+compiler=${compiler:-"intel"}
 source ../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../modulefiles
-module load build.$target
+module load build.$target.$compiler
 module list
 
 #-----------------------------------------------------------------------

diff --git a/driver_scripts/driver_grid.jet.sh b/driver_scripts/driver_grid.jet.sh
@@ -61,7 +61,7 @@ set -x
 
 source ../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 #-----------------------------------------------------------------------

diff --git a/driver_scripts/driver_grid.orion.sh b/driver_scripts/driver_grid.orion.sh
@@ -60,7 +60,7 @@ set -x
 
 source ../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 #-----------------------------------------------------------------------

diff --git a/modulefiles/build.cheyenne → modulefiles/build.cheyenne.intel b/modulefiles/build.cheyenne → modulefiles/build.cheyenne.intel
diff --git a/modulefiles/build.hera.gnu b/modulefiles/build.hera.gnu
@@ -0,0 +1,29 @@
+#%Module#####################################################
+## Build and run module for Hera
+#############################################################
+
+module load hpss
+module load cmake/3.16.1
+module load gnu/9.2.0
+module use -a /scratch1/BMC/gmtb/software/modulefiles/gnu-9.2.0/mpich-3.3.2
+module load mpich/3.3.2
+
+module use -a /scratch1/BMC/gmtb/software/ufs-stack-20200909/gnu-9.2.0/mpich-3.3.2/modules
+
+module load libpng/1.6.35
+module load netcdf/4.7.4
+module load esmf/8.1.0bs27
+
+module load bacio/2.4.0
+module load g2/3.4.0
+module load ip/3.3.0
+module load nemsio/2.5.1
+module load sp/2.3.0
+module load w3emc/2.7.0
+module load w3nco/2.4.0
+module load gfsio/1.4.0
+module load sfcio/1.4.0
+module load sigio/2.3.0
+module load nemsiogfs/2.5.0
+module load landsfcutil/2.4.0
+module load wgrib2/2.0.8
diff --git a/modulefiles/build.hera → modulefiles/build.hera.intel b/modulefiles/build.hera → modulefiles/build.hera.intel
diff --git a/modulefiles/build.jet → modulefiles/build.jet.intel b/modulefiles/build.jet → modulefiles/build.jet.intel
diff --git a/modulefiles/build.odin → modulefiles/build.odin.intel b/modulefiles/build.odin → modulefiles/build.odin.intel
diff --git a/modulefiles/build.orion → modulefiles/build.orion.intel b/modulefiles/build.orion → modulefiles/build.orion.intel
diff --git a/modulefiles/build.stampede → modulefiles/build.stampede.intel b/modulefiles/build.stampede → modulefiles/build.stampede.intel
diff --git a/modulefiles/build.wcoss_cray → modulefiles/build.wcoss_cray.intel b/modulefiles/build.wcoss_cray → modulefiles/build.wcoss_cray.intel
diff --git a/modulefiles/build.wcoss_dell_p3 → modulefiles/build.wcoss_dell_p3.intel b/modulefiles/build.wcoss_dell_p3 → modulefiles/build.wcoss_dell_p3.intel
diff --git a/reg_tests/chgres_cube/driver.cray.sh b/reg_tests/chgres_cube/driver.cray.sh
@@ -24,7 +24,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export OUTDIR=/gpfs/hps3/stmp/$LOGNAME/chgres_reg_tests

diff --git a/reg_tests/chgres_cube/driver.dell.sh b/reg_tests/chgres_cube/driver.dell.sh
@@ -24,7 +24,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export OUTDIR=/gpfs/dell1/stmp/$LOGNAME/chgres_reg_tests

diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh
@@ -24,9 +24,11 @@
 
 set -x
 
+compiler=${compiler:-"intel"}
+
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.$compiler
 module list
 
 export OUTDIR=/scratch2/NCEPDEV/stmp1/$LOGNAME/chgres_reg_tests
@@ -43,7 +45,7 @@ export HOMEufs=$PWD/../..
 
 export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/chgres_cube
 
-export NCCMP=/apps/nccmp/1.8.5/intel/18.0.3.051/bin/nccmp
+export NCCMP=/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/intel-18.0.5.274/impi-2018.0.4/nccmp/1.8.7.0/bin/nccmp
 
 LOG_FILE=regression.log
 SUM_FILE=summary.log

diff --git a/reg_tests/chgres_cube/driver.jet.sh b/reg_tests/chgres_cube/driver.jet.sh
@@ -26,7 +26,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export OUTDIR=/lfs4/HFIP/emcda/$LOGNAME/stmp/chgres_reg_tests

diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh
@@ -26,7 +26,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export OUTDIR=/work/noaa/stmp/$LOGNAME/chgres_reg_tests

diff --git a/reg_tests/global_cycle/driver.cray.sh b/reg_tests/global_cycle/driver.cray.sh
@@ -29,7 +29,7 @@
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export DATA=/gpfs/hps3/stmp/$LOGNAME/reg_tests.cycle

diff --git a/reg_tests/global_cycle/driver.dell.sh b/reg_tests/global_cycle/driver.dell.sh
@@ -34,7 +34,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export DATA=/gpfs/dell1/stmp/$LOGNAME/reg_tests.cycle

diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh
@@ -29,9 +29,11 @@
 
 set -x
 
+compiler=${compiler:-"intel"}
+
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.$compiler
 module list
 
 export DATA=/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_tests.cycle
@@ -50,7 +52,7 @@ export NWPROD=$PWD/../..
 
 export COMOUT=$DATA
 
-export NCCMP=/apps/nccmp/1.8.5/intel/18.0.3.051/bin/nccmp
+export NCCMP=/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/intel-18.0.5.274/impi-2018.0.4/nccmp/1.8.7.0/bin/nccmp
 
 reg_dir=$PWD
 

diff --git a/reg_tests/global_cycle/driver.jet.sh b/reg_tests/global_cycle/driver.jet.sh
@@ -32,7 +32,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export DATA=/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_tests.cycle

diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh
@@ -31,7 +31,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export DATA=/work/noaa/stmp/$LOGNAME/reg_tests.cycle

diff --git a/reg_tests/grid_gen/driver.cray.sh b/reg_tests/grid_gen/driver.cray.sh
@@ -21,7 +21,7 @@
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 set -x

diff --git a/reg_tests/grid_gen/driver.dell.sh b/reg_tests/grid_gen/driver.dell.sh
@@ -21,7 +21,7 @@
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 set -x

diff --git a/reg_tests/grid_gen/driver.hera.sh b/reg_tests/grid_gen/driver.hera.sh
@@ -21,9 +21,11 @@
 #
 #-----------------------------------------------------------------------------
 
+compiler=${compiler:-"intel"}
+
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.$compiler
 module list
 
 set -x
@@ -43,7 +45,7 @@ export APRUN=time
 export APRUN_SFC=srun
 export OMP_STACKSIZE=2048m
 export machine=HERA
-export NCCMP=/apps/nccmp/1.8.5/intel/18.0.3.051/bin/nccmp
+export NCCMP=/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/intel-18.0.5.274/impi-2018.0.4/nccmp/1.8.7.0/bin/nccmp
 export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/grid_gen/baseline_data
 
 ulimit -a

diff --git a/reg_tests/grid_gen/driver.jet.sh b/reg_tests/grid_gen/driver.jet.sh
@@ -23,7 +23,7 @@
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 set -x

diff --git a/reg_tests/grid_gen/driver.orion.sh b/reg_tests/grid_gen/driver.orion.sh
@@ -23,7 +23,7 @@
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 set -x

diff --git a/reg_tests/ice_blend/driver.cray.sh b/reg_tests/ice_blend/driver.cray.sh
@@ -30,7 +30,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export DATA=/gpfs/hps3/stmp/$LOGNAME/reg_tests.ice_blend

diff --git a/reg_tests/ice_blend/driver.dell.sh b/reg_tests/ice_blend/driver.dell.sh
@@ -28,7 +28,7 @@
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 set -x

diff --git a/reg_tests/ice_blend/driver.hera.sh b/reg_tests/ice_blend/driver.hera.sh
@@ -29,9 +29,11 @@
 
 set -x
 
+compiler=${compiler:-"intel"}
+
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.$compiler
 module list
 
 export DATA="/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_test.ice_blend"

diff --git a/reg_tests/ice_blend/driver.jet.sh b/reg_tests/ice_blend/driver.jet.sh
@@ -30,7 +30,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export DATA="/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_test.ice_blend"

diff --git a/reg_tests/ice_blend/driver.orion.sh b/reg_tests/ice_blend/driver.orion.sh
@@ -31,7 +31,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export DATA="/work/noaa/stmp/$LOGNAME/reg_test.ice_blend"

diff --git a/reg_tests/snow2mdl/driver.cray.sh b/reg_tests/snow2mdl/driver.cray.sh
@@ -30,7 +30,7 @@ set -x
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 export DATA=/gpfs/hps3/stmp/$LOGNAME/reg_tests.snow2mdl

diff --git a/reg_tests/snow2mdl/driver.dell.sh b/reg_tests/snow2mdl/driver.dell.sh
@@ -28,7 +28,7 @@
 
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
-module load build.$target
+module load build.$target.intel
 module list
 
 set -x