diff --git a/CMakeLists.txt b/CMakeLists.txt index 5afd86200..a911ed913 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,9 +207,14 @@ 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 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) +endif() + #add FMS for FV3 only if(FV3 OR MPAS) target_link_libraries(ccpp_physics PUBLIC fms) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F b/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F index b779e50ba..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 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