From 7644e9a14ac1f134156931f449b0408828e6d3b0 Mon Sep 17 00:00:00 2001
From: BenjaminBlake-NOAA
 <52074832+BenjaminBlake-NOAA@users.noreply.github.com>
Date: Thu, 25 Jun 2020 12:21:42 -0400
Subject: [PATCH] WCOSS mods to maintain functionality (#239)

Co-authored-by: Benjamin.Blake EMC <Benjamin.Blake@m71a3.ncep.noaa.gov>
---
 .../tasks/wcoss_cray/make_ics.hardcoded       | 66 -----------------
 modulefiles/tasks/wcoss_cray/make_ics.local   | 33 +++++++++
 .../tasks/wcoss_cray/make_lbcs.hardcoded      | 66 -----------------
 modulefiles/tasks/wcoss_cray/make_lbcs.local  | 33 +++++++++
 .../tasks/wcoss_cray/run_fcst.hardcoded       | 71 -------------------
 .../tasks/wcoss_cray/run_post.hardcoded       | 65 -----------------
 modulefiles/tasks/wcoss_cray/run_post.local   | 13 ++++
 .../tasks/wcoss_dell_p3/make_ics.hardcoded    | 42 -----------
 .../tasks/wcoss_dell_p3/make_ics.local        |  2 +
 .../tasks/wcoss_dell_p3/make_lbcs.hardcoded   | 42 -----------
 .../tasks/wcoss_dell_p3/make_lbcs.local       |  2 +
 .../tasks/wcoss_dell_p3/run_fcst.hardcoded    | 57 ---------------
 .../tasks/wcoss_dell_p3/run_post.hardcoded    | 48 -------------
 .../tasks/wcoss_dell_p3/run_post.local        |  1 +
 ush/generate_FV3SAR_wflow.sh                  | 16 ++++-
 ush/set_extrn_mdl_params.sh                   | 24 +++++--
 16 files changed, 117 insertions(+), 464 deletions(-)
 delete mode 100644 modulefiles/tasks/wcoss_cray/make_ics.hardcoded
 create mode 100644 modulefiles/tasks/wcoss_cray/make_ics.local
 delete mode 100644 modulefiles/tasks/wcoss_cray/make_lbcs.hardcoded
 create mode 100644 modulefiles/tasks/wcoss_cray/make_lbcs.local
 delete mode 100644 modulefiles/tasks/wcoss_cray/run_fcst.hardcoded
 delete mode 100644 modulefiles/tasks/wcoss_cray/run_post.hardcoded
 create mode 100644 modulefiles/tasks/wcoss_cray/run_post.local
 delete mode 100644 modulefiles/tasks/wcoss_dell_p3/make_ics.hardcoded
 create mode 100644 modulefiles/tasks/wcoss_dell_p3/make_ics.local
 delete mode 100644 modulefiles/tasks/wcoss_dell_p3/make_lbcs.hardcoded
 create mode 100644 modulefiles/tasks/wcoss_dell_p3/make_lbcs.local
 delete mode 100644 modulefiles/tasks/wcoss_dell_p3/run_fcst.hardcoded
 delete mode 100644 modulefiles/tasks/wcoss_dell_p3/run_post.hardcoded
 create mode 100644 modulefiles/tasks/wcoss_dell_p3/run_post.local

diff --git a/modulefiles/tasks/wcoss_cray/make_ics.hardcoded b/modulefiles/tasks/wcoss_cray/make_ics.hardcoded
deleted file mode 100644
index d876193022..0000000000
--- a/modulefiles/tasks/wcoss_cray/make_ics.hardcoded
+++ /dev/null
@@ -1,66 +0,0 @@
-#%Module#####################################################
-## module for WCOSS-Cray
-#############################################################
-
-# From default environment
-
-module load modules
-
-module load xt-lsfhpc
-module load ncep
-module load alps
-module load dvs
-module load xpmem
-module load ugni
-module load craype-network-aries
-module load switch
-module load PrgEnv-intel
-module load craype
-module load rca
-module load gni-headers
-module load udreg
-module load hpss
-
-module load prod_util
-module load g2tmpl-intel/1.4.0
-module load crtm-intel/2.2.6
-module load iobuf/2.0.7
-module load gempak/7.3.0
-
-module load nco-gnu-sandybridge/4.4.4
-module load NetCDF-intel-sandybridge/4.2
-module load cfp-intel-sandybridge/1.1.0
-export USE_CFP=YES
-
-module load grib_util/1.1.0
-
-module use -a /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
-module unload intel
-module load intel/16.3.210
-module load cray-netcdf
-module load esmf/8.0.0
-
-
-# chgres cube specific modules
-
-module load cray-mpich/7.2.0
-module load craype-haswell
-module load cray-hdf5/1.8.14
-module load w3nco-intel/2.0.6
-module load nemsio-intel/2.2.3
-module load bacio-intel/2.0.2
-module load sp-intel/2.0.2
-module load sigio-intel/2.1.0
-module load sfcio-intel/1.0.0
-module load python/3.6.3
-# Note some Python modules are needed that are currently missing
-
-module rm gcc
-module load gcc/4.9.2
-
-
-export WGRIB2API_INC=/gpfs/hps3/emc/global/noscrub/George.Gayno/wgrib2/include
-export WGRIB2_LIB=/gpfs/hps3/emc/global/noscrub/George.Gayno/wgrib2/lib/libwgrib2.a
-
-export FCOMP=ftn
-export FFLAGS="-O3 -fp-model precise -g -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
diff --git a/modulefiles/tasks/wcoss_cray/make_ics.local b/modulefiles/tasks/wcoss_cray/make_ics.local
new file mode 100644
index 0000000000..4bebfc5e74
--- /dev/null
+++ b/modulefiles/tasks/wcoss_cray/make_ics.local
@@ -0,0 +1,33 @@
+module load modules
+
+module load xt-lsfhpc
+module load ncep
+module load alps
+module load dvs
+module load xpmem
+module load ugni
+module load craype-network-aries
+module load switch
+module load rca
+module load gni-headers
+module load udreg
+module load hpss
+
+module load prod_util
+module load g2tmpl-intel/1.4.0
+module load crtm-intel/2.2.6
+module load iobuf/2.0.7
+module load gempak/7.3.0
+
+module load nco-gnu-sandybridge/4.4.4
+module load NetCDF-intel-sandybridge/4.2
+module load cfp-intel-sandybridge/1.1.0
+export USE_CFP=YES
+
+module load grib_util/1.1.0
+
+module use -a /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
+module load esmf/8.0.0
+
+module load python/3.6.3
+
diff --git a/modulefiles/tasks/wcoss_cray/make_lbcs.hardcoded b/modulefiles/tasks/wcoss_cray/make_lbcs.hardcoded
deleted file mode 100644
index d876193022..0000000000
--- a/modulefiles/tasks/wcoss_cray/make_lbcs.hardcoded
+++ /dev/null
@@ -1,66 +0,0 @@
-#%Module#####################################################
-## module for WCOSS-Cray
-#############################################################
-
-# From default environment
-
-module load modules
-
-module load xt-lsfhpc
-module load ncep
-module load alps
-module load dvs
-module load xpmem
-module load ugni
-module load craype-network-aries
-module load switch
-module load PrgEnv-intel
-module load craype
-module load rca
-module load gni-headers
-module load udreg
-module load hpss
-
-module load prod_util
-module load g2tmpl-intel/1.4.0
-module load crtm-intel/2.2.6
-module load iobuf/2.0.7
-module load gempak/7.3.0
-
-module load nco-gnu-sandybridge/4.4.4
-module load NetCDF-intel-sandybridge/4.2
-module load cfp-intel-sandybridge/1.1.0
-export USE_CFP=YES
-
-module load grib_util/1.1.0
-
-module use -a /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
-module unload intel
-module load intel/16.3.210
-module load cray-netcdf
-module load esmf/8.0.0
-
-
-# chgres cube specific modules
-
-module load cray-mpich/7.2.0
-module load craype-haswell
-module load cray-hdf5/1.8.14
-module load w3nco-intel/2.0.6
-module load nemsio-intel/2.2.3
-module load bacio-intel/2.0.2
-module load sp-intel/2.0.2
-module load sigio-intel/2.1.0
-module load sfcio-intel/1.0.0
-module load python/3.6.3
-# Note some Python modules are needed that are currently missing
-
-module rm gcc
-module load gcc/4.9.2
-
-
-export WGRIB2API_INC=/gpfs/hps3/emc/global/noscrub/George.Gayno/wgrib2/include
-export WGRIB2_LIB=/gpfs/hps3/emc/global/noscrub/George.Gayno/wgrib2/lib/libwgrib2.a
-
-export FCOMP=ftn
-export FFLAGS="-O3 -fp-model precise -g -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
diff --git a/modulefiles/tasks/wcoss_cray/make_lbcs.local b/modulefiles/tasks/wcoss_cray/make_lbcs.local
new file mode 100644
index 0000000000..4bebfc5e74
--- /dev/null
+++ b/modulefiles/tasks/wcoss_cray/make_lbcs.local
@@ -0,0 +1,33 @@
+module load modules
+
+module load xt-lsfhpc
+module load ncep
+module load alps
+module load dvs
+module load xpmem
+module load ugni
+module load craype-network-aries
+module load switch
+module load rca
+module load gni-headers
+module load udreg
+module load hpss
+
+module load prod_util
+module load g2tmpl-intel/1.4.0
+module load crtm-intel/2.2.6
+module load iobuf/2.0.7
+module load gempak/7.3.0
+
+module load nco-gnu-sandybridge/4.4.4
+module load NetCDF-intel-sandybridge/4.2
+module load cfp-intel-sandybridge/1.1.0
+export USE_CFP=YES
+
+module load grib_util/1.1.0
+
+module use -a /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
+module load esmf/8.0.0
+
+module load python/3.6.3
+
diff --git a/modulefiles/tasks/wcoss_cray/run_fcst.hardcoded b/modulefiles/tasks/wcoss_cray/run_fcst.hardcoded
deleted file mode 100644
index 9d52481159..0000000000
--- a/modulefiles/tasks/wcoss_cray/run_fcst.hardcoded
+++ /dev/null
@@ -1,71 +0,0 @@
-#%Module######################################################################
-##
-##    NEMS FV3 Prerequisites: Surge and Luna (WCOSS Cray)
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on the Cray side of WCOSS"
-}
-
-module-whatis "loads NEMS FV3 prerequisites on Surge and Luna"
-
-# NOTE: the "module purge" and loading of the module command are
-# handled by the module-setup.sh (or .csh) script.
-
-##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
-module load PrgEnv-intel
-module rm intel
-module load intel/18.1.163
-module load NetCDF-intel-sandybridge/4.2
-module load cray-hdf5/1.8.14
-module load xt-lsfhpc/9.1.3
-module load craype-haswell
-module load python/2.7.14
-module load cmake/3.6.2
-#
-## WCOSS cray for WW3
-module load gcc/4.9.2
-module load jasper-gnu-sandybridge/1.900.1
-module load png-intel-sandybridge/1.2.49
-module load zlib-intel-sandybridge/1.2.7
-module load crtm-intel/2.2.6
-
-module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/modulefiles
-module load g2/3.1.1
-module load g2tmpl/1.6.0
-##
-## load ncelibs libraries
-##
-module load bacio/2.0.3
-module load ip/3.0.2
-module load sp/2.0.3
-module load w3nco/2.0.7
-module load w3emc/2.3.1
-module load nemsio/2.2.4
-
-#post lib
-module load post/8.0.1
-
-## WCOSS Cray execution prereqs:
-module load rca
-module load alps
-module load xpmem
-module load gni-headers
-module load udreg
-module load ugni
-
-module use /gpfs/hps3/emc/meso/noscrub/Matthew.Pyle/regional_workflow_ccpp/modulefiles
-module load esmf/8.0.0
-
-module swap pmi pmi/5.0.11
-
-##
-## load cmake
-##
-module load cmake/3.6.2
-setenv CMAKE_C_COMPILER cc
-setenv CMAKE_CXX_COMPILER CC
-setenv CMAKE_Fortran_COMPILER ftn
-setenv CMAKE_Platform wcoss_cray
diff --git a/modulefiles/tasks/wcoss_cray/run_post.hardcoded b/modulefiles/tasks/wcoss_cray/run_post.hardcoded
deleted file mode 100644
index 3bd5ee2fdf..0000000000
--- a/modulefiles/tasks/wcoss_cray/run_post.hardcoded
+++ /dev/null
@@ -1,65 +0,0 @@
-#%Module#####################################################
-## module for WCOSS-Cray
-#############################################################
-
-# From default environment
-
-module load modules
-
-module load xt-lsfhpc
-module load ncep
-module load alps
-module load dvs
-module load xpmem
-module load ugni
-module load craype-network-aries
-module load switch
-module load PrgEnv-intel
-module load craype
-module load rca
-module load gni-headers
-module load udreg
-module load hpss
-
-module load prod_util
-module load g2tmpl-intel/1.4.0
-module load crtm-intel/2.2.5
-module load iobuf/2.0.7
-module load gempak/7.3.0
-
-module load nco-gnu-sandybridge/4.4.4
-module load NetCDF-intel-sandybridge/4.2
-module load cfp-intel-sandybridge/1.1.0
-setenv USE_CFP YES
-
-module load grib_util/1.1.0
-
-module use -a /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
-module unload intel
-module load intel/15.0.3.187
-module load cray-netcdf
-module load esmf/8.0.0
-
-
-# post specific modules
-
-module load cray-mpich/7.2.0
-module load cray-libsci
-module load pmi
-module load dmapp/7.0.1-1.0502.10246.8.47.ari
-module load atp
-
-module load HDF5-serial-intel-haswell/1.8.9
-
-module load jasper-gnu-haswell/1.900.1
-module load png-intel-haswell/1.2.49
-module load zlib-intel-haswell/1.2.7
-module load bacio-intel/2.0.1
-module load w3emc-intel/2.2.0
-module load w3nco-intel/2.0.6
-module load sigio-intel/2.1.0
-module load sp-intel/2.0.2
-module load nemsio-intel/2.2.2
-module load nemsiogfs-intel/2.0.1
-module load g2-intel/2.5.0
-
diff --git a/modulefiles/tasks/wcoss_cray/run_post.local b/modulefiles/tasks/wcoss_cray/run_post.local
new file mode 100644
index 0000000000..67653c3b34
--- /dev/null
+++ b/modulefiles/tasks/wcoss_cray/run_post.local
@@ -0,0 +1,13 @@
+module load modules
+
+module load xt-lsfhpc
+module load ncep
+module load alps
+module load dvs
+module load xpmem
+module load ugni
+module load craype-network-aries
+module load switch
+module load rca
+module load gni-headers
+module load udreg
diff --git a/modulefiles/tasks/wcoss_dell_p3/make_ics.hardcoded b/modulefiles/tasks/wcoss_dell_p3/make_ics.hardcoded
deleted file mode 100644
index 49dc46c043..0000000000
--- a/modulefiles/tasks/wcoss_dell_p3/make_ics.hardcoded
+++ /dev/null
@@ -1,42 +0,0 @@
-#%Module######################################################################
-## module for WCOSS-Dell
-##############################################################################
-
-# From default environment
-
-module load ips/18.0.1.163
-module load impi/18.0.1    
-module load lsf/10.1       
-module load EnvVars/1.0.2
-
-module load HPSS/5.0.2.5
-module load prod_util/1.1.0
-module load prod_envir/1.1.0
-module load g2tmpl/1.5.0       
-module load crtm/2.2.6
-module load grib_util/1.1.0
-
-module load NCO/4.7.0   
-module load HDF5-serial/1.10.1
-module load NetCDF/4.5.0
-module load CFP/2.0.1
-export USE_CFP=YES
-
-module use -a /gpfs/dell1/nco/ops/nwprod/modulefiles/
-module load gempak/7.3.1
-
-
-# chgres cube specific modules
-export ESMFMKFILE=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/esmf_lib/8_0_0bs20/lib/libO/Linux.intel.64.intelmpi.default/esmf.mk
-module load w3nco/2.0.6
-module load sp/2.0.2
-module load nemsio/2.2.3
-module load bacio/2.0.2
-module load sfcio/1.0.0
-module load sigio/2.1.0
-module load python/3.6.3
-# Note some Python modules are needed that are currently missing
-
-export FCOMP=mpif90
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
-
diff --git a/modulefiles/tasks/wcoss_dell_p3/make_ics.local b/modulefiles/tasks/wcoss_dell_p3/make_ics.local
new file mode 100644
index 0000000000..b93479d8c9
--- /dev/null
+++ b/modulefiles/tasks/wcoss_dell_p3/make_ics.local
@@ -0,0 +1,2 @@
+module load lsf/10.1
+module load python/3.6.3
diff --git a/modulefiles/tasks/wcoss_dell_p3/make_lbcs.hardcoded b/modulefiles/tasks/wcoss_dell_p3/make_lbcs.hardcoded
deleted file mode 100644
index 49dc46c043..0000000000
--- a/modulefiles/tasks/wcoss_dell_p3/make_lbcs.hardcoded
+++ /dev/null
@@ -1,42 +0,0 @@
-#%Module######################################################################
-## module for WCOSS-Dell
-##############################################################################
-
-# From default environment
-
-module load ips/18.0.1.163
-module load impi/18.0.1    
-module load lsf/10.1       
-module load EnvVars/1.0.2
-
-module load HPSS/5.0.2.5
-module load prod_util/1.1.0
-module load prod_envir/1.1.0
-module load g2tmpl/1.5.0       
-module load crtm/2.2.6
-module load grib_util/1.1.0
-
-module load NCO/4.7.0   
-module load HDF5-serial/1.10.1
-module load NetCDF/4.5.0
-module load CFP/2.0.1
-export USE_CFP=YES
-
-module use -a /gpfs/dell1/nco/ops/nwprod/modulefiles/
-module load gempak/7.3.1
-
-
-# chgres cube specific modules
-export ESMFMKFILE=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/esmf_lib/8_0_0bs20/lib/libO/Linux.intel.64.intelmpi.default/esmf.mk
-module load w3nco/2.0.6
-module load sp/2.0.2
-module load nemsio/2.2.3
-module load bacio/2.0.2
-module load sfcio/1.0.0
-module load sigio/2.1.0
-module load python/3.6.3
-# Note some Python modules are needed that are currently missing
-
-export FCOMP=mpif90
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
-
diff --git a/modulefiles/tasks/wcoss_dell_p3/make_lbcs.local b/modulefiles/tasks/wcoss_dell_p3/make_lbcs.local
new file mode 100644
index 0000000000..b93479d8c9
--- /dev/null
+++ b/modulefiles/tasks/wcoss_dell_p3/make_lbcs.local
@@ -0,0 +1,2 @@
+module load lsf/10.1
+module load python/3.6.3
diff --git a/modulefiles/tasks/wcoss_dell_p3/run_fcst.hardcoded b/modulefiles/tasks/wcoss_dell_p3/run_fcst.hardcoded
deleted file mode 100644
index 37e7b4c837..0000000000
--- a/modulefiles/tasks/wcoss_dell_p3/run_fcst.hardcoded
+++ /dev/null
@@ -1,57 +0,0 @@
-#%Module######################################################################
-##
-##    NEMS FV3 Prerequisites: Venus and Mars (WCOSS Dell)
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on the Dell side of WCOSS"
-}
-
-module-whatis "loads NEMS FV3 prerequisites on Venus and Mars"
-
-# NOTE: the "module purge" and loading of the module command are
-# handled by the module-setup.sh (or .csh) script.
-
-##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
-module load ips/18.0.1.163
-module load impi/18.0.1
-module load lsf/10.1
-module load cmake/3.10.0
-module load lsf/10.1
-
-module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
-
-# other nceplibs
-module load bacio/2.0.3
-module load ip/3.0.2
-module load sp/2.0.3
-module load w3nco/2.0.7
-module load w3emc/2.3.1
-module load nemsio/2.2.4
-module load g2/3.1.1
-module load g2tmpl/1.6.0
-module load crtm/2.2.6
-
-# WW3 grib encoding
-module load jasper/1.900.29
-module load libpng/1.2.59
-module load zlib/1.2.11
-
-# load post lib
-module load post/8.0.5
-
-module use /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/soft/modulefiles
-module load hdf5_parallel/1.10.6
-module load netcdf_parallel/4.7.4  
-module load esmf/8.0.0_ParallelNetCDF
-
-##
-## load cmake
-##
-module load cmake/3.10.0
-setenv CMAKE_C_COMPILER mpiicc
-setenv CMAKE_CXX_COMPILER mpiicpc
-setenv CMAKE_Fortran_COMPILER mpiifort
-setenv CMAKE_Platform wcoss_dell_p3
diff --git a/modulefiles/tasks/wcoss_dell_p3/run_post.hardcoded b/modulefiles/tasks/wcoss_dell_p3/run_post.hardcoded
deleted file mode 100644
index e8612708c6..0000000000
--- a/modulefiles/tasks/wcoss_dell_p3/run_post.hardcoded
+++ /dev/null
@@ -1,48 +0,0 @@
-#%Module######################################################################
-## module for WCOSS-Dell
-##############################################################################
-
-# From default environment
-
-module load ips/18.0.1.163
-module load impi/18.0.1
-module load lsf/10.1
-module load EnvVars/1.0.2
-
-module load HPSS/5.0.2.5
-module load prod_util/1.1.0
-module load prod_envir/1.1.0
-module load g2tmpl/1.5.0
-#module load crtm/2.2.6
-module load grib_util/1.1.0
-
-module load NCO/4.7.0
-module load HDF5-serial/1.10.1
-module load NetCDF/4.5.0
-module load CFP/2.0.1
-setenv USE_CFP YES
-
-module use -a /gpfs/dell1/nco/ops/nwprod/modulefiles/
-module load gempak/7.3.1
-
-
-# post specific modules
-
-module load jasper/1.900.1                    
-module load libpng/1.2.59
-module load zlib/1.2.11 
-module load sfcio/1.0.0
-module load nemsio/2.2.3 
-
-module load sigio/2.1.0
-module load bacio/2.0.2
-module load g2/3.1.0           
-module load gfsio/1.1.0            
-module load ip/3.0.1          
-module load sp/2.0.2        
-module load w3emc/2.3.0          
-module load w3nco/2.0.6
-module load wrfio/1.1.1
-module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
-module load crtm/2.3.0
-
diff --git a/modulefiles/tasks/wcoss_dell_p3/run_post.local b/modulefiles/tasks/wcoss_dell_p3/run_post.local
new file mode 100644
index 0000000000..ee955883da
--- /dev/null
+++ b/modulefiles/tasks/wcoss_dell_p3/run_post.local
@@ -0,0 +1 @@
+module load lsf/10.1
diff --git a/ush/generate_FV3SAR_wflow.sh b/ush/generate_FV3SAR_wflow.sh
index 33b1128bc2..7c003bf308 100755
--- a/ush/generate_FV3SAR_wflow.sh
+++ b/ush/generate_FV3SAR_wflow.sh
@@ -261,7 +261,11 @@ if [ -f ${modulefile_local} ]; then
   cat "${modulefile_local}" >> "${MAKE_LBCS_TN}"
 fi
 
