feature/hera_port This commit references #1.

Remove unused "module-setup.csh.inc" Update "ush/fv3gfs_chgres.sh" to point to new location for 'sub_wcoss' scripts. Remove some commented out code. Update "module-setup.sh.inc" for Hera.
GeorgeGayno-NOAA · Sep 11, 2019 · b1951d1 · b1951d1
1 parent e5c508d
commit b1951d1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 141 deletions.
diff --git a/modulefiles/module-setup.csh.inc b/modulefiles/module-setup.csh.inc
diff --git a/modulefiles/module-setup.sh.inc b/modulefiles/module-setup.sh.inc
@@ -22,8 +22,8 @@ if [[ -d /lfs3 ]] ; then
         source /apps/lmod/lmod/init/$__ms_shell
     fi
     module purge
-elif [[ -d /scratch3 ]] ; then
-    # We are on NOAA Theia
+elif [[ `hostname -a` == *"hera.fairmont.rdhpcs.noaa.gov"* ]] ; then
+    # We are on NOAA Hera
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         source /apps/lmod/lmod/init/$__ms_shell
     fi

diff --git a/ush/fv3gfs_chgres.sh b/ush/fv3gfs_chgres.sh
@@ -12,7 +12,7 @@
 #  - Uncomment the job cards for your machine.  Ensure the
 #    'machine' variable is uncommented.  Ensure job cards for
 #    the other machines are prefixed by "##".  
-#  - Check the job card account.  On Theia, this is 
+#  - Check the job card account.  On Hera, this is 
 #    "#SBATCH -q $account".  On WCOSS, this is "#BSUB -P $account".
 #    You may not have permissions to run under the default account.
 #  - Make sure you have linked the 'fixed' directories using
@@ -30,22 +30,22 @@
 #      CDATE     - year/month/day/hour of your experiment.
 #      HOMEgfs   - Path to your checkout repository.
 #  - Start the script as follows:
-#      Theia: "sbatch fv3gfs_chgres.sh"
+#      Hera: "sbatch fv3gfs_chgres.sh"
 #      WCOSS Dell and Cray: "cat fv3gfs_chgres.sh | bsub"
 #
 #------------------------------------------------------------------------
 
 #----WCOSS_DELL JOBCARD
-##BSUB -P FV3GFS-T2O
-##BSUB -o log.chgres.%J
-##BSUB -e log.chgres.%J
-##BSUB -J fv3_chgres
-##BSUB -q dev
-##BSUB -M 6000
-##BSUB -W 10:00
-##BSUB -R span[ptile=14]
-##BSUB -n 14
-#export machine=WCOSS_DELL_P3
+#BSUB -P FV3GFS-T2O
+#BSUB -o log.chgres.%J
+#BSUB -e log.chgres.%J
+#BSUB -J fv3_chgres
+#BSUB -q dev
+#BSUB -M 6000
+#BSUB -W 10:00
+#BSUB -R span[ptile=14]
+#BSUB -n 14
+export machine=WCOSS_DELL_P3
 
 #----WCOSS_CRAY JOBCARD
 ##BSUB -L /bin/sh
@@ -61,15 +61,15 @@
 
 #---- Hera JOBCARD
 #---- Submit as: sbatch $script
-#SBATCH -J fv3_chgres_driver
-#SBATCH -A fv3-cpu
-#SBATCH --open-mode=truncate
-#SBATCH -o log.chgres
-#SBATCH -e log.chgres
-#SBATCH --nodes=1
-#SBATCH -q batch
-#SBATCH -t 02:00:00
-export machine=HERA
+##SBATCH -J fv3_chgres_driver
+##SBATCH -A fv3-cpu
+##SBATCH --open-mode=truncate
+##SBATCH -o log.chgres
+##SBATCH -e log.chgres
+##SBATCH --nodes=1
+##SBATCH -q batch
+##SBATCH -t 02:00:00
+#export machine=HERA
 
 set -x
 
@@ -132,34 +132,20 @@ status=$?
 [[ $status -ne 0 ]] && exit $status
 
 if [ $machine = WCOSS_C ]; then
- # . $MODULESHOME/init/sh                 2>>/dev/null
- # module load prod_util prod_envir hpss  2>>/dev/null
- # module load PrgEnv-intel               2>>/dev/null
  export KMP_AFFINITY=disabled
  export OMP_NUM_THREADS_CH=24
  export APRUNC="aprun -n 1 -N 1 -j 1 -d $OMP_NUM_THREADS_CH -cc depth"
  export APRUNTF='aprun -q -j1 -n1 -N1 -d1 -cc depth'
- export SUB=/u/emc.glopara/bin/sub_wcoss_c
+ export SUB=$LS_SUBCWD/../util/sub_wcoss_c
  export ACCOUNT=FV3GFS-T2O
  export QUEUE=dev
  export QUEUE_TRANS=dev_transfer 
 elif [ $machine = WCOSS_DELL_P3 ]; then
- # . /usrx/local/prod/lmod/lmod/init/sh   2>>/dev/null
- # module purge                           2>>/dev/null
- # module load EnvVars/1.0.2              2>>/dev/null
- # module load lsf/10.1                   2>>/dev/null
- # module load ips/18.0.1.163             2>>/dev/null
- # module load impi/18.0.1                2>>/dev/null
- # module load prod_util/1.1.0            2>>/dev/null
- # module load prod_envir/1.0.2           2>>/dev/null
- # module load HPSS/5.0.2.5               2>>/dev/null
- # module load NetCDF/4.5.0               2>>/dev/null
- # module load HDF5-serial/1.10.1         2>>/dev/null
  export OMP_NUM_THREADS_CH=14
  export KMP_AFFINITY=disabled
  export APRUNC="time"
  export APRUNTF="time"
- export SUB=/u/emc.glopara/bin/sub_wcoss_d
+ export SUB=$LS_SUBCWD/../util/sub_wcoss_d
  export ACCOUNT=FV3GFS-T2O
  export QUEUE=dev
  export QUEUE_TRANS=dev_transfer 
@@ -418,19 +404,6 @@ cat > read_hpss.sh <<EOF
 
    . $HOMEgfs/ush/load_fv3gfs_modules.sh   2>>/dev/null
 
-   #export machine=$machine
-   #if [ $machine = WCOSS_C ]; then
-   # . $MODULESHOME/init/sh                 2>>/dev/null
-   # module load hpss  2>>/dev/null
-   #elif [ $machine = WCOSS_DELL_P3 ]; then
-   # . /usrx/local/prod/lmod/lmod/init/sh   2>>/dev/null
-   # module load HPSS/5.0.2.5               2>>/dev/null
-   #elif [ $machine = THEIA ]; then
-   # source $HOMEgfs/sorc/machine-setup.sh  2>>/dev/null
-   # module use -a /scratch3/NCEPDEV/nwprod/lib/modulefiles  2>>/dev/null
-   # module load hpss                       2>>/dev/null
-   #fi
-
    cd $INIDIR
    htar -xvf  $HPSSPATH/$tarball_enkf_atm 
    if [ $CDATE -le 2017072000 ] && [ $CDATE -gt 2014050100 ]; then