CRTM updates to [email protected] and [email protected] (#1680)

* Update crtm versions in configs/templates/skylab-dev/spack.yaml and configs/templates/unified-dev/spack.yaml
* Update submodule pointer for spack
* Skip [email protected] with oneapi in templates unified-dev and skylab-dev
* Move crtm version dependency from spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py to configs/templates/unified-dev/spack.yaml

Author: climbfuji

configs/templates/skylab-dev/spack.yaml

@@ -24,8 +24,8 @@ spack:
 
     # Various crtm tags (list all to avoid duplicate packages)
     - [email protected]
-    - [email protected]
-    - [email protected].1-build1
+    - [email protected].2
+    - [email protected].2
 
     # Mapl with various esmf tags
     - [email protected] ^[email protected]
@@ -49,6 +49,10 @@ spack:
     # py-torch in ai-env doesn't build with Intel
     - ai-env%intel
     - ai-env%oneapi
+
+    # Skip incompatible CRTM versions with oneapi
+    - [email protected]%oneapi
+
   packages:
     # Avoid duplicate builds of parallelio +pnetcdf and ~pnetcdf
     parallelio:

configs/templates/unified-dev/spack.yaml

@@ -11,9 +11,9 @@ spack:
     - ewok-env +ecflow ~cylc
     - ai-env
     - geos-gcm-env          ^esmf@=8.6.1
-    - global-workflow-env   ^esmf@=8.6.1 ^crtm@=3.1.1-build1
-    - gmao-swell-env
-    - gsi-env ^crtm@=3.1.1-build1
+    - global-workflow-env   ^esmf@=8.6.1 ^crtm@=3.1.2
+    - gmao-swell-env                     ^crtm@=v2.4.1-jedi.2
+    - gsi-env                            ^crtm@=3.1.2
     - jedi-fv3-env
     - jedi-geos-env         ^esmf@=8.6.1
     - jedi-mpas-env
@@ -24,13 +24,13 @@ spack:
     - neptune-env           ^esmf@=8.9.0b11
     - neptune-python-env    ^esmf@=8.9.0b11
     - soca-env
-    - ufs-srw-app-env       ^esmf@=8.8.0 ^crtm@=3.1.1-build1
-    - ufs-weather-model-env ^esmf@=8.8.0 ^crtm@=3.1.1-build1
+    - ufs-srw-app-env       ^esmf@=8.8.0 ^crtm@=3.1.2
+    - ufs-weather-model-env ^esmf@=8.8.0 ^crtm@=3.1.2
 
     # Various crtm tags (list all to avoid duplicate packages)
     - [email protected]
-    - [email protected]
-    - [email protected].1-build1
+    - [email protected].2
+    - [email protected].2
 
     # Mapl with various esmf tags
     - [email protected] ^[email protected]
@@ -60,6 +60,8 @@ spack:
     # Skip neptune-python-env with Intel Classic due to problems
     # with new versions of py-numpy, py-scipy, ...
     - neptune-python-env%intel
+    # Skip incompatible CRTM versions with oneapi
+    - [email protected]%oneapi
   packages:
     # Avoid duplicate builds of parallelio +pnetcdf and ~pnetcdf
     parallelio:

spack

@@ -21,7 +21,7 @@ class GmaoSwellEnv(BundlePackage):
     depends_on("jedi-base-env", type="run")
 
     # Add CRTM 2.4.0
-    depends_on("crtm@v2.4-jedi.2", type="run")
+    depends_on("crtm", type="run")
 
     # Additional dependencies for JEDI used by swell
     depends_on("fms", type="run")