ufs-community · DeniseWorthen · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
diff --git 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
diff --git 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 $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                         $<INSTALL_INTERFACE:mod>)
 target_link_libraries(cmeps PUBLIC esmf
+2 −2		.github/pull_request_template.md
+8 −9		.github/workflows/bumpversion.yml
+3 −1		.github/workflows/extbuild.yml
+8 −0		cime_config/buildexe
+18 −0		cime_config/buildnml
+19 −34		cime_config/config_component.xml
+3 −12		cime_config/config_component_cesm.xml
+0 −10		cime_config/config_component_ufs.xml
+26 −113		cime_config/namelist_definition_drv.xml
+1 −0		cime_config/namelist_definition_modelio.xml
+6 −6		cime_config/runseq/runseq_general.py
+23 −3		cime_config/testdefs/testlist_drv.xml
+157 −33		drivers/cime/esm.F90
+19 −11		drivers/cime/esmApp.F90
+30 −20		drivers/cime/esm_time_mod.F90
+2 −2		drivers/cime/esm_utils_mod.F90
+7 −18		mediator/esmFlds.F90
+1 −17		mediator/esmFldsExchange_cesm_mod.F90
+0 −19		mediator/esmFldsExchange_hafs_mod.F90
+4 −0		mediator/fd_cesm.yaml
+83 −55		mediator/med.F90
+861 −860		mediator/med_diag_mod.F90
+3 −0		mediator/med_internalstate_mod.F90
+1 −1		mediator/med_io_mod.F90
+2 −2		mediator/med_map_mod.F90
+7 −1		mediator/med_phases_history_mod.F90
+29 −0		mediator/med_phases_prep_atm_mod.F90
+46 −35		mediator/med_phases_prep_ice_mod.F90
+42 −22		mediator/med_phases_prep_ocn_mod.F90
+38 −7		mediator/med_time_mod.F90
+2 −2		mediator/med_utils_mod.F90