Merge branch 'develop' into oro_mask_fill

Fixes ufs-community#714.

README.md

@@ -59,20 +59,21 @@ It also uses the following repositories:
 
 ## Installing
 
-On Orion, Jet, Hera and WCOSS2, invoke the build script:
+On Orion, Jet, Hera and WCOSS2 do the following:
+
+1) Set the 'fixed' directories using the `link_fixdirs.sh`
+script in `./fix`. Usage: `./link_fixdirs.sh $RUN_ENVIR $machine`,
+where `$RUN_ENVIR` is "emc" or "nco" (most developers
+should choose "emc") and `$machine` is the platform. Example:
 
 ```
-./build_all.sh
+./link_fixdirs.sh emc hera
 ```
 
-Otherwise, do:
+2) Then, invoke the build script:
 
 ```
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=/path/to/install ..
-make -j2
-make install
+./build_all.sh
 ```
 
 ## Contents

build_all.sh

@@ -26,6 +26,13 @@ else
  set -x
 fi
 
+# Ensure the submodules have been initialized.
+
+if [[ ! -d ./ccpp-physics/physics ]]; then
+  git submodule init
+  git submodule update
+fi
+
 # 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.

fix/link_fixdirs.sh

@@ -1,7 +1,15 @@
 #!/bin/bash
 set -ex
 
-#--Make symbolic links to 'fixed' directories.
+# Set up the 'fixed' directories. 
+# 
+# This script takes two arguments:
+#
+#  $RUN_ENVIR - Either 'emc' (creates links) or
+#               'nco' (copies data).
+#
+#  $machine - is the machine. Choices are:
+#             'wcoss2', 'hera', 'jet', 'orion', 's4'
 
 RUN_ENVIR=${1}
 machine=${2}

reg_tests/ice_blend/driver.jet.sh

@@ -31,7 +31,11 @@ set -x
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.intel
+module load gnu/9.2.0
+module load wgrib2/3.1.1_ncep
+set +x
 module list
+set -x
 
 export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
 export DATA="${DATA}/reg-tests/ice-blend"
@@ -48,7 +52,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
 fi
 
 export WGRIB=/apps/wgrib/1.8.1.0b/bin/wgrib
-export WGRIB2=/apps/wgrib2/0.1.9.6a/bin/wgrib2
+export WGRIB2=${WGRIB2_ROOT}/bin/wgrib2
 export COPYGB=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/grib_util/NCEPLIBS-grib_util/exec/bin/copygb
 export COPYGB2=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/grib_util/NCEPLIBS-grib_util/exec/bin/copygb2
 export CNVGRIB=/apps/cnvgrib/1.4.0/bin/cnvgrib

reg_tests/rt.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 
 ulimit -s unlimited
 
@@ -16,7 +16,7 @@ cd ${WORK_DIR}
 rm -f reg_test_results.txt
 rm -rf UFS_UTILS
 
-git clone --recursive https://github.com/ufs-community/UFS_UTILS.git
+git clone https://github.com/ufs-community/UFS_UTILS.git
 rc=$?
 
 # Check to see if the clone was successful. Previously, it has

reg_tests/snow2mdl/driver.jet.sh

@@ -24,7 +24,11 @@ set -x
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.intel
+module load gnu/9.2.0
+module load wgrib2/3.1.1_ncep
+set +x
 module list
+set -x
 
 DATA_ROOT="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
 DATA_ROOT="${DATA_ROOT}/reg-tests/snow2mdl"
@@ -46,7 +50,7 @@ fi
 export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/snow2mdl
 export HOMEgfs=$PWD/../..
 export WGRIB=/apps/wgrib/1.8.1.0b/bin/wgrib
-export WGRIB2=/apps/wgrib2/0.1.9.6a/bin/wgrib2
+export WGRIB2=${WGRIB2_ROOT}/bin/wgrib2
 
 rm -fr $DATA_ROOT