Skip to content

Commit

Permalink
Merge pull request NOAA-GFDL#231 from ceblanton/update-gfdl-sites
Browse files Browse the repository at this point in the history
Update gfdl site config files
  • Loading branch information
ngs333 authored Jun 12, 2023
2 parents 8213bac + 39ac4d1 commit dcbfc10
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions site-configs/gfdl-ws/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

# Variables to control versions used
env_version=v0.17
env_version=2023.01
gcc_version=11.2.0
ncc_version=4.8.1
ncf_version=4.5.3
mpi_version=3.4.2
ncc_version=4.9.0
ncf_version=4.6.0
mpi_version=4.0.2

# Ensure the base spack modules are first in MODULEPATH
module remove-path MODULEPATH /app/spack/${env_version}/modulefiles/linux-rhel7-x86_64
module prepend-path MODULEPATH /app/spack/${env_version}/modulefiles/linux-rhel7-x86_64
module remove-path MODULEPATH /app/spack/${env_version}/modulefiles/linux-rhel8-x86_64
module prepend-path MODULEPATH /app/spack/${env_version}/modulefiles/linux-rhel8-x86_64

# bats and nccmp are needed for tests
module load bats/0.4.0
module load nccmp/1.9.0.1
module load bats
module load nccmp

# Load the GCC compilers
module load gcc/$gcc_version
Expand Down
16 changes: 8 additions & 8 deletions site-configs/gfdl/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,22 @@
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

# Variables to control versions used
env_version=v0.17
env_version=2023.01
gcc_version=11.2.0
ncc_version=4.8.1
ncf_version=4.5.3
mpi_version=3.4.2
ncc_version=4.9.0
ncf_version=4.6.0
mpi_version=4.0.2

# Ensure the base spack modules are first in MODULEPATH
module remove-path MODULEPATH /app/spack/${env_version}/modulefiles/linux-rhel7-x86_64
module prepend-path MODULEPATH /app/spack/${env_version}/modulefiles/linux-rhel7-x86_64

# bats and nccmp are needed for tests
module load bats/0.4.0
module load nccmp/1.9.0.1
module load bats
module load nccmp
# Need newer autoconf/automake than what pan has at the system level
module load autoconf/2.69
module load automake/1.16.3
module load autoconf
module load automake

# Load the GCC compilers
module load gcc/$gcc_version
Expand Down
4 changes: 2 additions & 2 deletions site-configs/ncrc/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
module rm PrgEnv-pgi PrgEnv-intel PrgEnv-gnu PrgEnv-cray
module load PrgEnv-gnu/6.0.10
module load gcc/12.1.0
module load cray-hdf5/1.12.2.3
module load cray-netcdf/4.9.0.3
module load cray-hdf5/1.12.1.3
module load cray-netcdf/4.8.1.3
module load nccmp

# Add bats to PATH
Expand Down

0 comments on commit dcbfc10

Please sign in to comment.