Spack-Stack 1.7.0 and Discover SLES15 Modules

src/jedi_bundle/__init__.py

@@ -9,4 +9,4 @@
 build_directory = os.path.dirname(__file__)
 
 # Set the version for jedi_bundle
-__version__ = '1.0.18'
+__version__ = '1.0.20'

src/jedi_bundle/config/bundles/build-order.yaml

@@ -13,7 +13,7 @@
 # Background error models
 - gsibec:
     repo_url_name: GSIbec
-    default_branch: 1.1.2
+    default_branch: 1.2.1
     tag: true
 - saber:
     default_branch: develop

src/jedi_bundle/config/config.py

@@ -42,6 +42,10 @@ def determine_platform(logger):
         # List of commands to check if this is the platform
         is_it_me = platform_dict['is_it_me']
 
+        # Flag to indicate whether to skip to the next platform, otherwise it
+        # is stuck at the last platform in the possible_platforms list
+        skip_to_next_platform = False
+
         # Loop over commands
         for is_it_me_command in is_it_me:
 
@@ -52,8 +56,13 @@ def determine_platform(logger):
 
             # If command_out is not in command_out_actual go to next platform
             if is_it_me_command['contains'] not in command_out.stdout:
+                skip_to_next_platform = True
                 break
 
+        # If the flag is set, skip to the next platform
+        if skip_to_next_platform:
+            continue
+
         # If we made it here all commands were successful for this platform
         return platform_dict['platform_name'], platform_dict['modules']['default_modules']
 

src/jedi_bundle/config/platforms/nccs_discover.yaml

@@ -4,7 +4,7 @@ is_it_me:
     contains: discover
   - command: 'cat /etc/os-release | grep VERSION='
     contains: '12-'
-crtm_coeffs_path: '/discover/nobackup/drholdaw/SwellStaticFiles/jedi/crtm_coefficients/'
+crtm_coeffs_path: '/discover/nobackup/projects/gmao/advda/SwellStaticFiles/jedi/crtm_coefficients/'
 crtm_coeffs_version: '2.4.0_skylab_3.0'
 modules:
   default_modules: intel
@@ -13,32 +13,32 @@ modules:
       - source /usr/share/lmod/lmod/init/bash
     load:
       - module purge
-      - module use /discover/swdev/jcsda/spack-stack/modulefiles
+      - module use /discover/swdev/gmao_SIteam/modulefiles-SLES12
+      - module use /discover/swdev/jcsda/spack-stack/scu16/modulefiles
       - module load miniconda/3.9.7
       - module load ecflow/5.8.4
-      - module load mysql/8.0.31
-      - module use /gpfsm/dswdev/jcsda/spack-stack/spack-stack-dev-20231114/envs/unified-env/install/modulefiles/Core
-      - module load stack-intel/2022.0.1
-      - module load stack-intel-oneapi-mpi/2021.5.0
-      - module load stack-python/3.10.8
+      - module use /gpfsm/dswdev/jcsda/spack-stack/scu16/spack-stack-1.7.0/envs/ue-intel-2021.6.0/install/modulefiles/Core
+      - module load stack-intel/2021.6.0
+      - module load stack-intel-oneapi-mpi/2021.6.0
+      - module load stack-python/3.10.13
       - module load jedi-fv3-env
       - module load soca-env
       - module load gmao-swell-env/1.0.0
       - module unload gsibec crtm
-    configure: -DMPIEXEC_EXECUTABLE="/usr/local/intel/oneapi/2021/mpi/2021.5.0/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-np"
+    configure: -DMPIEXEC_EXECUTABLE="/usr/local/intel/oneapi/2021/mpi/2021.6.0/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-np"
   gnu:
     init:
       - source /usr/share/lmod/lmod/init/bash
     load:
       - module purge
-      - module use /discover/swdev/jcsda/spack-stack/modulefiles
+      - module use /discover/swdev/gmao_SIteam/modulefiles-SLES12
+      - module use /discover/swdev/jcsda/spack-stack/scu16/modulefiles
       - module load miniconda/3.9.7
       - module load ecflow/5.8.4
-      - module load mysql/8.0.31
-      - module use /gpfsm/dswdev/jcsda/spack-stack/spack-stack-dev-20231114/envs/unified-env/install/modulefiles/Core
-      - module load stack-gcc/10.1.0
+      - module use /gpfsm/dswdev/jcsda/spack-stack/scu16/spack-stack-1.7.0/envs/ue-gcc-12.1.0/install/modulefiles/Core
+      - module load stack-gcc/12.1.0
       - module load stack-openmpi/4.1.3
-      - module load stack-python/3.10.8
+      - module load stack-python/3.10.13
       - module load jedi-fv3-env
       - module load soca-env
       - module load gmao-swell-env/1.0.0

src/jedi_bundle/config/platforms/nccs_discover_sles15.yaml

@@ -0,0 +1,44 @@
+platform_name: nccs_discover_sles15
+is_it_me:
+  - command: 'hostname'
+    contains: discover
+  - command: 'cat /etc/os-release | grep VERSION='
+    contains: '15-'
+crtm_coeffs_path: '/discover/nobackup/projects/gmao/advda/SwellStaticFiles/jedi/crtm_coefficients/'
+crtm_coeffs_version: '2.4.0_skylab_3.0'
+modules:
+  default_modules: intel
+  intel:
+    init:
+      - source /usr/share/lmod/lmod/init/bash
+    load:
+      - module purge
+      - module use /discover/swdev/gmao_SIteam/modulefiles-SLES15
+      - module use /discover/swdev/jcsda/spack-stack/scu17/modulefiles
+      - module load ecflow/5.11.4
+      - module use /gpfsm/dswdev/jcsda/spack-stack/scu17/spack-stack-1.7.0/envs/ue-intel-2021.10.0/install/modulefiles/Core
+      - module load stack-intel/2021.10.0
+      - module load stack-intel-oneapi-mpi/2021.10.0
+      - module load stack-python/3.10.13
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module load gmao-swell-env/1.0.0
+      - module unload gsibec crtm
+    configure: -DMPIEXEC_EXECUTABLE="/usr/local/intel/oneapi/2021/mpi/2021.10.0/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-np"
+  gnu:
+    init:
+      - source /usr/share/lmod/lmod/init/bash
+    load:
+      - module purge
+      - module use /discover/swdev/gmao_SIteam/modulefiles-SLES15
+      - module use /discover/swdev/jcsda/spack-stack/scu17/modulefiles
+      - module load ecflow/5.11.4
+      - module use /gpfsm/dswdev/jcsda/spack-stack/scu17/spack-stack-1.7.0/envs/ue-gcc-12.3.0/install/modulefiles/Core
+      - module load stack-gcc/12.3.0
+      - module load stack-openmpi/4.1.6
+      - module load stack-python/3.10.13
+      - module load jedi-fv3-env
+      - module load soca-env
+      - module load gmao-swell-env/1.0.0
+      - module unload gsibec crtm
+    configure: -DMPIEXEC_EXECUTABLE="/usr/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n"