Updates for container option: generalized wflow_*.lua, updated wflow_<platform>.lua, removed container_<platoform>.yaml templates

Author: Natalie Perlin

doc/UsersGuide/BuildingRunningTesting/ContainerQuickstart.rst

@@ -15,17 +15,17 @@ consistent workflows across different systems and cloud platforms.
 This section distinguishes the following container workflows:
 
 * **Intel-based pre-built SRW runtime container workflow:** 
-  This workflow uses a container that includes a pre-built SRW App v3.0
+  this workflow uses a container that includes a pre-built SRW App v3.0
   executable and its runtime environment. The pre-built application is staged
   from the container and then used to run the community test case.
 
 * **Containerized software-stack workflow for building and running the SRW App:** 
-  This workflow uses a container that provides the software stack needed to
+  this workflow uses a container that provides the software stack needed to
   build and run the UFS SRW App from source. The first step depends on the
   container option being used. Users may use a staged GNU-based or Intel-based
   software-stack container available on Tier 1 NOAA RDHPC platforms, or they may
   build a GNU-based or Intel-capable Singularity/Apptainer image from Docker
-  Hub on another supported system. After the container is available, the
+  Hub on non-supported systems. After the container is available, the
   remaining steps are the same for all of these options: clone the SRW App
   source code, build the application using the containerized software stack, and
   run the community test case.
@@ -129,7 +129,7 @@ binary-compatible MPI implementation on the host system.
 
 * The **Intel-based container** requires Intel compilers and Intel MPI (or the
   Intel oneAPI toolkit).
-* The **GNU-based container** may need GNU compilers (GCC 12+ recommended), an
+* The **GNU-based container** may need GNU compilers (GCC 12+ recommended), a
   binary-level-compatible version of MPI library, or MPI initialization tool 
   (e.g., host system OpenMPI or Slurm-based PMI/PMIx plugin).
 
@@ -833,4 +833,4 @@ After allocation:
 
    ssh <hostname>
 
-Larger experiments may require multiple compute nodes.
+Larger experiments may require multiple compute nodes.

modulefiles/build_gaeac6_intel.lua

@@ -28,6 +28,7 @@ load(pathJoin("nco", os.getenv("nco_ver") or "5.2.4"))
 load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
 
 setenv("LD_PRELOAD", "/usr/lib64/libstdc++.so.6")
+pushenv("MKLROOT", "/opt/intel/oneapi/mkl/2023.2.0/")
 
 unload("darshan-runtime")
 

modulefiles/wflow_container_derecho_gnu.lua

@@ -14,8 +14,6 @@ load("conda")
 
 
 if mode() == "load" then
-   LmodMsgRaw([===[Please do the following to activate conda:
-       > conda activate srw_app
-]===])
+   execute{cmd="conda activate srw_app", modeA={"load"}}
 end
 

modulefiles/wflow_container_gaeac6.lua

@@ -10,10 +10,6 @@ prepend_path("MODULEPATH","/ncrc/proj/epic/c6/modulefiles/")
 load("rocoto/1.3.7")
 load("conda")
 
-pushenv("MKLROOT", "/opt/intel/oneapi/mkl/2023.2.0/")
-
 if mode() == "load" then
-   LmodMsgRaw([===[Please do the following to activate conda:
-       > conda activate srw_app
-]===])
+   execute{cmd="conda activate srw_app", modeA={"load"}}
 end