Merge Denise update CMEPS

NickSzapiro-NOAA · Dec 12, 2024 · 574a848 · 574a848
1 parent 4c92d2e
commit 574a848
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
diff --git 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
+2 −2		.github/workflows/extbuild.yml
+11 −9		.github/workflows/srt.yml
+26 −321		cesm/driver/esm_time_mod.F90
+0 −859		cesm/nuopc_cap_share/nuopc_shr_methods.F90
+33 −10		cime_config/buildnml
+108 −29		cime_config/config_component.xml
+5 −18		cime_config/config_component_cesm.xml
+67 −46		cime_config/namelist_definition_drv.xml
+2 −8		cime_config/runseq/driver_config.py
+10 −0		cime_config/testdefs/testlist_drv.xml
+1 −0		cime_config/testdefs/testmods_dirs/drv/aoflux_ogrid/user_nl_cpl
+11 −16		doc/source/addendum/req_attributes_cesm.rst
+1 −1		mediator/CMakeLists.txt
+3 −4		mediator/Makefile
+57 −38		mediator/esmFldsExchange_cesm_mod.F90
+144 −8		mediator/med.F90
+8 −21		mediator/med_diag_mod.F90
+10 −5		mediator/med_internalstate_mod.F90
+57 −74		mediator/med_map_mod.F90
+27 −18		mediator/med_phases_aofluxes_mod.F90
+5 −6		mediator/med_phases_history_mod.F90
+7 −8		mediator/med_phases_ocnalb_mod.F90
+3 −18		mediator/med_phases_prep_glc_mod.F90
+9 −5		mediator/med_phases_profile_mod.F90
+27 −36		mediator/med_phases_restart_mod.F90
+0 −302		mediator/med_time_mod.F90