From a89b864d8c9d1391c864518bc3bbba80b84a8165 Mon Sep 17 00:00:00 2001 From: Gillian Petro Date: Wed, 1 Apr 2026 22:41:04 -0400 Subject: [PATCH 1/6] update CMakeLists.txt sp -> ip --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5afd86200..2c4a58da5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,7 +207,7 @@ target_include_directories(ccpp_physics PUBLIC target_link_libraries(ccpp_physics PRIVATE MPI::MPI_Fortran) target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d - sp::sp_d + ip::ip_d NetCDF::NetCDF_Fortran ) #add FMS for FV3 only From 414e9101ce10122927dc7e9de6a45af2d0e8ed3d Mon Sep 17 00:00:00 2001 From: Gillian Petro Date: Thu, 2 Apr 2026 09:07:07 -0400 Subject: [PATCH 2/6] pick up splat in sfcsub --- physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F | 2 ++ 1 file changed, 2 insertions(+) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F b/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F index b779e50ba..4b9eda7eb 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F @@ -78,6 +78,8 @@ subroutine sfccycle(lugb,len,lsoil,sig1t,deltsfc & &, min_ice & &, ialb,isot,ivegsrc,tile_num_ch,i_index,j_index) use machine , only : kind_io8,kind_io4 + ! pick up splat() + use sp_mod implicit none character(len=*), intent(in) :: tile_num_ch integer, intent(in) :: i_index(len), j_index(len), & From 33f5af155a3e18633ad6d4932d4347065a267a9c Mon Sep 17 00:00:00 2001 From: Gillian Petro Date: Mon, 6 Apr 2026 11:39:27 -0400 Subject: [PATCH 3/6] improve ccpp backwards compatibility for ip/sp --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c4a58da5..dc6d4d9ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,9 +207,13 @@ target_include_directories(ccpp_physics PUBLIC target_link_libraries(ccpp_physics PRIVATE MPI::MPI_Fortran) target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d - ip::ip_d NetCDF::NetCDF_Fortran - ) + ) +if(ip_FOUND) + target_link_libraries(ccpp_physics PUBLIC ip::ip_d) +else() + target_link_libraries(ccpp_physics PUBLIC sp::sp_d) + #add FMS for FV3 only if(FV3 OR MPAS) target_link_libraries(ccpp_physics PUBLIC fms) From c9ee543679d488cc754b589e266c35a4939cf4be Mon Sep 17 00:00:00 2001 From: Gillian Petro Date: Thu, 16 Apr 2026 10:14:31 -0400 Subject: [PATCH 4/6] sync w/ufs/dev --- physics/SFC_Layer/MYNN/MYNN | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/physics/SFC_Layer/MYNN/MYNN b/physics/SFC_Layer/MYNN/MYNN index b2d7d8731..0c00ba42a 160000 --- a/physics/SFC_Layer/MYNN/MYNN +++ b/physics/SFC_Layer/MYNN/MYNN @@ -1 +1 @@ -Subproject commit b2d7d8731c84964c7afcab74cc9f2acb23d7fd71 +Subproject commit 0c00ba42a222a26754348c6f103a8e97d26f33e7 From 7a7d6d2e1e1d3011b951effc2ab51fee81efb632 Mon Sep 17 00:00:00 2001 From: gspetro-NOAA Date: Fri, 17 Apr 2026 03:07:29 +0000 Subject: [PATCH 5/6] fix syntax error --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc6d4d9ac..a911ed913 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,6 +213,7 @@ if(ip_FOUND) target_link_libraries(ccpp_physics PUBLIC ip::ip_d) else() target_link_libraries(ccpp_physics PUBLIC sp::sp_d) +endif() #add FMS for FV3 only if(FV3 OR MPAS) From 7148dfa4cd71367b9fc629a58d3a3f0436ed06ca Mon Sep 17 00:00:00 2001 From: Gillian Petro Date: Fri, 17 Apr 2026 11:21:54 -0400 Subject: [PATCH 6/6] fix syntax error, pick up splat --- CMakeLists.txt | 1 + physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc6d4d9ac..a911ed913 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,6 +213,7 @@ if(ip_FOUND) target_link_libraries(ccpp_physics PUBLIC ip::ip_d) else() target_link_libraries(ccpp_physics PUBLIC sp::sp_d) +endif() #add FMS for FV3 only if(FV3 OR MPAS) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F b/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F index 4b9eda7eb..8ba254329 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F @@ -8,6 +8,7 @@ !! and setrmsk(). module sfccyc_module use machine , only : kind_io8,kind_io4 + use sp_mod implicit none save @@ -78,8 +79,6 @@ subroutine sfccycle(lugb,len,lsoil,sig1t,deltsfc & &, min_ice & &, ialb,isot,ivegsrc,tile_num_ch,i_index,j_index) use machine , only : kind_io8,kind_io4 - ! pick up splat() - use sp_mod implicit none character(len=*), intent(in) :: tile_num_ch integer, intent(in) :: i_index(len), j_index(len), &