HAFS build system clean up.

modulefiles/modulefile.hafs.run.hera

@@ -1,6 +1,10 @@
 #%Module#####################################################
 ## Module file for hafs
 #############################################################
+proc ModulesHelp { } {
+    puts stderr "Set environment veriables for compiling or running HAFS"
+}
+module-whatis " HAFS model prerequisites"
 
 module use /contrib/sutils/modulefiles
 module load sutils

modulefiles/modulefile.hafs.run.jet

@@ -14,15 +14,6 @@ setenv CMAKE_C_COMPILER mpiicc
 setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform jet.intel
-setenv COREPATH /lfs4/HFIP/hfv3gfs/nwprod/NCEPLIBS/modulefiles
-setenv NCEPLIBS /lfs4/HFIP/hfv3gfs/nwprod/NCEPLIBS/modulefiles
-module load hpss
-setenv WGRIB2_ROOT /lfs4/HFIP/hwrfv3/Jili.Dong/wgrib2-2.0.8/grib2/lib
-setenv WGRIB2 /lfs4/HFIP/hwrfv3/Jili.Dong/wgrib2-2.0.8/grib2/wgrib2/wgrib2
-setenv GRB2INDEX /lfs4/HFIP/hwrf-vd/Zhan.Zhang/H219_kjet/sorc/hwrf-utilities/exec/grb2index.exe
-setenv NDATE /lfs4/HFIP/hwrfv3/Jili.Dong/fv3gfs_hafs/ndate.exe
-module load rocoto/1.3.3
-module load intelpython/3.6.5
 
 module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
 
@@ -47,13 +38,18 @@ module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
 
-module load nco/4.9.1
-module load szip/2.1.1 
+module load szip/2.1.1
 module load sigio/2.3.2
-module load sfcio/1.4.1 
+module load sfcio/1.4.1
 module load nemsiogfs/2.5.3
-module load gfsio/1.4.1 
+module load gfsio/1.4.1
 module load landsfcutil/2.4.1
 module load bufr/11.4.0
 module load prod_util/1.2.2
 module load grib_util/1.2.2
+
+module load hpss
+module load wgrib2/2.0.8
+module load nco/4.9.1
+module load rocoto/1.3.3
+module load intelpython/3.6.5

modulefiles/modulefile.hafs.run.orion

@@ -1,6 +1,10 @@
 #%Module#####################################################
-## Module file for vortextracker
+## Module file for hafs
 #############################################################
+proc ModulesHelp { } {
+    puts stderr "Set environment veriables for compiling or running HAFS"
+}
+module-whatis " HAFS model prerequisites"
 
 module load contrib noaatools
 
@@ -49,7 +53,6 @@ module load prod_util/1.2.2
 module load grib_util/1.2.2
 
 module load wgrib2/2.0.8
-setenv WGRIB2 /apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/impi-2018.4/wgrib2/2.0.8/bin/wgrib2
 module load nco/4.9.3
 module load rocoto/1.3.3
 module load intelpython3/2020

sorc/build_all.sh

@@ -4,7 +4,7 @@ set -eux
 # USER DEFINED STUFF:
 #
 # USE_PREINST_LIBS: set to "true" to use preinstalled libraries.
-#                   Anything other than "true"  will use libraries locally.
+#                   Anything other than "true" will use libraries locally.
 #------------------------------------
 
 export USE_PREINST_LIBS="true"
@@ -15,19 +15,11 @@ export USE_PREINST_LIBS="true"
 
 build_dir=`pwd`
 logs_dir=$build_dir/logs
-if [ ! -d $logs_dir  ]; then
-  echo "Creating logs folder"
-  mkdir $logs_dir
-fi
-
-# Check final exec folder exists
-if [ ! -d "../exec" ]; then
-  echo "Creating ../exec folder"
-  mkdir ../exec
-fi
+mkdir -p $logs_dir
+mkdir -p ../exec
 
 #------------------------------------
-# INCLUDE PARTIAL BUILD 
+# INCLUDE PARTIAL BUILD
 #------------------------------------
 
 . ./partial_build.sh
@@ -74,7 +66,7 @@ echo " .... Building utils .... "
 }
 
 #------------------------------------
-# build tools 
+# build tools
 #------------------------------------
 $Build_tools && {
 echo " .... Building tools .... "
@@ -90,7 +82,7 @@ echo " .... Building gsi .... "
 }
 
 #------------------------------------
