From b0f0ae19517bb54b2c86f3ca869be776720b1090 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:36:53 -0400 Subject: [PATCH 1/6] g2, g2tmpl, mapl versions --- configs/common/packages.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index bbd16064b..4cfdad625 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -78,12 +78,12 @@ packages: freetype: require: '+pic' g2: - require: '@3.4.9' + require: '@3.5.1' g2c: require: '@1.6.4' g2tmpl: require: - - '@1.10.2' + - '@1.13.0' gcc-runtime: require: '%gcc' gfsio: @@ -128,7 +128,7 @@ packages: magics: require: "@4.15.3:" mapl: - require: '@2.46.2 +shared ~f2py' + require: '@2.46.3 +shared ~f2py' variants: '+pflogger' # If making changes here, also check the Discover site configs and the CI workflows met: From b97dd55ba1ff6ce4164fff494fba627398d5f774 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:42:18 -0400 Subject: [PATCH 2/6] fms version --- configs/common/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 4cfdad625..91fb739a9 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -71,7 +71,7 @@ packages: # Pin version to avoid duplicates require: '@2.6.4' fms: - require: '@2023.04' + require: '@2024.01' variants: 'precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io' fontconfig: require: '+pic' From 30e584b92e832ba3ecd732ca8ed8dd5c0e4732c0 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:48:19 -0400 Subject: [PATCH 3/6] Update versions --- configs/templates/ufs-weather-model-static/spack.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/templates/ufs-weather-model-static/spack.yaml b/configs/templates/ufs-weather-model-static/spack.yaml index 08eeb5c07..61b22e08b 100644 --- a/configs/templates/ufs-weather-model-static/spack.yaml +++ b/configs/templates/ufs-weather-model-static/spack.yaml @@ -20,17 +20,17 @@ spack: specs: - bacio@2.4.1 - crtm@=2.4.0 ~fix - - esmf@8.5.0 +external-parallelio ~xerces ~pnetcdf snapshot=none fflags="-fp-model precise" cxxflags="-fp-model precise" - - fms@2023.02.01 constants=GFS precision=32,64 +quad_precision +gfs_phys +openmp - - g2@3.4.5 - - g2tmpl@1.10.2 + - esmf@8.6.1 +external-parallelio ~xerces ~pnetcdf snapshot=none fflags="-fp-model precise" cxxflags="-fp-model precise" + - fms@2024.01 constants=GFS precision=32,64 +quad_precision +gfs_phys +openmp + - g2@3.5.1 + - g2tmpl@1.13.0 - gftl-shared@1.6.1 - hdf5@1.14.0 +hl +mpi ~tools ~szip - ip@3.3.3 +openmp - jasper@2.0.25 - libjpeg-turbo - libpng@1.6.37 libs=static - - mapl@2.40.3 ~pflogger ~fargparse ~extdata2g ~f2py + - mapl@2.46.3 ~pflogger ~fargparse ~extdata2g ~f2py - netcdf-c@4.9.2 ~parallel-netcdf +mpi ~dap ~szip - netcdf-fortran@4.6.0 - parallel-netcdf@1.12.2 From d760f7f17602031a6678d12d8d1a83d53b152aee Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 20 Aug 2024 13:09:50 -0600 Subject: [PATCH 4/6] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 6 ++++-- spack | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a69f3e4f1..964b37039 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + #url = https://github.com/jcsda/spack + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack + branch = feature/fms_mapl_updates [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index fb50a614c..349059e44 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit fb50a614cc6f927e4844476acd38e06ea55292c4 +Subproject commit 349059e4441dbec2525ba88c3ece5ec53b28b108 From cdb7893290ce3d84b4fd69073c4df4264457eb6b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 20 Aug 2024 13:10:41 -0600 Subject: [PATCH 5/6] Update fms to 2024.02, mapl to 2.46.3 in configs/common/packages.yaml, configs/containers/specs/jedi-ci.yaml, configs/templates/ufs-weather-model-static/spack.yaml --- configs/common/packages.yaml | 4 ++-- configs/containers/specs/jedi-ci.yaml | 4 ++-- configs/templates/ufs-weather-model-static/spack.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 91fb739a9..9ccb16589 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -71,7 +71,7 @@ packages: # Pin version to avoid duplicates require: '@2.6.4' fms: - require: '@2024.01' + require: '@2024.02' variants: 'precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io' fontconfig: require: '+pic' @@ -128,7 +128,7 @@ packages: magics: require: "@4.15.3:" mapl: - require: '@2.46.3 +shared ~f2py' + require: '@2.46.3 ~shared ~f2py' variants: '+pflogger' # If making changes here, also check the Discover site configs and the CI workflows met: diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml index a3942234e..b3e47123f 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -2,13 +2,13 @@ specs: [base-env@1.0.0, jedi-base-env@1.0.0, ewok-env@1.0.0, jedi-fv3-env@1.0.0, jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.0.1, ecbuild@3.7.2, eccodes@2.33.0, ecflow@5, eckit@1.24.5, ecmwf-atlas@0.38.1 +fckit +trans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw, - eigen@3.4.0, fckit@0.11.0, fms@2023.04, g2@3.4.9, g2tmpl@1.10.2, + eigen@3.4.0, fckit@0.11.0, fms@2024.02, g2@3.4.9, g2tmpl@1.10.2, gsibec@1.2.1, hdf@4.2.15, hdf5@1.14.3, ip@5.0.0, jasper@2.0.32, jedi-cmake@1.4.0, libpng@1.6.37, nccmp@1.9.0.1, netcdf-c@4.9.2, netcdf-cxx4@4.3.1, netcdf-fortran@4.6.1, parallelio@2.6.2, parallel-netcdf@1.12.3, py-eccodes@1.5.0, py-f90nml@1.4.3, py-gitpython@3.1.40, py-h5py@3.8.0, py-numpy@1.22.3, py-pandas@1.5.3, py-pip, py-pyyaml@6.0, py-scipy@1.11.4, py-shapely@1.8.0, py-xarray@2023.7.0, - sp@2.5.0, udunits@2.2.28, w3emc@2.10.0, nco@5.1.6, esmf@8.6.1, mapl@2.46.2, + sp@2.5.0, udunits@2.2.28, w3emc@2.10.0, nco@5.1.6, esmf@8.6.1, mapl@2.46.3, zlib-ng@2.1.5, zstd@1.5.2, odc@1.5.2, shumlib@macos_clang_linux_intel_port, awscli-v2@2.13.22, py-globus-cli@3.16.0, # Added for new CI system 2024/04/30 diff --git a/configs/templates/ufs-weather-model-static/spack.yaml b/configs/templates/ufs-weather-model-static/spack.yaml index 61b22e08b..e1010095e 100644 --- a/configs/templates/ufs-weather-model-static/spack.yaml +++ b/configs/templates/ufs-weather-model-static/spack.yaml @@ -21,7 +21,7 @@ spack: - bacio@2.4.1 - crtm@=2.4.0 ~fix - esmf@8.6.1 +external-parallelio ~xerces ~pnetcdf snapshot=none fflags="-fp-model precise" cxxflags="-fp-model precise" - - fms@2024.01 constants=GFS precision=32,64 +quad_precision +gfs_phys +openmp + - fms@2024.02 constants=GFS precision=32,64 +quad_precision +gfs_phys +openmp - g2@3.5.1 - g2tmpl@1.13.0 - gftl-shared@1.6.1 From 0de124a8815898281f56708e62f35c23d4878d6d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 20 Aug 2024 15:22:06 -0600 Subject: [PATCH 6/6] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 964b37039..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = spack-stack-dev - url = https://github.com/climbfuji/spack - branch = feature/fms_mapl_updates + url = https://github.com/jcsda/spack + branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 349059e44..cef497611 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 349059e4441dbec2525ba88c3ece5ec53b28b108 +Subproject commit cef497611df30f3cbf42c6b1c2a9196265f69edd