diff --git a/.gitmodules b/.gitmodules index a1c6502330..83c011d640 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,8 +20,10 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - url = https://github.com/NOAA-EMC/CMEPS.git - branch = emc/develop + #url = https://github.com/NOAA-EMC/CMEPS.git + #branch = emc/develop + url = https://github.com/DeniseWorthen/CMEPS.git + branch = feature/updcmeps [submodule "MOM6"] path = MOM6-interface/MOM6 url = https://github.com/NOAA-EMC/MOM6 diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index e40bc304d9..cc6f2b953e 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit e40bc304d91c4df6333e7164e859f1830646794f +Subproject commit cc6f2b953e50f7b82efff2fea3b82377b2aaf75a diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt index bf2a924d8a..1ee3a47b23 100644 --- a/CMEPS-interface/CMakeLists.txt +++ b/CMEPS-interface/CMakeLists.txt @@ -64,13 +64,9 @@ list(APPEND _mediator_files CMEPS/mediator/med_phases_post_rof_mod.F90 CMEPS/mediator/med_phases_post_wav_mod.F90) -list(APPEND _mediator_defs ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR} - ESMF_VERSION_MINOR=${ESMF_VERSION_MINOR}) - ### Create target library and set PUBLIC interfaces on the library add_library(cmeps STATIC ${_nems_util_files} ${_mediator_files}) set_target_properties(cmeps PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod) -target_compile_definitions(cmeps PUBLIC "${_mediator_defs}") target_include_directories(cmeps PUBLIC $ $) target_link_libraries(cmeps PUBLIC esmf