-# build hycom_utils 
+# build hycom_utils
 #------------------------------------
 $Build_hycom_utils && {
 echo " .... Building hycom_utils .... "
@@ -100,4 +92,4 @@ echo " .... Building hycom_utils .... "
 
 echo;echo " .... Build system finished .... "
 
-exit 0
+exit

sorc/build_forecast.sh

@@ -1,27 +1,15 @@
 #!/bin/sh
 set -eux
-
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=`pwd`
 
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
-# Check final exec folder exists
-if [ ! -d "../exec" ]; then
-  mkdir ../exec
-fi
-
 if [ $target = hera ]; then target=hera.intel ; fi
 if [ $target = orion ]; then target=orion.intel ; fi
 if [ $target = jet ]; then target=jet.intel ; fi
 #if [ $target = wcoss_cray ]; then module load python/2.7.14; fi
 
-cd hafs_forecast.fd/
-cd tests/
+cd hafs_forecast.fd/tests
+
 ./compile.sh "$target" "APP=HAFS CCPP=Y STATIC=Y SUITES=HAFS_v0_gfdlmp_tedmf_nonsst,HAFS_v0_gfdlmp_tedmf,HAFS_v0_gfdlmp_nocpnsst,HAFS_v0_gfdlmp_nonsst,HAFS_v0_gfdlmp_nocp,HAFS_v0_gfdlmp,HAFS_v0_hwrf_thompson,HAFS_v0_hwrf 32BIT=Y" 32bit YES NO
 
+exit

sorc/build_gsi.sh

@@ -1,27 +1,11 @@
 #!/bin/sh
 set -eux
-
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=`pwd`
 
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
-gsitarget=$target
-[[ "$target" == wcoss_cray ]] && gsitarget=cray
-
-# Check final exec folder exists
-if [ ! -d "../exec" ]; then
-  mkdir ../exec
-fi
-
 cd hafs_gsi.fd/ush/
+
 #./build_all_cmake.sh "PRODUCTION" "$cwd/hafs_gsi.fd"
 ./build_all_cmake.sh "BUILD_FV3reg" "$cwd/hafs_gsi.fd"
 
 exit
-

sorc/build_hycom_utils.sh

@@ -1,22 +1,8 @@
-#! /bin/sh
-
+#!/bin/sh
 set -eux
-
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=`pwd`
 
-# Check final exec folder exists
-if [ ! -d "../exec" ]; then
-  mkdir ../exec
-fi
-
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
 if [ $target = wcoss_cray ]; then
   export DM_FC="ftn -static"
   export DM_F90="ftn -free -static"

sorc/build_post.sh

@@ -1,20 +1,9 @@
 #!/bin/sh
 set -eux
-
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=`pwd`
 
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
-# Check final exec folder exists
-if [ ! -d "../exec" ]; then
-  mkdir ../exec
-fi
-
 cd hafs_post.fd/tests
-sh compile_upp.sh
+./compile_upp.sh
+
+exit

sorc/build_tools.sh

@@ -5,106 +5,36 @@ set -x
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=`pwd`
 
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
-if [ $target = wcoss ]; then
-
-    echo "Does not support wcoss phase 1/2."
-    exit 1
-
-elif [ $target = hera ]; then
-
-    export $target
+if [ $target = hera ] || [ $target = orion ] || [ $target = jet ]; then
     #source ../modulefiles/modulefile.tools.$target > /dev/null 2>&1
     module use ../modulefiles
     module load modulefile.tools.$target
     module list
-
     export FC=ifort
     export F90=ifort
     export CC=icc
     export MPIFC=mpif90
-
-elif [ $target = orion ]; then
-
-    export $target
-    #source ../modulefiles/modulefile.tools.$target > /dev/null 2>&1
-    module use ../modulefiles
-    module load modulefile.tools.$target
-    module list
-
-    export FC=ifort
-    export F90=ifort
-    export CC=icc
-    export MPIFC=mpiifort
-
-elif [ $target = jet ]; then
-
-    export $target
-    #source ../modulefiles/modulefile.tools.$target > /dev/null 2>&1
-    module use ../modulefiles
-    module load modulefile.tools.$target
-    module list
-
-    export FC=ifort
-    export F90=ifort
-    export CC=icc
-    export MPIFC=mpif90
-
 elif [ $target = wcoss_cray ]; then
-
-    export target
-    if [ $USE_PREINST_LIBS = true ]; then
-      #source ../modulefiles/modulefile.tools.$target           > /dev/null 2>&1
-      module use ../modulefiles
-      module load modulefile.tools.$target
-    else
-      #source ../modulefiles/modulefile.tools.${target}_userlib > /dev/null 2>&1
-      module use ../modulefiles
-      module load modulefile.tools.${target}_userlib
-    fi
+    #source ../modulefiles/modulefile.tools.${target} > /dev/null 2>&1
+    module use ../modulefiles
+    module load modulefile.tools.${target}
     module load cmake/3.3.2
     module list
-
     export FC="ftn -static"
     export F90="ftn -free -static"
     export CC=icc
     export DM_FC="ftn -static"
     export DM_F90="ftn -free -static"
     export DM_CC="cc -static"
-
 elif [ $target = wcoss_dell_p3 ]; then
-
-    export $target
-    if [ $USE_PREINST_LIBS = true ]; then
-      #source ../modulefiles/modulefile.tools.$target           > /dev/null 2>&1
-      module use ../modulefiles
-      module load modulefile.tools.$target
-    else
-      #source ../modulefiles/modulefile.tools.${target}_userlib > /dev/null 2>&1
-      module use ../modulefiles
-      module load modulefile.tools.${target}_userlib
-    fi
+    #source ../modulefiles/modulefile.tools.${target} > /dev/null 2>&1
+    module use ../modulefiles
+    module load modulefile.tools.${target}
     module list
-
     export FC=ifort
     export F90=ifort
     export CC=icc
-
 else
-
     echo "Unknown machine = $target"
     exit 1
 fi
@@ -142,11 +72,10 @@ if [ $target = wcoss_cray ]; then
 else
   cmake .. -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_C_COMPILER=icc
 fi
-#make -j 8 
+#make -j 8
 make -j 8 VERBOSE=1
 make install
 
-
 cd ${TOOLS_PATH}/sorc
 
 ./build_hafs_utils.sh