Revert .gitmodules and update submodule pointers for FV3, MOM6-interf…

…ace/MOM6, stochastic_physics
climbfuji · May 21, 2024 · 825cbf6 · 825cbf6
1 parent 3e15eaa
commit 825cbf6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,19 +1,15 @@
 [submodule "FV3"]
   path = FV3
-  #url = https://github.com/NOAA-EMC/fv3atm
-  #branch = develop
-  url = https://github.com/climbfuji/fv3atm
-  branch = feature/ccpp_prebuild_optarg
+  url = https://github.com/NOAA-EMC/fv3atm
+  branch = develop
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
   branch = dev/ufs-weather-model
 [submodule "stochastic_physics"]
   path = stochastic_physics
-  #url = https://github.com/NOAA-PSL/stochastic_physics
-  #branch = master
-  url = https://github.com/climbfuji/stochastic_physics
-  branch = feature/optional_arguments
+  url = https://github.com/NOAA-PSL/stochastic_physics
+  branch = master
 [submodule "CMakeModules"]
   path = CMakeModules
   url = https://github.com/NOAA-EMC/CMakeModules
@@ -28,10 +24,8 @@
   branch = emc/develop
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
-#  url = https://github.com/NOAA-EMC/MOM6
-#  branch = dev/emc
-  url = https://github.com/dpsarmie/MOM6
-  branch = feature/endofrun_restart
+  url = https://github.com/NOAA-EMC/MOM6
+  branch = dev/emc
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE

diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/stochastic_physics b/stochastic_physics
+6 −12		.gitmodules
+1 −1		atmos_cubed_sphere
+1 −1		ccpp/framework
+1 −1		ccpp/physics