Merge pull request #1 from gsketefian/move_modules

Move modules
natalie-perlin · Nov 18, 2019 · 43f4c98 · 43f4c98
2 parents a9adbc7 + 6060304
commit 43f4c98
Show file tree

Hide file tree

Showing 26 changed files with 659 additions and 400 deletions.
diff --git a/jobs/JREGIONAL_MAKE_IC_LBC0 → jobs/JREGIONAL_MAKE_ICS b/jobs/JREGIONAL_MAKE_IC_LBC0 → jobs/JREGIONAL_MAKE_ICS
@@ -119,35 +119,9 @@ case "$MACHINE" in
   ;;
 #
 "HERA")
-#
-  { save_shell_opts; set +x; } > /dev/null 2>&1
-
   ulimit -s unlimited
 #  ulimit -a
-
-  module purge
-  module load intel/18.0.5.274
-  module load impi/2018.0.4
-  module load netcdf/4.6.1
-
-  module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-  module load esmf/8.0.0bs21
-
-  module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-  module load w3nco
-  module load nemsio/2.2.3
-  module load bacio
-  module load sp
-  module load sfcio
-  module load sigio
-
-  module load wgrib2 
-
-  module list
-
   APRUN="srun"
-
-  { restore_shell_opts; } > /dev/null 2>&1
   ;;
 #
 "JET")
@@ -216,7 +190,7 @@ EXTRN_MDL_FILES_DIR="${CYCLE_DIR}/${EXTRN_MDL_NAME_ICS}/ICS"
 #
 EXTRN_MDL_FNS_str="( "$( printf "\"%s\" " "${EXTRN_MDL_FNS[@]}" )")"
 
-$SCRIPTSDIR/exregional_make_ic_lbc0.sh \
+$SCRIPTSDIR/exregional_make_ics.sh \
   EXTRN_MDL_FNS="${EXTRN_MDL_FNS_str}" \
   EXTRN_MDL_FILES_DIR="${EXTRN_MDL_FILES_DIR}" \
   EXTRN_MDL_CDATE="${EXTRN_MDL_CDATE}" \

diff --git a/jobs/JREGIONAL_MAKE_LBC1_TO_LBCN → jobs/JREGIONAL_MAKE_LBCS b/jobs/JREGIONAL_MAKE_LBC1_TO_LBCN → jobs/JREGIONAL_MAKE_LBCS
@@ -119,35 +119,9 @@ case "$MACHINE" in
   ;;
 #
 "HERA")
-#
-  { save_shell_opts; set +x; } > /dev/null 2>&1
-
   ulimit -s unlimited
 #  ulimit -a
-
-  module purge
-  module load intel/18.0.5.274
-  module load impi/2018.0.4
-  module load netcdf/4.6.1
-
-  module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-  module load esmf/8.0.0bs21
-
-  module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-  module load w3nco
-  module load nemsio/2.2.3
-  module load bacio
-  module load sp
-  module load sfcio
-  module load sigio
-
-  module load wgrib2
-
-  module list
-
   APRUN="srun"
-
-  { restore_shell_opts; } > /dev/null 2>&1
   ;;
 
 #
@@ -218,7 +192,7 @@ EXTRN_MDL_FILES_DIR="${CYCLE_DIR}/${EXTRN_MDL_NAME_LBCS}/LBCS"
 EXTRN_MDL_FNS_str="( "$( printf "\"%s\" " "${EXTRN_MDL_FNS[@]}" )")"
 EXTRN_MDL_LBC_UPDATE_FHRS_str="( "$( printf "\"%s\" " "${EXTRN_MDL_LBC_UPDATE_FHRS[@]}" )")"
 
-$SCRIPTSDIR/exregional_make_lbc1_to_lbcn.sh \
+$SCRIPTSDIR/exregional_make_lbcs.sh \
   EXTRN_MDL_FNS="${EXTRN_MDL_FNS_str}" \
   EXTRN_MDL_FILES_DIR="${EXTRN_MDL_FILES_DIR}" \
   EXTRN_MDL_CDATE="${EXTRN_MDL_CDATE}" \

diff --git a/jobs/JREGIONAL_MAKE_OROG b/jobs/JREGIONAL_MAKE_OROG
@@ -18,7 +18,7 @@
 #
 #-----------------------------------------------------------------------
 #
-{ save_shell_opts; set -u -x; } > /dev/null 2>&1
+{ save_shell_opts; set -u +x; } > /dev/null 2>&1
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JREGIONAL_RUN_FV3 → jobs/JREGIONAL_RUN_FCST b/jobs/JREGIONAL_RUN_FV3 → jobs/JREGIONAL_RUN_FCST
@@ -28,7 +28,7 @@
 #
 #-----------------------------------------------------------------------
 #