-cp_vrfy "${UFS_WTHR_MDL_DIR}/modulefiles/$machine.intel/fv3" "${RUN_FCST_TN}"
+if [ $MACHINE = "WCOSS_CRAY" -o $MACHINE = "WCOSS_DELL_P3" ] ; then
+  cp_vrfy "${UFS_WTHR_MDL_DIR}/modulefiles/$machine/fv3" "${RUN_FCST_TN}"
+else
+  cp_vrfy "${UFS_WTHR_MDL_DIR}/modulefiles/$machine.intel/fv3" "${RUN_FCST_TN}"
+fi
 modulefile_local="${RUN_FCST_TN}.local"
 if [ -f ${modulefile_local} ]; then
   cat "${modulefile_local}" >> "${RUN_FCST_TN}"
@@ -277,6 +281,16 @@ case $MACHINE in
     print_info_msg "No post modulefile needed for $MACHINE"
     ;;
 
+  "WCOSS_CRAY")
+    cp_vrfy "${EMC_POST_DIR}/modulefiles/post/v8.0.0-cray-intel" \
+            "${RUN_POST_TN}"
+    modulefile_local="${RUN_POST_TN}.local"
+    if [ -f ${modulefile_local} ]; then
+      cat "${modulefile_local}" >> "${RUN_POST_TN}"
+    fi
+
+    ;;
+
   *)
     cp_vrfy "${EMC_POST_DIR}/modulefiles/post/v8.0.0-$machine" \
             "${RUN_POST_TN}"
