Merge branch 'develop' of https://github.com/ufs-community/ufs-s2s-model

into develop
binli2337 · Oct 3, 2020 · 8dda8c5 · 8dda8c5
2 parents da33f20 + f76df9e
commit 8dda8c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,8 +16,8 @@
 	branch = master
 [submodule "CMEPS"]
 	path = CMEPS
-	url = https://github.com/aerorahul/CMEPS.git
-	branch = feature/no-pio
+	url = https://github.com/NOAA-EMC/CMEPS.git
+	branch = emc/develop
 [submodule "WW3"]
 	path = WW3
 	url = https://github.com/NOAA-EMC/WW3.git

diff --git a/CMEPS b/CMEPS
+90 −44		mediator/esmFldsExchange_nems_mod.F90
+36 −30		mediator/fd_nems.yaml
+21 −204		mediator/med_phases_prep_ocn_mod.F90
+4 −2		nems/util/perf_mod.F90