Merge branch 'master' into HAFS

Conflicts: .gitmodules FV3 NEMS
ufs-community · Sep 13, 2019 · 4e2eb3e · 4e2eb3e
2 parents 51875bd + f92e81f
commit 4e2eb3e
Show file tree

Hide file tree

Showing 50 changed files with 65,384 additions and 59,006 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,8 +4,8 @@
 	branch = HAFS
 [submodule "NEMS"]
 	path = NEMS
-	url = gerrit:NEMS
-    branch = HAFS
+	url = https://github.com/NOAA-EMC/NEMS.git
+	branch = develop
 [submodule "ccpp/framework"]
 	path = ccpp/framework
 	url = https://github.com/NCAR/ccpp-framework
@@ -16,3 +16,6 @@
 	path = FMS
 	url = https://github.com/NOAA-EMC/FMS
 	branch = GFS-FMS
+[submodule "WW3"]
+	path = WW3
+	url = https://github.com/NOAA-EMC/WW3
diff --git a/FV3 b/FV3
diff --git a/WW3 b/WW3
diff --git a/compsets/#wcoss.input# b/compsets/#wcoss.input#