-{ save_shell_opts; set -u -x; } > /dev/null 2>&1
+{ save_shell_opts; set -u +x; } > /dev/null 2>&1
 #
 #-----------------------------------------------------------------------
 #
@@ -73,7 +73,7 @@ mkdir_vrfy -p ${CYCLE_DIR}/RESTART
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSDIR/exregional_run_fv3.sh \
+$SCRIPTSDIR/exregional_run_fcst.sh \
   CYCLE_DIR="${CYCLE_DIR}" || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."

diff --git a/modulefiles/hera/get_extrn_ics b/modulefiles/hera/get_extrn_ics
@@ -0,0 +1,8 @@
+#%Module#####################################################
+## Module file for get_extrn_ics task.
+#############################################################
+
+module purge
+
+module load hpss
+
diff --git a/modulefiles/hera/get_extrn_lbcs b/modulefiles/hera/get_extrn_lbcs
@@ -0,0 +1,8 @@
+#%Module#####################################################
+## Module file for get_extrn_lbcs task.
+#############################################################
+
+module purge
+
+module load hpss
+
diff --git a/modulefiles/hera/make_grid b/modulefiles/hera/make_grid
@@ -0,0 +1,10 @@
+#%Module#####################################################
+## Module file for make_grid task.
+#############################################################
+
+module purge
+
+module load intel/18.0.5.274
+module load netcdf/4.7.0
+module load hdf5/1.10.5
+
diff --git a/modulefiles/hera/make_ics b/modulefiles/hera/make_ics
@@ -0,0 +1,23 @@
+#%Module#####################################################
+## Module file for make_ics task.
+#############################################################
+
+module purge
+
+module load intel/18.0.5.274
+module load impi/2018.0.4
+module load netcdf/4.6.1
+
+module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
+module load esmf/8.0.0bs21
+
+module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
+module load w3nco
+module load nemsio/2.2.3
+module load bacio
+module load sp
+module load sfcio
+module load sigio
+
+module load wgrib2 
+
diff --git a/modulefiles/hera/make_lbcs b/modulefiles/hera/make_lbcs
@@ -0,0 +1,23 @@
+#%Module#####################################################
+## Module file for make_lbcs task.
+#############################################################
+
+module purge
+
+module load intel/18.0.5.274
+module load impi/2018.0.4
+module load netcdf/4.6.1
+
+module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
+module load esmf/8.0.0bs21
+
+module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
+module load w3nco
+module load nemsio/2.2.3
+module load bacio
+module load sp
+module load sfcio
+module load sigio
+
+module load wgrib2
+
diff --git a/modulefiles/hera/make_orog b/modulefiles/hera/make_orog
@@ -0,0 +1,10 @@
+#%Module#####################################################
+## Module file for make_orog task.
+#############################################################
+
+module purge
+
+module load intel/18.0.5.274
+module load netcdf/4.7.0
+module load hdf5/1.10.4
+
diff --git a/modulefiles/hera/make_sfc_climo b/modulefiles/hera/make_sfc_climo
@@ -0,0 +1,15 @@
+#%Module#####################################################
+## Module file for make_sfc_climo task.
+#############################################################
+
+module purge
+
+module load intel/18.0.5.274
+module load impi/2018.0.4
+module load netcdf/4.6.1
+
+#NCEPLIBS=/scratch1/NCEPDEV/global/gwv/l819/lib
+#module use -a $NCEPLIBS/modulefiles
+module use -a /scratch1/NCEPDEV/global/gwv/l819/lib/modulefiles
+module load esmflocal/8_0_48b.netcdf47
+
diff --git a/modulefiles/hera/run_fcst_ccpp b/modulefiles/hera/run_fcst_ccpp
@@ -0,0 +1 @@
+../../sorc/NEMSfv3gfs/NEMS/src/conf/modules.nems
diff --git a/modulefiles/hera/run_fcst_no_ccpp b/modulefiles/hera/run_fcst_no_ccpp
@@ -0,0 +1,12 @@
+#%Module#####################################################
+## Module file for run_fcst task without CCPP.
+#############################################################
+
+module purge
+
+module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles    
+module load intel/18.0.5.274
+module load impi/2018.0.4
+module load netcdf/4.6.1
+module load pnetcdf/1.10.0
+
diff --git a/modulefiles/hera/run_post b/modulefiles/hera/run_post
@@ -0,0 +1,30 @@
+#%Module#####################################################
+## Module file for run_post task.
+#############################################################
+
+module purge
+
+module load intel/19.0.4.243
+module load impi/2019.0.4
+
+# Load nceplibs modules.
+module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
+
+module load sigio/2.1.1
+module load jasper/1.900.1
+module load png/1.2.44
+module load z/1.2.11
+module load sfcio/1.1.1
+module load nemsio/2.2.4
+module load bacio/2.0.3
+module load g2/3.1.1
+module load gfsio/1.1.0
+module load ip/3.0.2
+module load sp/2.0.3
+module load w3emc/2.3.1
+module load w3nco/2.0.7
+module load crtm/2.2.5
+module load netcdf/4.7.0
+module load g2tmpl/1.5.1
+module load wrfio/1.1.1
+
diff --git a/scripts/exregional_get_extrn_files.sh b/scripts/exregional_get_extrn_files.sh
@@ -252,16 +252,6 @@ will be copied (EXTRN_MDL_FILES_DIR) are:
 #
 #-----------------------------------------------------------------------
 #
