From 2487cb3412447aa7d2349abc235b91774c4ecbee Mon Sep 17 00:00:00 2001 From: Julie Schramm Date: Wed, 6 Nov 2019 10:56:35 -0700 Subject: [PATCH 1/2] Clean up comments at top of module files. --- modulefiles/regional_workflow/global_equiv_resol.cheyenne | 2 +- modulefiles/regional_workflow/mosaic_file.cheyenne | 2 +- modulefiles/regional_workflow/orog.cheyenne | 2 +- modulefiles/regional_workflow/regional_grid.cheyenne | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/regional_workflow/global_equiv_resol.cheyenne b/modulefiles/regional_workflow/global_equiv_resol.cheyenne index 319493368..d50a83ea0 100644 --- a/modulefiles/regional_workflow/global_equiv_resol.cheyenne +++ b/modulefiles/regional_workflow/global_equiv_resol.cheyenne @@ -1,5 +1,5 @@ #%Module##################################################### -## Module file for regional_grid +## Module file for global_equiv_resol on NCAR/UCAR Cheyenne ############################################################# module purge module load ncarenv/1.3 diff --git a/modulefiles/regional_workflow/mosaic_file.cheyenne b/modulefiles/regional_workflow/mosaic_file.cheyenne index 4f245351d..a24cf1ce6 100644 --- a/modulefiles/regional_workflow/mosaic_file.cheyenne +++ b/modulefiles/regional_workflow/mosaic_file.cheyenne @@ -1,5 +1,5 @@ #%Module##################################################### -## Module file for regional_grid +## Module file for mosaic_file on NCAR/UCAR Cheyenne ############################################################# module purge module load ncarenv/1.3 diff --git a/modulefiles/regional_workflow/orog.cheyenne b/modulefiles/regional_workflow/orog.cheyenne index ab218f922..b4450e00c 100644 --- a/modulefiles/regional_workflow/orog.cheyenne +++ b/modulefiles/regional_workflow/orog.cheyenne @@ -1,5 +1,5 @@ #%Module##################################################### -## Module file for orog +## Module file for orog on NCAR/UCAR Cheyenne ############################################################# # Loading Intel Compiler Suite module load intel/18.0.1 diff --git a/modulefiles/regional_workflow/regional_grid.cheyenne b/modulefiles/regional_workflow/regional_grid.cheyenne index 4f245351d..bd3d7874c 100644 --- a/modulefiles/regional_workflow/regional_grid.cheyenne +++ b/modulefiles/regional_workflow/regional_grid.cheyenne @@ -1,5 +1,5 @@ #%Module##################################################### -## Module file for regional_grid +## Module file for regional_grid on NCAR/UCAR Cheyenne ############################################################# module purge module load ncarenv/1.3 From e5b0923fcbb12d23cfe6db9ed633226f36515e25 Mon Sep 17 00:00:00 2001 From: Julie Schramm Date: Wed, 6 Nov 2019 11:27:19 -0700 Subject: [PATCH 2/2] Remove unused build files on community_develop --- sorc/build_fre-nctools.sh | 153 -------------------------------------- sorc/build_orog.sh | 83 --------------------- sorc/checkout.sh | 42 ----------- 3 files changed, 278 deletions(-) delete mode 100755 sorc/build_fre-nctools.sh delete mode 100755 sorc/build_orog.sh delete mode 100755 sorc/checkout.sh diff --git a/sorc/build_fre-nctools.sh b/sorc/build_fre-nctools.sh deleted file mode 100755 index c5a839616..000000000 --- a/sorc/build_fre-nctools.sh +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/sh -set -eux - -# Check for input argument: this should be the "platform" if it exists -if [ $# -eq 0 ]; then - echo "No 'platform' argument supplied" - echo "Using directory structure to determine machine settings" - platform='' -else - platform=$1 -fi -source ./machine-setup.sh $platform > /dev/null 2>&1 -system_site=$target -if [ $system_site = "wcoss_cray" ]; then - system_site=cray -fi - -echo "Building fre-nctools package for $system_site" - -cwd=`pwd` - -# Check final exec folder exists -if [ ! -d "../exec" ]; then - mkdir ../exec -fi - -cd fre-nctools.fd/ - -home_dir=`pwd`/../.. -srcDir=`pwd` - -#Build in a temporary directory. -tmpDir=`pwd`/build -mkdir -p $tmpDir -cd $tmpDir - -set +x -echo "////////////////////////////////////////////////////////////////////////////////" -echo "//////////////////////////////////////////////////////// Environment Settings //" -echo "////////////////////////////////////////////////////////////////////////////////" -set -x - -#Original setup is for cray so for now require input only on a different platform. - -set +x -module list -module use ../../../modulefiles/regional_workflow -module load fre-nctools.${target} -module list -set -x - -MPICH_UNEX_BUFFER_SIZE=256m -MPICH_MAX_SHORT_MSG_SIZE=64000 -MPICH_PTL_UNEX_EVENTS=160k -KMP_STACKSIZE=2g -F_UFMTENDIAN=big - -if [ $system_site = "cray" ]; then - HDF5=${HDF5_DIR} - NETCDF=${NETCDF_DIR} -elif [ "$system_site" = "theia" ]; then - HDF5_DIR=$HDF5 - NETCDF_DIR=$NETCDF -elif [ "$system_site" = "hera" ]; then - HDF5_DIR=$HDF5 - NETCDF_DIR=$NETCDF -elif [ $system_site = wcoss_dell_p3 ]; then - HDF5_DIR=$HDF5 - NETCDF_DIR=$NETCDF -elif [ $system_site = cheyenne ]; then - NETCDF_DIR=$NETCDF - HDF5_DIR=$NETCDF #HDF5 resides with NETCDF on Cheyenne -elif [ $system_site = jet ]; then - HDF5_DIR=$HDF5 - NETCDF_DIR=$NETCDF - HDF5_HOME=$HDF5 - NETCDF_HOME=$NETCDF - export I_MPI_CC=icc -fi - -if [ $system_site = "cray" ]; then - alias make="make HDF5_HOME=${HDF5} NETCDF_HOME=${NETCDF} NC_BLKSZ=64K SITE=${system_site} -f fre-nctools.mk" -else - alias make="make HDF5_HOME=${HDF5_DIR} NETCDF_HOME=${NETCDF_DIR} NC_BLKSZ=64K SITE=${system_site} -f fre-nctools.mk" -fi - -set +x -echo "////////////////////////////////////////////////////////////////////////////////" -echo "//////////////////////////////////////////////////////////// Directory Layout //" -echo "////////////////////////////////////////////////////////////////////////////////" -set -x - -mkdir -p share/src -cp -r $srcDir/shared share/src/. -cp -r $srcDir/tools share/src/. - -echo "Done..." - -for freNCToolsDir in tools/make_hgrid tools/make_solo_mosaic tools/fregrid -do - set +x - echo "////////////////////////////////////////////////////////////////////////////////" - echo "////////////////////////////////////////////////////////////////// $freNCToolsDir:t" - echo "////////////////////////////////////////////////////////////////////////////////" - set -x - - cd share/src/$freNCToolsDir - cp fre-nctools.mk_${system_site} fre-nctools.mk - targets=` grep "TARGETS :=" fre-nctools.mk | cut -f2 -d'=' ` - echo "Making $targets" - - make clean - make - - for Target in $targets - do - if [ -f $Target ]; then - mv $Target $home_dir/exec - else - echo "Error during '$Target' build" - exit 1 - fi - done - make clean - cd $tmpDir -done - -set +x -echo "////////////////////////////////////////////////////////////////////////////////" -echo "///////////////////////////////////////////////////////////////// filter_topo //" -echo "////////////////////////////////////////////////////////////////////////////////" -set -x - -cd ../tools/filter_topo -if [ $system_site = cheyenne ]; then - export HDF5=$HDF5_DIR -fi -./make.csh_${target} -mv filter_topo $home_dir/exec/. - -echo "\n////////// CLEANING UP TEMPORARY BUILD AREA //////////\n" -rm -fr $tmpDir - -set +x -echo "///////////////////////////////////////////////////////////////////////////" -echo "///////////////////////////////////////////////////////////////// shave //" -echo "///////////////////////////////////////////////////////////////////////////" -set -x - -cd $srcDir/tools/shave.fd -./build_shave $system_site - -exit diff --git a/sorc/build_orog.sh b/sorc/build_orog.sh deleted file mode 100755 index d5486ea54..000000000 --- a/sorc/build_orog.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -##################################################################################### -# orog using module compile standard -# 10/10/2016 Fanglin.Yang@noaa.gov: Create module load version -##################################################################################### -set -eux - -source ./machine-setup.sh $1 > /dev/null 2>&1 -cwd=`pwd` - -USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} -if [ $USE_PREINST_LIBS = true ]; then - if [ $target = odin ]; then - export MOD_PATH=/scratch/ywang/external/modulefiles - else - export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles - fi - source ../modulefiles/regional_workflow/orog.$target -else - export MOD_PATH=${cwd}/lib/modulefiles - if [ $target = wcoss_cray ]; then - source ../modulefiles/regional_workflow/orog.${target}_userlib - else - source ../modulefiles/regional_workflow/orog.$target - fi -fi - -# Check final exec folder exists -if [ ! -d "../exec" ]; then - mkdir ../exec -fi - -cd ./orog.fd - -if [ $target = wcoss_cray ]; then - INCS="" - export LIBSM="${BACIO_LIB4} ${IP_LIBd} ${W3NCO_LIBd} ${SP_LIBd}" - export FFLAGSM="-O3 -g -traceback -r8 -convert big_endian -fp-model precise -assume byterecl" -elif [ $target = wcoss ]; then - INCS="${NETCDF_INCLUDE}" - export LIBSM="${BACIO_LIB4} ${W3NCO_LIBd} ${IP_LIBd} ${SP_LIBd} ${NETCDF_LDFLAGS}" - export FFLAGSM="-O3 -g -traceback -r8 -convert big_endian -fp-model precise -assume byterecl ${INCS}" -elif [ $target = wcoss_dell_p3 ]; then - INCS="${NETCDF_INCLUDE}" - export LIBSM="${BACIO_LIB4} ${W3NCO_LIBd} ${IP_LIBd} ${SP_LIBd} ${NETCDF_LDFLAGS}" - export FFLAGSM="-O3 -g -traceback -r8 -convert big_endian -fp-model precise -assume byterecl ${INCS}" -elif [ $target = theia ]; then - INCS="-I${NETCDF}/include" - export LIBSM="${BACIO_LIB4} ${W3NCO_LIBd} ${IP_LIBd} ${SP_LIBd} -L${NETCDF}/lib -lnetcdff -lnetcdf" - export FFLAGSM="-O3 -g -traceback -r8 -convert big_endian -fp-model precise -assume byterecl ${INCS}" -elif [ $target = hera ]; then - INCS="-I${NETCDF}/include" - export LIBSM="${BACIO_LIB4} ${W3NCO_LIBd} ${IP_LIBd} ${SP_LIBd} -L${NETCDF}/lib -lnetcdff -lnetcdf" - export FFLAGSM="-O3 -g -traceback -r8 -convert big_endian -fp-model precise -assume byterecl ${INCS}" -elif [ $target = jet ]; then - INCS="-I${NETCDF}/include" - export LIBSM="${BACIO_LIB4} ${W3NCO_LIBd} ${IP_LIBd} ${SP_LIBd} -L${NETCDF}/lib -lnetcdff -lnetcdf" - export FFLAGSM="-O3 -g -traceback -r8 -convert big_endian -fp-model precise -assume byterecl ${INCS}" -elif [ $target = odin ]; then - INCS="" - export LIBSM="${BACIO_LIB4} ${IP_LIBd} ${W3NCO_LIBd} ${SP_LIBd}" - export FFLAGSM="-O3 -g -traceback -r8 -convert big_endian -fp-model precise -assume byterecl" -elif [ $target = cheyenne ]; then - INCS="-I${NETCDF}/include -I${NCEPLIB_DIR}/include" - export LIBSM="-L${NCEPLIB_DIR}/lib -lbacio_4 -lw3emc_d -lw3nco_d -lip_d -lsp_v2.0.2_d -L${NETCDF}/lib -lnetcdff -lnetcdf" - export FFLAGSM="-O3 -g -traceback -r8 -convert big_endian -fp-model precise -assume byterecl ${INCS}" -else - echo machine $target not found - exit 1 -fi - -export FCMP=${FCMP:-ifort} -export FCMP95=$FCMP - -export LDFLAGSM="-qopenmp -auto" -export OMPFLAGM="-qopenmp -auto" - -make -f Makefile clobber -make -f Makefile -make -f Makefile install -make -f Makefile clobber - -exit diff --git a/sorc/checkout.sh b/sorc/checkout.sh deleted file mode 100755 index 5962643de..000000000 --- a/sorc/checkout.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -set -xu - -topdir=$(pwd) -echo $topdir - -echo fv3gfs checkout ... -if [[ ! -d fv3gfs.fd ]] ; then - rm -f ${topdir}/checkout-fv3gfs.log - git clone --recursive gerrit:NEMSfv3gfs fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1 - cd fv3gfs.fd - git checkout nemsfv3gfs_beta_v1.0.11 - git submodule update --init --recursive - cd ${topdir} -else - echo 'Skip. Directory fv3gfs.fd already exists.' -fi - -echo gsi checkout ... -if [[ ! -d gsi.fd ]] ; then - rm -f ${topdir}/checkout-gsi.log - git clone --recursive gerrit:ProdGSI gsi.fd >> ${topdir}/checkout-gsi.fd.log 2>&1 - cd gsi.fd - git checkout fv3da.v1.0.31 - git submodule update - cd ${topdir} -else - echo 'Skip. Directory gsi.fd already exists.' -fi - -echo EMC_post checkout ... -if [[ ! -d gfs_post.fd ]] ; then - rm -f ${topdir}/checkout-gfs_post.log - git clone --recursive gerrit:EMC_post gfs_post.fd >> ${topdir}/checkout-gfs_post.log 2>&1 - cd gfs_post.fd - git checkout ncep_post.v8.0.26 - cd ${topdir} -else - echo 'Skip. Directory gfs_post.fd already exists.' -fi - -exit 0