Update NAS configs

Author: mathomp4

configs/sites/tier1/nas/README.md

@@ -60,7 +60,7 @@ are used to create the environments. You only need to do this once.
 To create the oneAPI environment, do:
 
 ```
-spack stack create env --name ue-oneapi-2024.2.0 --template unified-dev --site nas --compiler=oneapi-2024.2.0 |& tee log.create.ue-oneapi-2024.2.0
+spack stack create env --name ue-oneapi-2024.2.0 --template unified-dev --site nas --compiler=oneapi-2024.2.0
 cd envs/ue-oneapi-2024.2.0
 ```
 
@@ -69,7 +69,7 @@ cd envs/ue-oneapi-2024.2.0
 To create the GCC environment, do:
 
 ```
-spack stack create env --name ue-gcc-13.2.0 --template unified-dev --site nas --compiler gcc-13.2.0 |& tee log.create.ue-gcc-13.2.0
+spack stack create env --name ue-gcc-13.2.0 --template unified-dev --site nas --compiler gcc-13.2.0
 cd envs/ue-gcc-13.2.0
 ```
 
@@ -99,7 +99,7 @@ Because this step downloads all the source code for all packages and all version
 should be done on a login node with internet access.
 
 ```
-spack mirror create -a -d /nobackup/gmao_SIteam/spack-stack/source-cache
+spack mirror create -a -d /swbuild/gmao_SIteam/spack-stack/source-cache
 ```
 
 NOTE: Make sure you are in an environment when you run that `spack mirror create` command. Otherwise,
@@ -109,15 +109,10 @@ you will download *EVERY* package and *EVERY* version in spack!
 
 Some packages use Rust/Cargo for dependencies. These need internet access to build. So we pre-fetch them here.
 
-We need to set `CARGO_HOME` to a location inside the spack environment so that the cargo downloads are cached.
-When we are in an environment, we have, say:
-```
-SPACK_ENV=/nobackupp28/gmao_SIteam/spack-stack/spack-stack-2.0.0-test/envs/ue-oneapi-2024.2.0
-```
-set for oneapi, so we can use the same "path" for each stack.
+We need to set `CARGO_HOME` to a location where the Cargo deps have been downloaded
 
 ```
-export CARGO_HOME=${SPACK_ENV}/cargo-cache
+export CARGO_HOME=/swbuild/gmao_SIteam/spack-stack/cargo-cache
 ../../util/fetch_cargo_deps.py
 ```
 
@@ -140,7 +135,7 @@ then have to build ecflow on a login node as well.
 So we first install all the dependencies of then codes.
 
 ```
-export CARGO_HOME=${SPACK_ENV}/cargo-cache
+export CARGO_HOME=/swbuild/gmao_SIteam/spack-stack/cargo-cache
 spack install -j 16 --verbose --fail-fast --show-log-on-error --no-check-signature --only dependencies py-cryptography py-maturin py-rpds-py ecflow 2>&1 | tee log.install.deps-for-rust-and-ecflow
 ```
 
@@ -153,7 +148,7 @@ you will get an illegal instruction error when the install below calls python3.
 So go back to an afe login node and run:
 
 ```
-export CARGO_HOME=${SPACK_ENV}/cargo-cache
+export CARGO_HOME=/swbuild/gmao_SIteam/spack-stack/cargo-cache
 spack install -j 2 -p 1 --verbose --fail-fast --show-log-on-error --no-check-signature py-cryptography py-maturin py-rpds-py ecflow 2>&1 | tee log.install.rust-and-ecflow
 ```
 
@@ -162,7 +157,7 @@ Note we are only using 2 processes here because NAS limits you to 2 processes on
 ### Install Step 3: The rest (COMPUTE NODE)
 
 ```
-export CARGO_HOME=${SPACK_ENV}/cargo-cache
+export CARGO_HOME=/swbuild/gmao_SIteam/spack-stack/cargo-cache
 spack install -j 16 --verbose --fail-fast --show-log-on-error --no-check-signature 2>&1 | tee log.install.after-cargo
 ```
 

configs/sites/tier1/nas/config.yaml

@@ -1,2 +1,9 @@
 config:
   build_jobs: 6
+
+  # Overrides for spack build and staging areas to speed up builds
+  # and avoid errors with Lustre file locking and xattr issues
+  build_stage:  /swbuild/gmao_SIteam/spack-stack/cache/build_stage
+  test_stage:   /swbuild/gmao_SIteam/spack-stack/cache/test_stage
+  source_cache: /swbuild/gmao_SIteam/spack-stack/cache/source_cache
+  misc_cache:   /swbuild/gmao_SIteam/spack-stack/cache/misc_cache

configs/sites/tier1/nas/mirrors.yaml

@@ -1,3 +1,3 @@
 mirrors:
-  local-source: file:///nobackup/gmao_SIteam/spack-stack/source-cache
-  local-binary: file:///nobackup/gmao_SIteam/spack-stack/binary-cache-spack-v1
+  local-source: file:///swbuild/gmao_SIteam/spack-stack/source-cache
+  local-binary: file:///swbuild/gmao_SIteam/spack-stack/binary-cache-spack-v1

configs/sites/tier1/nas/packages_gcc-13.2.0.yaml

@@ -60,9 +60,3 @@ packages:
           CPATH: /nobackup/gmao_SIteam/MPI/openmpi/4.1.8/gcc-13.2.0/include
           FPATH: /nobackup/gmao_SIteam/MPI/openmpi/4.1.8/gcc-13.2.0/include
           MANPATH: /nobackup/gmao_SIteam/MPI/openmpi/4.1.8/gcc-13.2.0/share/man
-  # MAT: I cannot figure out how to get hdf-eos2 to build with GCC on NAS
-  #      When I try, it dies with an error trying to *patch* the code!
-  #      This turns off the variants of met that need it
-  met:
-    variants::
-      - '+python +grib2 +graphics'