-# Load necessary modules.
-#
-#-----------------------------------------------------------------------
-#
-  { save_shell_opts; set +x; } > /dev/null 2>&1
-  module load hpss
-  { restore_shell_opts; } > /dev/null 2>&1
-#
-#-----------------------------------------------------------------------
-#
 # Get the number of archive files to consider.
 #
 #-----------------------------------------------------------------------

diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh
@@ -132,50 +132,29 @@ case $MACHINE in
   ;;
 
 
-"THEIA")
-#
-  { save_shell_opts; set +x; } > /dev/null 2>&1
-
-  . /apps/lmod/lmod/init/sh
-  module purge
-  module load intel/16.1.150
-  module load impi
-  module load hdf5/1.8.14
-  module load netcdf/4.3.0
-  module list
-
-  { restore_shell_opts; } > /dev/null 2>&1
-
-  export APRUN="time"
-  export topo_dir="/scratch4/NCEPDEV/global/save/glopara/svn/fv3gfs/fix/fix_orog"
-
-  ulimit -s unlimited
-  ulimit -a
-  ;;
-
-
 "HERA")
 #
-  { save_shell_opts; set +x; } > /dev/null 2>&1
-
-  . /apps/lmod/lmod/init/sh
-  module purge
-  module load intel/18.0.5.274
-#  module load netcdf/4.6.1
-#  module load hdf5/1.10.4
-  module load netcdf/4.7.0
-  module load hdf5/1.10.5
-  module list
-
-  { restore_shell_opts; } > /dev/null 2>&1
-
-  export APRUN="time"
-  export topo_dir="/scratch1/NCEPDEV/global/glopara/fix/fix_orog"
-
-  ulimit -s unlimited
-  ulimit -a
+#  { save_shell_opts; set +x; } > /dev/null 2>&1
+#
+#  . /apps/lmod/lmod/init/sh
+#  module purge
+#  module load intel/18.0.5.274
+##  module load netcdf/4.6.1
+##  module load hdf5/1.10.4
+#  module load netcdf/4.7.0
+#  module load hdf5/1.10.5
+#  module list
+#
+#  { restore_shell_opts; } > /dev/null 2>&1
+#
+#  export APRUN="time"
+  APRUN="time"
+  topo_dir="/scratch1/NCEPDEV/global/glopara/fix/fix_orog"
+#
+#  ulimit -s unlimited
+#  ulimit -a
   ;;
-
+#
 
 "JET")
 #

diff --git a/scripts/exregional_make_ic_lbc0.sh → scripts/exregional_make_ics.sh b/scripts/exregional_make_ic_lbc0.sh → scripts/exregional_make_ics.sh
diff --git a/scripts/exregional_make_lbc1_to_lbcn.sh → scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbc1_to_lbcn.sh → scripts/exregional_make_lbcs.sh
diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh
@@ -179,23 +179,10 @@ case $MACHINE in
 
 
 "HERA")
-#
-  { save_shell_opts; set +x; } > /dev/null 2>&1
-
-  . /apps/lmod/lmod/init/sh
-  module purge
-  module load intel/18.0.5.274
-  module load netcdf/4.7.0
-  module load hdf5/1.10.4
-  module list
-
-  { restore_shell_opts; } > /dev/null 2>&1
-
-  export APRUN="time"
-  export topo_dir="/scratch1/NCEPDEV/global/glopara/fix/fix_orog"
-
   ulimit -s unlimited
   ulimit -a
+  export APRUN="time"
+  export topo_dir="/scratch1/NCEPDEV/global/glopara/fix/fix_orog"
   ;;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../sorc/NEMSfv3gfs/NEMS/src/conf/modules.nems