Update module loads for Alliance StdEnv/2023

SalishSeaCast · Mar 19, 2024 · 32c6dbe · 32c6dbe
1 parent 66e74a9
commit 32c6dbe
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/salishsea_cmd/run.py b/salishsea_cmd/run.py
@@ -944,14 +944,14 @@ def _modules():
     modules = {
         "beluga": textwrap.dedent(
             """\
-            module load StdEnv/2020
-            module load netcdf-fortran-mpi/4.6.0
+            module load StdEnv/2023
+            module load netcdf-fortran-mpi/4.6.1
             """
         ),
         "cedar": textwrap.dedent(
             """\
-            module load StdEnv/2020
-            module load netcdf-fortran-mpi/4.6.0
+            module load StdEnv/2023
+            module load netcdf-fortran-mpi/4.6.1
             """
         ),
         "delta": textwrap.dedent(
@@ -961,8 +961,8 @@ def _modules():
         ),
         "graham": textwrap.dedent(
             """\
-            module load StdEnv/2020
-            module load netcdf-fortran-mpi/4.6.0
+            module load StdEnv/2023
+            module load netcdf-fortran-mpi/4.6.1
             """
         ),
         "omega": textwrap.dedent(
@@ -1127,7 +1127,7 @@ def _execute(
             # variants
             script += textwrap.dedent(
                 """\
-                module load nco/4.9.5
+                module load nco/5.1.7
                 """
             )
         script += textwrap.dedent(

diff --git a/tests/test_run.py b/tests/test_run.py
@@ -1981,8 +1981,8 @@ def test_beluga(self, account, deflate):
             """\
             GATHER="${HOME}/.local/bin/salishsea gather"
 
-            module load StdEnv/2020
-            module load netcdf-fortran-mpi/4.6.0
+            module load StdEnv/2023
+            module load netcdf-fortran-mpi/4.6.1
 
             mkdir -p ${RESULTS_DIR}
             cd ${WORK_DIR}
@@ -2003,7 +2003,7 @@ def test_beluga(self, account, deflate):
                 """\
 
                 echo "Results deflation started at $(date)"
-                module load nco/4.9.5
+                module load nco/5.1.7
                 ${DEFLATE} *_ptrc_T*.nc *_prod_T*.nc *_carp_T*.nc *_grid_[TUVW]*.nc \\
                   *_turb_T*.nc *_dia[12n]_T*.nc FVCOM*.nc Slab_[UV]*.nc *_mtrc_T*.nc \\
                   --jobs 4 --debug
@@ -2087,8 +2087,8 @@ def test_cedar(self, cpu_arch, nodes, cores_per_node, mem, deflate):
             """\
             GATHER="${HOME}/.local/bin/salishsea gather"
 
-            module load StdEnv/2020
-            module load netcdf-fortran-mpi/4.6.0
+            module load StdEnv/2023
+            module load netcdf-fortran-mpi/4.6.1
 
             mkdir -p ${RESULTS_DIR}
             cd ${WORK_DIR}
@@ -2109,7 +2109,7 @@ def test_cedar(self, cpu_arch, nodes, cores_per_node, mem, deflate):
                 """\
 
                 echo "Results deflation started at $(date)"
-                module load nco/4.9.5
+                module load nco/5.1.7
                 ${DEFLATE} *_ptrc_T*.nc *_prod_T*.nc *_carp_T*.nc *_grid_[TUVW]*.nc \\
                   *_turb_T*.nc *_dia[12n]_T*.nc FVCOM*.nc Slab_[UV]*.nc *_mtrc_T*.nc \\
                   --jobs 4 --debug
@@ -2191,8 +2191,8 @@ def test_graham(self, account, deflate):
             """\
             GATHER="${HOME}/.local/bin/salishsea gather"
 
-            module load StdEnv/2020
-            module load netcdf-fortran-mpi/4.6.0
+            module load StdEnv/2023
+            module load netcdf-fortran-mpi/4.6.1
 
             mkdir -p ${RESULTS_DIR}
             cd ${WORK_DIR}
@@ -2213,7 +2213,7 @@ def test_graham(self, account, deflate):
                 """\
 
                 echo "Results deflation started at $(date)"
-                module load nco/4.9.5
+                module load nco/5.1.7
                 ${DEFLATE} *_ptrc_T*.nc *_prod_T*.nc *_carp_T*.nc *_grid_[TUVW]*.nc \\
                   *_turb_T*.nc *_dia[12n]_T*.nc FVCOM*.nc Slab_[UV]*.nc *_mtrc_T*.nc \\
                   --jobs 4 --debug
@@ -3144,8 +3144,8 @@ def test_beluga_cedar_graham(self, system):
             modules = salishsea_cmd.run._modules()
         expected = textwrap.dedent(
             """\
-            module load StdEnv/2020
-            module load netcdf-fortran-mpi/4.6.0
+            module load StdEnv/2023
+            module load netcdf-fortran-mpi/4.6.1
             """
         )
         assert modules == expected
@@ -3268,7 +3268,7 @@ def test_execute_with_deflate(self, system, mpirun_cmd):
         if system in {"beluga", "cedar", "graham"}:
             expected += textwrap.dedent(
                 """\
-                module load nco/4.9.5
+                module load nco/5.1.7
                 """
             )
         expected += textwrap.dedent(