diff --git a/ush/set_extrn_mdl_params.sh b/ush/set_extrn_mdl_params.sh
index e5b6ad2c98..5943fa1ee4 100644
--- a/ush/set_extrn_mdl_params.sh
+++ b/ush/set_extrn_mdl_params.sh
@@ -55,7 +55,10 @@ else
   
   "GSMGFS")
     case $MACHINE in
-    "WCOSS_C")
+    "WCOSS_CRAY")
+      EXTRN_MDL_FILES_SYSBASEDIR_ICS=""
+      ;;
+    "WCOSS_DELL_P3")
       EXTRN_MDL_FILES_SYSBASEDIR_ICS=""
       ;;
     "HERA")
@@ -84,8 +87,11 @@ this machine and external model combination:
   
   "FV3GFS")
     case $MACHINE in
-    "WCOSS_C")
-      EXTRN_MDL_FILES_SYSBASEDIR_ICS="/gpfs/hps/nco/ops/com/gfs/prod"
+    "WCOSS_CRAY")
+      EXTRN_MDL_FILES_SYSBASEDIR_ICS="/gpfs/dell1/nco/ops/com/gfs/prod"
+      ;;
+    "WCOSS_DELL_P3")
+      EXTRN_MDL_FILES_SYSBASEDIR_ICS="/gpfs/dell1/nco/ops/com/gfs/prod"
       ;;
     "HERA")
       EXTRN_MDL_FILES_SYSBASEDIR_ICS="/scratch1/NCEPDEV/rstprod/com/gfs/prod"
@@ -204,7 +210,10 @@ else
   
   "GSMGFS")
     case $MACHINE in
-    "WCOSS_C")
+    "WCOSS_CRAY")
+      EXTRN_MDL_FILES_SYSBASEDIR_LBCS=""
+      ;;
+    "WCOSS_DELL_P3")
       EXTRN_MDL_FILES_SYSBASEDIR_LBCS=""
       ;;
     "HERA")
@@ -234,8 +243,11 @@ this machine and external model combination:
   "FV3GFS")
   
     case $MACHINE in
-    "WCOSS_C")
-      EXTRN_MDL_FILES_SYSBASEDIR_LBCS="/gpfs/hps/nco/ops/com/gfs/prod"
+    "WCOSS_CRAY")
+      EXTRN_MDL_FILES_SYSBASEDIR_LBCS="/gpfs/dell1/nco/ops/com/gfs/prod"
+      ;;
+    "WCOSS_DELL_P3")
+      EXTRN_MDL_FILES_SYSBASEDIR_LBCS="/gpfs/dell1/nco/ops/com/gfs/prod"
       ;;
     "HERA")
       EXTRN_MDL_FILES_SYSBASEDIR_LBCS="/scratch1/NCEPDEV/rstprod/com/gfs/prod"