From 1994cb6bf3b93431e755eba2f6fe2204ec9492db Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 26 Aug 2024 13:33:43 +0000 Subject: [PATCH] Combine spack version files Refs #33 --- versions/build.hera.ver | 2 +- versions/build.hercules.ver | 2 +- versions/build.jet.ver | 2 +- versions/build.orion.ver | 2 +- versions/run.hera.ver | 3 +-- versions/run.hercules.ver | 3 +-- versions/run.jet.ver | 3 +-- versions/run.orion.ver | 3 +-- versions/run.spack.ver | 20 -------------------- versions/{build.spack.ver => spack.ver} | 2 ++ 10 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 versions/run.spack.ver rename versions/{build.spack.ver => spack.ver} (87%) diff --git a/versions/build.hera.ver b/versions/build.hera.ver index 77d307e..2c9fbc3 100644 --- a/versions/build.hera.ver +++ b/versions/build.hera.ver @@ -1,3 +1,3 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 -source "${HOMEprepobs:-}/versions/build.spack.ver" +source "${HOMEprepobs:-}/versions/spack.ver" diff --git a/versions/build.hercules.ver b/versions/build.hercules.ver index 3bfc838..3083ded 100644 --- a/versions/build.hercules.ver +++ b/versions/build.hercules.ver @@ -1,3 +1,3 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 -source "${HOMEprepobs:-}/versions/build.spack.ver" +source "${HOMEprepobs:-}/versions/spack.ver" diff --git a/versions/build.jet.ver b/versions/build.jet.ver index 77d307e..2c9fbc3 100644 --- a/versions/build.jet.ver +++ b/versions/build.jet.ver @@ -1,3 +1,3 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 -source "${HOMEprepobs:-}/versions/build.spack.ver" +source "${HOMEprepobs:-}/versions/spack.ver" diff --git a/versions/build.orion.ver b/versions/build.orion.ver index 3bfc838..3083ded 100644 --- a/versions/build.orion.ver +++ b/versions/build.orion.ver @@ -1,3 +1,3 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 -source "${HOMEprepobs:-}/versions/build.spack.ver" +source "${HOMEprepobs:-}/versions/spack.ver" diff --git a/versions/run.hera.ver b/versions/run.hera.ver index 8cea5aa..2c9fbc3 100644 --- a/versions/run.hera.ver +++ b/versions/run.hera.ver @@ -1,4 +1,3 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 - -source "${HOMEprepobs:-}/versions/run.spack.ver" +source "${HOMEprepobs:-}/versions/spack.ver" diff --git a/versions/run.hercules.ver b/versions/run.hercules.ver index 0131f75..6e872f4 100644 --- a/versions/run.hercules.ver +++ b/versions/run.hercules.ver @@ -1,5 +1,4 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 export intel_mkl_ver=2023.1.0 - -source "${HOMEprepobs:-}/versions/run.spack.ver" +source "${HOMEprepobs:-}/versions/spack.ver" diff --git a/versions/run.jet.ver b/versions/run.jet.ver index 8cea5aa..2c9fbc3 100644 --- a/versions/run.jet.ver +++ b/versions/run.jet.ver @@ -1,4 +1,3 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 - -source "${HOMEprepobs:-}/versions/run.spack.ver" +source "${HOMEprepobs:-}/versions/spack.ver" diff --git a/versions/run.orion.ver b/versions/run.orion.ver index 8a3160c..3083ded 100644 --- a/versions/run.orion.ver +++ b/versions/run.orion.ver @@ -1,4 +1,3 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 - -source "${HOMEprepobs:-}/versions/run.spack.ver" +source "${HOMEprepobs:-}/versions/spack.ver" diff --git a/versions/run.spack.ver b/versions/run.spack.ver deleted file mode 100644 index 14bff19..0000000 --- a/versions/run.spack.ver +++ /dev/null @@ -1,20 +0,0 @@ -export spack_stack_ver=1.5.1 -export spack_env=gsi-addon - -export jasper_ver=2.0.32 -export libpng_ver=1.6.37 -export zlib_ver=1.2.13 - -export hdf5_ver=1.14.0 -export netcdf_c_ver=4.9.2 -export netcdf_fortran_ver=4.6.1 - -export bacio_ver=2.4.1 -export nemsio_ver=2.5.4 -export sp_ver=2.5.0 -export sigio_ver=2.3.2 -export w3emc_ver=2.10.0 -export bufr_ver=11.7.0 - -export grib_util_ver=1.3.0 -export prod_util_ver=1.2.2 diff --git a/versions/build.spack.ver b/versions/spack.ver similarity index 87% rename from versions/build.spack.ver rename to versions/spack.ver index 5203a28..624aa69 100644 --- a/versions/build.spack.ver +++ b/versions/spack.ver @@ -18,3 +18,5 @@ export sigio_ver=2.3.2 export w3emc_ver=2.10.0 export bufr_ver=11.7.0 +export grib_util_ver=1.3.0 +export prod_util_ver=1.2.2