NRL updates: New template neptune-dev-llvm, update met/metplus

configs/common/packages.yaml

@@ -221,11 +221,11 @@ packages:
       - ~shared ~f2py +pflogger
     met:
       require:
-      - '@12.0.1'
+      - '@12.1.1'
       - +python +grib2
     metplus:
       require:
-      - '@6.0.0'
+      - '@6.1.0'
     metis:
       require:
       - +int64 +real64

configs/templates/neptune-dev-llvm/spack.yaml

@@ -0,0 +1,35 @@
+# Template for NEPTUNE development
+#
+spack:
+  concretizer:
+    unify: when_possible
+
+  view: false
+  include: []
+
+  specs:
+  - neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
+  - neptune-env +debug +openmp +espc +ncview ^esmf@=8.9.1
+  - neptune-env ~debug ~openmp +espc +ncview ^esmf@=8.9.1
+  - neptune-env +debug ~openmp +espc +ncview ^esmf@=8.9.1
+  # Until we can build the entire set of dependencies for
+  # neptune-python-env and jedi-neptune-env, we need to
+  # add the required packages for the NEPTUNE standalone
+  # model manually
+  #- neptune-python-env    ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
+  #- jedi-neptune-env +adp ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
+  - py-numpy
+  # Let's assume/hope that by the time FALCON starts
+  # testing with LLVM, we have moved from crtm v2 to v3
+  - crtm@3.1.2
+  #- crtm@v2.4.1-jedi.2
+
+  packages:
+    # Turn on python variant for esmf
+    esmf:
+      require:
+      - +python
+    # Avoid duplicate builds of parallelio +pnetcdf and ~pnetcdf
+    parallelio:
+      require:
+      - ~pnetcdf

repos/spack_stack/spack_repo/spack_stack/packages/jedi_neptune_env/package.py

@@ -22,6 +22,7 @@ class JediNeptuneEnv(BundlePackage):
 
     depends_on("jedi-base-env", type="run")
     depends_on("neptune-env", type="run")
+    depends_on("neptune-python-env", type="run")
 
     with when("+adp"):
         depends_on("adp-preprocessors", type="run")

repos/spack_stack/spack_repo/spack_stack/packages/neptune_python_env/package.py

@@ -25,8 +25,10 @@ class NeptunePythonEnv(BundlePackage):
     depends_on("esmf +python", type="run")
 
     depends_on("py-arch", type="run")
+    depends_on("py-cartopy", type="run")
     depends_on("py-cfgrib", type="run")
     depends_on("py-h5py", type="run")
+    depends_on("py-matplotlib", type="run")
     depends_on("py-netcdf4", type="run")
     depends_on("py-pandas", type="run")
     depends_on("py-pycodestyle", type="run")

util/nrl/batch_install.sh

@@ -111,7 +111,7 @@ fi
 case ${SPACK_STACK_BATCH_HOST} in
   atlantis)
     SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.1" "oneapi@=2025.3.0" "gcc@=13.4.0" "clang@=21.1.0")
-    SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-ops" "unified-dev" "cylc-dev")
+    SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-dev-llvm" "unified-dev" "cylc-dev")
     SPACK_STACK_MODULE_CHOICE="lmod"
     SPACK_STACK_BOOTSTRAP_MIRROR="/neptune_diagnostics/spack-stack/bootstrap-mirror"
     SPACK_STACK_CARGO_MIRROR="/neptune_diagnostics/spack-stack/cargo-mirror"
@@ -167,7 +167,7 @@ case ${SPACK_STACK_BATCH_HOST} in
     ;;
   bounty)
     SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.3.0" "gcc@=13.3.1" "clang@=21.1.1")
-    SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-ops" "unified-dev" "cylc-dev")
+    SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-dev-llvm" "unified-dev" "cylc-dev")
     SPACK_STACK_MODULE_CHOICE="tcl"
     SPACK_STACK_BOOTSTRAP_MIRROR="/home/dom/prod/spack-bootstrap-mirror"
     SPACK_STACK_CARGO_MIRROR="/home/dom/prod/spack-cargo-mirror"
@@ -353,12 +353,12 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
     if [[ "${template}" == "cylc-dev" && ! "${compiler_name}" == "gcc" ]]; then
       echo "Skipping template ${template} with compiler ${compiler}"
       continue
-    # With clang, only neptune-ops 
-    elif [[ "${compiler_name}" == "clang" && ! "${template}" == "neptune-ops" ]]; then
+    # With clang, only neptune-dev-llvm 
+    elif [[ "${compiler_name}" == "clang" && ! "${template}" == "neptune-dev-llvm" ]]; then
       echo "Skipping template ${template} with compiler ${compiler}"
       continue
-    # With other compilers, skip neptune-ops
-    elif [[ ! "${compiler_name}" == "clang" && "${template}" == "neptune-ops" ]]; then
+    # With other compilers, skip neptune-dev-llvm
+    elif [[ ! "${compiler_name}" == "clang" && "${template}" == "neptune-dev-llvm" ]]; then
       echo "Skipping template ${template} with compiler ${compiler}"
       continue
     # FMS compiler ICE: https://github.com/NOAA-GFDL/FMS/issues/1680
@@ -377,7 +377,7 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
       neptune-dev)
         env_name_prefix="ne"
         ;;
-      neptune-ops)
+      neptune-dev-llvm)
         env_name_prefix="ne"
         ;;
       cylc-dev)