From 574a8481e7f8d5b08084754a8ca8c12806971aac Mon Sep 17 00:00:00 2001 From: Nick Szapiro Date: Thu, 12 Dec 2024 11:44:40 -0600 Subject: [PATCH] Merge Denise update CMEPS --- .gitmodules | 6 ++++-- CMEPS-interface/CMEPS | 2 +- CMEPS-interface/CMakeLists.txt | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 29327b7abc..c5775c524c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,8 +16,10 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - url = https://github.com/NOAA-EMC/CMEPS - branch = emc/develop + #url = https://github.com/NOAA-EMC/CMEPS + #branch = emc/develop + url = https://github.com/DeniseWorthen/CMEPS + branch = feature/updcmeps [submodule "HYCOM"] path = HYCOM-interface/HYCOM url = https://github.com/NOAA-EMC/HYCOM-src diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 55576eba97..507ca48f45 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 55576eba972ad53cc6546f00d409fa27361f78bd +Subproject commit 507ca48f4586fbeb7b0e23e5cfa9321bc3f02a1d diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt index 89a815bd22..91d298ee03 100644 --- a/CMEPS-interface/CMakeLists.txt +++ b/CMEPS-interface/CMakeLists.txt @@ -43,6 +43,7 @@ list(APPEND _ufs_util_files ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_kind_mod.F90 ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90 ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90 + ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/nuopc_shr_methods.F90 ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90) list(APPEND _mediator_files