diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 5c209b3ff..069c8c28f 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -140,9 +140,8 @@ packages: - any_of: - '@=8.6.1 snapshot=none' - '@=8.8.0 snapshot=none' - - '@=8.9.0 snapshot=none' - '@=8.9.1 snapshot=none' - - '@=9.0.0b10 snapshot=b10' + - '@=9.0.0b11 snapshot=b11' - any_of: - 'fflags="-fp-model precise" cxxflags="-fp-model precise"' when: '%intel' diff --git a/configs/templates/neptune-dev-llvm/spack.yaml b/configs/templates/neptune-dev-llvm/spack.yaml index 38ae467e1..c0a70cd07 100644 --- a/configs/templates/neptune-dev-llvm/spack.yaml +++ b/configs/templates/neptune-dev-llvm/spack.yaml @@ -9,16 +9,16 @@ spack: specs: #- dev-utils-env - - neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10 - - neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b10 - - neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b10 - - neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b10 + - neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b11 # 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@=9.0.0b10 - #- jedi-neptune-env +adp ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10 + #- neptune-python-env ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 + #- jedi-neptune-env +adp ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 - py-numpy - crtm@3.1.3 diff --git a/configs/templates/neptune-dev/spack.yaml b/configs/templates/neptune-dev/spack.yaml index 08692e456..24dc6d6ca 100644 --- a/configs/templates/neptune-dev/spack.yaml +++ b/configs/templates/neptune-dev/spack.yaml @@ -22,12 +22,12 @@ spack: specs: - dev-utils-env - - neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10 - - neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b10 - - neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b10 - - neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b10 - - neptune-python-env +gittools ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10 - - jedi-neptune-env +adp +jedi ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10 + - neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-python-env +gittools ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 + - jedi-neptune-env +adp +jedi ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 - crtm@3.1.3 packages: diff --git a/configs/templates/neptune-ops/spack.yaml b/configs/templates/neptune-ops/spack.yaml index 58f7d298a..173940930 100644 --- a/configs/templates/neptune-ops/spack.yaml +++ b/configs/templates/neptune-ops/spack.yaml @@ -8,7 +8,7 @@ spack: include: [] specs: - - neptune-env ~debug +openmp +espc ~ncview ^esmf@=9.0.0b10 + - neptune-env ~debug +openmp +espc ~ncview ^esmf@=9.0.0b11 packages: # Turn off python variant for esmf diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index a521f6b14..41f703336 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -14,11 +14,11 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.9.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.9.1 + - jedi-neptune-env ^esmf@=9.0.0b11 - jedi-tools-env - jedi-ufs-env ^esmf@=8.8.0 - - neptune-env ^esmf@=8.9.1 - - neptune-python-env ^esmf@=8.9.1 + - neptune-env ^esmf@=9.0.0b11 + - neptune-python-env ^esmf@=9.0.0b11 - soca-env # Various crtm tags (list all to avoid duplicate packages) @@ -30,9 +30,9 @@ spack: - mapl@2.53.4 ^esmf@8.8.0 # Various esmf tags (list all to avoid duplicate packages) - - esmf@=8.6.1 - esmf@=8.8.0 - esmf@=8.9.1 + - esmf@=9.0.0b11 packages: # Turn on python variant for esmf diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index a636dd115..9c8b3abf2 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -18,10 +18,10 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.9.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.9.1 + - jedi-neptune-env ^esmf@=9.0.0b11 - jedi-ufs-env ^esmf@=8.8.0 - - neptune-env ^esmf@=8.9.1 - - neptune-python-env ^esmf@=8.9.1 + - neptune-env ^esmf@=9.0.0b11 + - neptune-python-env ^esmf@=9.0.0b11 - soca-env - ufs-srw-app-env ^esmf@=8.8.0 ^crtm@=3.1.3 - ufs-weather-model-env ^esmf@=8.8.0 ^crtm@=3.1.3 @@ -38,6 +38,7 @@ spack: - esmf@=8.6.1 - esmf@=8.8.0 - esmf@=8.9.1 + - esmf@=9.0.0b11 # Various fms builds - fms +gfs_phys constants=GFS diff --git a/repos/builtin b/repos/builtin index d04c20752..89af8e824 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit d04c2075209f4080864183c60d753bc1b2b96391 +Subproject commit 89af8e82400c8b5b8ae62c2915e7707cb4b8445f