Issue TACC#551: Fix output of spider level 2 output to not mix the de…

…scription and help from two different modulefiles

MF/settarg.version.lua

@@ -128,4 +128,7 @@ along with important modules like the compiler and mpi stack.
 Settarg can do more.  Please see the Lmod website for more details.
 ]]
 
+whatis([==[Description:
+The settarg module provides a way to connect the loaded modules with your build system by setting environment variables.
+]==])
 help(helpMsg)

README.new

@@ -4,9 +4,10 @@ Lmod 8.6+
 	      to search path
 	    * Issue #549: LMOD_AVAIL_STYLE can now be overridden in the lmod_config.lua file.
 	    * Issue #548: Fix dependency check to check both sn and fullname of loaded module.
-W.I.P:s
    (8.6.2)  * loading the settarg module  always set precmd and
               (PROMPT_COMMAND=precmd for bash).  Now use LMOD_SETTARG_FUNCTIONS=yes
               LMOD_SETTARG_IN_PROMPT=yes env. var conttrol.
+	    * Issue #551: Fix the output of level 2 spider output to not mix the description and help from
+	      different modulefiles
 
 

rt/settarg/err.txt

@@ -114,6 +114,9 @@ set_shell_function("precmd","             local tilde=\"~\";\
              ${USER_PROMPT_CMD:-:};\
       ","")
 pushenv("PROMPT_COMMAND","precmd")
+whatis("Description:
+The settarg module provides a way to connect the loaded modules with your build system by setting environment variables.
+")
 help([[The settarg module dynamically and automatically updates "$TARG" and a
 host of other environment variables. These new environment variables
 encapsulate the state of the modules loaded.

rt/spider/err.txt

@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.5.28  2021-12-01 12:20 -06:00
+Modules based on Lua: Version 8.6.1  2021-12-10 14:46 -06:00
     by Robert McLay [email protected]
 ===========================
 step 2
@@ -822,3 +822,63 @@ Currently Loaded Modules:
   1) GROMACS/.2016.x-drude-20180214-g3f7439a (H)
   Where:
    H:  Hidden Module
+===========================
+step 66
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  gcc: gcc/10.1
+  GROMACS: GROMACS/2018, GROMACS/2019
+    GROMACS(CPU/2018) is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles. This is a CPU enabled build, containing both MPI and threadMPI binaries for 2018.
+  zuda: zuda/10.1
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 67
+runSpiderCmd -o spiderT ProjectDIR/rt/spider/mf2/Core
+===========================
+===========================
+step 68
+runSpiderCmd -o dbT ProjectDIR/rt/spider/mf2/Core
+===========================
+===========================
+step 69
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider GROMACS/2018
+===========================
+  GROMACS: GROMACS/2018
+    Description:
+      GROMACS(CPU/2018) is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles. This is a CPU enabled build, containing both MPI and threadMPI binaries for 2018.
+    You will need to load all module(s) on any one of the lines below before the "GROMACS/2018" module is available to load.
+      gcc/10.1
+    Help:
+      HELP Description
+      ================
+      GROMACS(CPU/2018) is a versatile package to perform molecular dynamics,
+       i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.
+      This is a CPU enabled build, containing both MPI and threadMPI binaries for 2018.
+      More information
+      ================
+       - Homepage: http://www.gromacs.org
+===========================
+step 70
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider GROMACS/2019
+===========================
+  GROMACS: GROMACS/2019
+    Description:
+      GROMACS(CPU/2019) is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles. This is a CPU enabled build, containing both MPI and threadMPI binaries for 2019.
+    You will need to load all module(s) on any one of the lines below before the "GROMACS/2019" module is available to load.
+      gcc/10.1
+      zuda/10.1
+    Help:
+      HELP Description
+      ================
+      GROMACS(CPU/2019) is a versatile package to perform molecular dynamics,
+       i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.
+      This is a CPU enabled build, containing both MPI and threadMPI binaries for 2019.
+      More information
+      ================
+       - Homepage: http://www.gromacs.org

rt/spider/mf2/Compiler/gcc/10/GROMACS/2018.lua

@@ -0,0 +1,21 @@
+help([==[
+
+HELP Description
+================
+GROMACS(CPU/2018) is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.
+
+This is a CPU enabled build, containing both MPI and threadMPI binaries for 2018.
+
+
+More information
+================
+ - Homepage: http://www.gromacs.org
+]==])
+
+whatis([==[Description: 
+GROMACS(CPU/2018) is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.
+
+This is a CPU enabled build, containing both MPI and threadMPI binaries for 2018.
+]==])

rt/spider/mf2/Compiler/gcc/10/GROMACS/2019.lua

@@ -0,0 +1,21 @@
+help([==[
+
+HELP Description
+================
+GROMACS(CPU/2019) is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.
+
+This is a CPU enabled build, containing both MPI and threadMPI binaries for 2019.
+
+
+More information
+================
+ - Homepage: http://www.gromacs.org
+]==])
+
+whatis([==[Description: 
+GROMACS(CPU/2019) is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.
+
+This is a CPU enabled build, containing both MPI and threadMPI binaries for 2019.
+]==])

rt/spider/mf2/Compiler/zuda/10/GROMACS/2019.lua

@@ -0,0 +1,21 @@
+help([==[
+
+HELP Description
+================
+GROMACS(GPU/2019) is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.
+
+This is a GPU only build, containing both MPI and threadMPI builds for 2019.
+
+
+More information
+================
+ - Homepage: http://www.gromacs.org
+]==])
+
+whatis([==[Description: 
+GROMACS(GPU/2019) is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.
+
+This is a GPU only build, containing both MPI and threadMPI builds for 2019.
+]==])

rt/spider/mf2/Core/gcc/10.1.lua

@@ -0,0 +1,2 @@
+local modulepath_root = os.getenv("MODULEPATH_ROOT2")
+prepend_path("MODULEPATH",pathJoin(modulepath_root,"Compiler/gcc/10"))

rt/spider/mf2/Core/zuda/10.1.lua

@@ -0,0 +1,2 @@
+local modulepath_root = os.getenv("MODULEPATH_ROOT2")
+prepend_path("MODULEPATH",pathJoin(modulepath_root,"Compiler/zuda/10"))