Merge pull request #9 from smoors/system_modules

add system to modulepath

files/vsc.csh

@@ -2,22 +2,19 @@ eval `/usr/bin/vsc_env csh`
 
 setenv LMOD_SYSTEM_NAME "${VSC_INSTITUTE_CLUSTER}-${VSC_ARCH_LOCAL}${VSC_ARCH_SUFFIX}"
 
-setenv CLUSTER_MODULEPATH "/etc/modulefiles/vsc"
+set CLUSTER_MODULEPATH = "/etc/modulefiles/vsc"
 
 set modulesroot = "/apps/brussel/${VSC_OS_LOCAL}/${VSC_ARCH_LOCAL}${VSC_ARCH_SUFFIX}/modules"
 
-set i = 2019
-if ( -d  $modulesroot/${i}b/all ) then
-  setenv CLUSTER_MODULEPATH "$modulesroot/${i}b/all:${CLUSTER_MODULEPATH}"
-endif
+set CLUSTER_MODULEPATH = "$modulesroot/system/all:$CLUSTER_MODULEPATH"
 
-set i = 2020
-while ($i < 2025)
+set i = 2022
+while ($i <= 2027)
   if ( -d  $modulesroot/${i}a/all ) then
-    setenv CLUSTER_MODULEPATH "$modulesroot/${i}a/all:${CLUSTER_MODULEPATH}"
+    set CLUSTER_MODULEPATH = "$modulesroot/${i}a/all:${CLUSTER_MODULEPATH}"
   endif
   if ( -d  $modulesroot/${i}b/all ) then
-    setenv CLUSTER_MODULEPATH "$modulesroot/${i}b/all:${CLUSTER_MODULEPATH}"
+    set CLUSTER_MODULEPATH = "$modulesroot/${i}b/all:${CLUSTER_MODULEPATH}"
   endif
   @ i++
 end

files/vsc.sh

@@ -6,12 +6,9 @@ CLUSTER_MODULEPATH="/etc/modulefiles/vsc"
 
 modulesroot="/apps/brussel/${VSC_OS_LOCAL}/${VSC_ARCH_LOCAL}${VSC_ARCH_SUFFIX:-}/modules"
 
-i=2019
-if [ -d "$modulesroot/${i}b/all" ]; then
-  CLUSTER_MODULEPATH="$modulesroot/${i}b/all:$CLUSTER_MODULEPATH"
-fi
+CLUSTER_MODULEPATH="$modulesroot/system/all:$CLUSTER_MODULEPATH"
 
-for i in {2020..2025}; do
+for i in {2022..2027}; do
   if [ -d "$modulesroot/${i}a/all" ]; then
     CLUSTER_MODULEPATH="$modulesroot/${i}a/all:$CLUSTER_MODULEPATH"
   fi

vsc-profiles-brussel.spec

@@ -1,6 +1,6 @@
 Summary: brussel vsc profiles files
 Name: vsc-profiles-brussel
-Version: 1.41
+Version: 1.42
 Release: 1
 License: GPL
 Group: Applications/System
@@ -42,6 +42,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 25 2024 Samuel Moors <[email protected]>
+- Add system to MODULEPATH
 * Fri Oct 27 2023 Ward Poelmans <[email protected]>
 - Adjust scratch regex to also support rhea scratch
 * Fri Sep 29 2023 Alex Domingo <[email protected]>