More Acorn/WCOSS2 site config updates

configs/sites/tier1/acorn/deployments.yaml

@@ -1,6 +1,6 @@
 deployments:
   - template: "unified-dev"
-    compilers: ["oneapi-2024.2.1", "intel-19.1.3.304"]
+    compilers: ["oneapi@2024.2.1", "intel@19.1.3.304"]
     packages_to_install:
     - ufs-weather-model-env
     - global-workflow-env
@@ -20,7 +20,7 @@ deployments:
     - py-numpy
 
   - template: "nco"
-    compilers: ["oneapi-2024.2.1", "intel-19.1.3.304"]
+    compilers: ["oneapi@2024.2.1", "intel@19.1.3.304"]
     duplicates_to_ignore: ["crtm", "crtm-fix", "boost", "harfbuzz"]
     allowed_gcc_packages:
     - antlr

configs/sites/tier1/acorn/modules.yaml

@@ -5,3 +5,5 @@ modules:
     lmod:
       include:
       - python
+      all:
+        autoload: run

configs/sites/tier1/acorn/packages.yaml

@@ -12,7 +12,7 @@ packages:
   blas:
     require:: ['openblas']
   fftw-api:
-    require: ['fftw']
+    require:: ['fftw']
   jpeg:
     require: ['libjpeg-turbo']
   lapack:
@@ -39,6 +39,7 @@ packages:
     require: ['~crypto']
   nco:
     require:: ['%oneapi']
+  py-colorama:: {}
   py-pandas:
     require:: ['~excel']
   subversion:

configs/templates/nco/approved_list.txt → configs/sites/tier1/wcoss2/approved_packages.txt

@@ -2,9 +2,9 @@ awscli
 bacio
 boost
 bufr
-bufr_dump
-bufr_tranjb
-bufr_util
+bufr-dump
+bufr-tranjb
+bufr-util
 cairo
 cdo
 cfitsio
@@ -28,14 +28,14 @@ gempak
 geos
 gfsio
 git
-grib_util
+grib-util
 gsl
 hdf5
 imagemagick
 ip
 ip2
 jasper
-lamp_shared
+lamp-shared
 landsfcutil
 libdap4
 libgeotiff
@@ -54,19 +54,20 @@ mbedtls
 met
 metis
 metplus
-mos_shared
+mos-shared
 nco
 ncview
 nemsio
 nemsiogfs
-netcdf
+netcdf-c
+netcdf-fortran
 perl
 pigz
 pio
 pixman
 prepobs
-prod_envir
-prod_util
+prod-envir
+prod-util
 proj
 python
 readline
@@ -79,11 +80,11 @@ sp
 subversion
 udunits
 upp
-util_shared
+util-shared
 w3emc
 w3nco
 wgrib2
-wrf_io
+wrf-io
 xyz2shp
 xz
 zlib
@@ -210,7 +211,7 @@ xproto
 xtrans
 xxhash
 zstd
-atlas
+ecmwf-atlas
 eckit
 fckit
 gsl-lite
@@ -223,3 +224,4 @@ glibc
 parallelio
 pkg-config
 ecbuild
+gsi-ncdiag

configs/sites/tier1/wcoss2/modules.yaml

@@ -11,6 +11,8 @@ modules:
       - netcdf_c_virtual
       - esmf_virtual
       - python_virtual
+      all:
+        autoload: run
       boost:
         suffixes:
           '%gcc': gcc

configs/sites/tier1/wcoss2/packages.yaml

@@ -12,7 +12,7 @@ packages:
   blas:
     require:: ['openblas']
   fftw-api:
-    require: ['fftw']
+    require:: ['fftw']
   jpeg:
     require: ['libjpeg-turbo']
   lapack:
@@ -55,6 +55,7 @@ packages:
     require:: ['%oneapi']
   netcdf-c:
     require:: ['@4.9.2', '+mpi', '~parallel-netcdf', '~dap', '~blosc', '~szip']
+  py-colorama:: {}
   py-pandas:
     require:: ['~excel']
   scotch:

util/acorn/deploy/deploy.py

@@ -9,6 +9,7 @@
 parser.add_argument('-r', '--redeploy-existing', action='store_true', help="Redeploy existing deployments (default is skip existing env dirs)")
 parser.add_argument('-s', '--site', type=str, help='Site name override')
 parser.add_argument('-u', '--until', choices=("create", "concretize", "validate", "fetch", "install"), help='Carry out steps up to and including')
+parser.add_argument('-l', '--list-only', action='store_true', help="List configured deployments for the detected site and exit")
 
 parser.add_argument('deployments', nargs='*', help="List of deployments to apply (default is all; specify template+compiler with, e.g., 'unified-dev%%[email protected]')")
 
@@ -150,14 +151,17 @@ def run_batch_install(batch_config, deployment, env_dir_full_path, logfile, logf
             deployment["only_concretize_requested_packages"] = False
         env_dir_basename = get_env_dir_basename(deployment)
         deployments[env_dir_basename] = deployment
-        print(f"  Registered deployment: {deployment['template']}/{deployment['compiler']} ({env_dir_basename})")
+        print(f"  Registered deployment: {deployment['template']}%{deployment['compiler']} ({env_dir_basename})")
+
+if args.list_only:
+    sys.exit(0)
 
 print("="*30)
 
 # Create and install each deployment
 for env_dir_basename, deployment in deployments.items():
     if not is_deployment_requested(env_dir_basename, deployment, args):
-        print(f"Skipping deployment: {deployment['template']}/{deployment['compiler']} ({env_dir_basename})")
+        print(f"Skipping deployment: {deployment['template']}%{deployment['compiler']} ({env_dir_basename})")
         continue
     print("="*30)
     # Create env based on config