From f135e0cd614ee3a75057959958e63a56a96bd4ba Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Fri, 16 Aug 2024 09:46:21 -0500 Subject: [PATCH 01/15] Update atmos_cubed_sphere --- .gitmodules | 6 ++++-- atmos_cubed_sphere | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..0a9530938 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - branch = dev/emc + #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + #branch = dev/emc + url = https://github.com/DusanJovic-NOAA/GFDL_atmos_cubed_sphere + branch = remove_findesmf [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 3f8153364..6cf442e20 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 3f81533642be6060e1ac382ac99ce1481892dddd +Subproject commit 6cf442e201d1fed1078b3188fcd98cdf42a23f37 From 4bc1be8eae3989f624389203042ce9a33b5e4eee Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Mon, 16 Sep 2024 14:04:15 +0000 Subject: [PATCH 02/15] Update atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 6cf442e20..0df3e28c9 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 6cf442e201d1fed1078b3188fcd98cdf42a23f37 +Subproject commit 0df3e28c9b3b87b788638865f8676ff8c175d730 From d4d2baa50bc9613c00af7f3944a29717ec32f88d Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Mon, 7 Oct 2024 15:23:33 +0000 Subject: [PATCH 03/15] Update atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 0df3e28c9..d9488e2ec 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 0df3e28c9b3b87b788638865f8676ff8c175d730 +Subproject commit d9488e2ec7cb6bcfe6511cd3a8456762a18adf7f From cb40cd7def12b272ef2a630f00e28c1d39a5e64a Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 13 Nov 2024 07:14:12 -0600 Subject: [PATCH 04/15] Update atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index d9488e2ec..e5c03d01a 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit d9488e2ec7cb6bcfe6511cd3a8456762a18adf7f +Subproject commit e5c03d01a3bf91cbf8a997c950b60a487b6140a6 From d08c24a98e733955d8c112c089997570ded2b4da Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 8 Jan 2025 13:41:46 +0000 Subject: [PATCH 05/15] Update atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index e5c03d01a..c91d41448 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit e5c03d01a3bf91cbf8a997c950b60a487b6140a6 +Subproject commit c91d41448f45ab4f48be6d0aef6f2660963b8ed7 From b642a8f4dcc89e1c38d71cbfc28443ea97f12e29 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Thu, 3 Jul 2025 17:57:42 +0000 Subject: [PATCH 06/15] Update .gitmodules --- .gitmodules | 6 ------ atmos_cubed_sphere | 1 - fv3/atmos_cubed_sphere | 1 - 3 files changed, 8 deletions(-) delete mode 160000 atmos_cubed_sphere delete mode 160000 fv3/atmos_cubed_sphere diff --git a/.gitmodules b/.gitmodules index 9f46e3a5d..2ca9d1248 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ -[submodule "fv3/atmos_cubed_sphere"] - path = fv3/atmos_cubed_sphere - #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - #branch = dev/emc - url = https://github.com/DusanJovic-NOAA/GFDL_atmos_cubed_sphere - branch = remove_findesmf [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere deleted file mode 160000 index c91d41448..000000000 --- a/atmos_cubed_sphere +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c91d41448f45ab4f48be6d0aef6f2660963b8ed7 diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere deleted file mode 160000 index 4f1a5ef4b..000000000 --- a/fv3/atmos_cubed_sphere +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f1a5ef4b83461a79a62c8d965ebc2b26cf5eba8 From 9574dcc5a50a758bd154abafab38b8a26a18704a Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Thu, 3 Jul 2025 17:59:35 +0000 Subject: [PATCH 07/15] Update .gitmodules --- .gitmodules | 4 ++++ fv3/atmos_cubed_sphere | 1 + 2 files changed, 5 insertions(+) create mode 160000 fv3/atmos_cubed_sphere diff --git a/.gitmodules b/.gitmodules index 2ca9d1248..a01232401 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ +[submodule "fv3/atmos_cubed_sphere"] + path = fv3/atmos_cubed_sphere + url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere new file mode 160000 index 000000000..4f1a5ef4b --- /dev/null +++ b/fv3/atmos_cubed_sphere @@ -0,0 +1 @@ +Subproject commit 4f1a5ef4b83461a79a62c8d965ebc2b26cf5eba8 From 90f73f1e8007bf49074d6d0e127bb4488c95443d Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Thu, 3 Jul 2025 18:02:58 +0000 Subject: [PATCH 08/15] Update .gitmodules fv3/atmos_cubed_sphere --- .gitmodules | 6 ++++-- fv3/atmos_cubed_sphere | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a01232401..9f46e3a5d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "fv3/atmos_cubed_sphere"] path = fv3/atmos_cubed_sphere - url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - branch = dev/emc + #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + #branch = dev/emc + url = https://github.com/DusanJovic-NOAA/GFDL_atmos_cubed_sphere + branch = remove_findesmf [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index 4f1a5ef4b..a462e4f2d 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 4f1a5ef4b83461a79a62c8d965ebc2b26cf5eba8 +Subproject commit a462e4f2d14908334b8c5d62ab605a54d69a24a0 From 60b17234fc5ae7444f905fbd0a43dcd0dac548b0 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 6 Aug 2025 18:24:05 +0000 Subject: [PATCH 09/15] Change the name of the esmf imported target to ESMF::ESMF --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 857a8b50d..0d31366a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,7 +189,7 @@ endif() target_link_libraries(${DYCORE_TARGET} PUBLIC w3emc::w3emc_d sp::sp_d bacio::bacio_4 - esmf) + ESMF::ESMF) # OpenMP if(OPENMP) From 7707fe29ff1d7a1664f454fb7009ca3fcda4a428 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 6 Aug 2025 18:42:07 +0000 Subject: [PATCH 10/15] Update fv3/atmos_cubed_sphere --- fv3/atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index a462e4f2d..27c6ec95e 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit a462e4f2d14908334b8c5d62ab605a54d69a24a0 +Subproject commit 27c6ec95ecbc0abb097507f1a14089cf0af84f0f From 3c13371b8d8be9e37e47315ec545c8dc8c2eb1b2 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Thu, 7 Aug 2025 16:52:04 +0000 Subject: [PATCH 11/15] Update esmf to 8.8.0 in ci/spack.yaml and few other libarries --- ci/spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/spack.yaml b/ci/spack.yaml index 32bb71616..944d73a12 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -13,11 +13,11 @@ spack: specs: - bacio@2.4.1 - crtm@2.4.0 - - esmf@8.6.0 - - fms@2023.04 +gfs_phys +openmp +pic +quad_precision +deprecated_io constants=GFS precision=32,64 + - esmf@8.8.0 + - fms@2024.02 +gfs_phys +openmp +pic +quad_precision +deprecated_io constants=GFS precision=32,64 - g2@3.5.1 - g2tmpl@1.13.0 - - ip@4.3.0 precision=4,d,8 + - ip@5.1.0 precision=4,d,8 - netcdf-c@4.9.2 ~blosc - netcdf-fortran@4.6.1 - sp@2.5.0 precision=4,d,8 From 6bec21075b1bd50782e64c3c6b921ef0d5843db0 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 23 Sep 2025 21:06:04 +0000 Subject: [PATCH 12/15] Update fv3/atmos_cubed_sphere --- fv3/atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index 27c6ec95e..60d34ef42 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 27c6ec95ecbc0abb097507f1a14089cf0af84f0f +Subproject commit 60d34ef42500f884c684e8ea7a4a93d5094e5f15 From 0b6e5ac8528c93185f14239d0f96ac343d63c6db Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Thu, 6 Nov 2025 18:50:56 +0000 Subject: [PATCH 13/15] Update fv3/atmos_cubed_sphere --- fv3/atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index 60d34ef42..e514f6d6b 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 60d34ef42500f884c684e8ea7a4a93d5094e5f15 +Subproject commit e514f6d6b585e8fd857f55ef7d92618cd4d995f0 From 8dbaeb50defdacfce55d726e7b35c7e844388dd2 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 25 Nov 2025 09:59:11 -0600 Subject: [PATCH 14/15] Update mpas/CMakeLists.txt, rename esmf alias --- mpas/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpas/CMakeLists.txt b/mpas/CMakeLists.txt index 8954cf774..ea02adabd 100644 --- a/mpas/CMakeLists.txt +++ b/mpas/CMakeLists.txt @@ -51,7 +51,7 @@ if(NOT ESMF_FOUND) find_package(ESMF REQUIRED) endif() add_definitions(-DMPAS_EXTERNAL_ESMF_LIB -DMPAS_NO_ESMF_INIT) -add_library(${PROJECT_NAME}::external::esmf ALIAS esmf) +add_library(${PROJECT_NAME}::external::esmf ALIAS ESMF::ESMF) # MPAS Namelist add_subdirectory(MPAS-Model/src/tools/input_gen) # Targets: namelist_gen, streams_gen From 2f48d96a6ba3912a2339869ebd14e3318b5b1588 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 25 Nov 2025 21:52:59 +0000 Subject: [PATCH 15/15] Revert .gitmodules and update fv3/atmos_cubed_sphere --- .gitmodules | 6 ++---- fv3/atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index e72e00d06..a773677e6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "fv3/atmos_cubed_sphere"] path = fv3/atmos_cubed_sphere - #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - #branch = dev/emc - url = https://github.com/DusanJovic-NOAA/GFDL_atmos_cubed_sphere - branch = remove_findesmf + url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index e514f6d6b..0ca27bab3 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit e514f6d6b585e8fd857f55ef7d92618cd4d995f0 +Subproject commit 0ca27bab375c9cbabf98619712d1ec81b8000986