Fix git submodules

gold2718 · Oct 31, 2024 · 7ea7a4f · 7ea7a4f
1 parent fc4dcd8
commit 7ea7a4f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -37,12 +37,12 @@
 	fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
-[submodule "oslo_aero"]
-	path = src/chemistry/oslo_aero
-	url = https://github.com/NorESMhub/OSLO_AERO
+[submodule "camnor_phys"]
+	path = src/physics/camnor_phys
+	url = https://github.com/NorESMhub/CAM-Nor-physics
 	fxtag = camnor_noresm_v0.0.5
-	fxrequired = AlwaysRequired
-	fxDONOTUSEurl = https://github.com/CAM-Nor-physics.git
+        fxrequired = AlwaysRequired
+        fxDONOTUSEurl = https://github.com/NorESMhub/OSLO_AERO
 
 [submodule "carma"]
 	path = src/physics/carma/base
@@ -81,12 +81,14 @@
 	fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/HEMCO_CESM.git
 
-[submodule "camnor_phys"]
-	path = src/physics/camnor_phys
-	url = https://github.com/NorESMhub/CAM-Nor-physics
-        fxtag = oslo_aero_2_3a2
-        fxrequired = AlwaysRequired
-        fxDONOTUSEurl = https://github.com/NorESMhub/OSLO_AERO
+[submodule "oslo_aero"]
+	path = src/chemistry/oslo_aero
+#	url = https://github.com/NorESMhub/OSLO_AERO
+#        fxtag = noresm_oslo_aero_v2
+        fxtag = UpdateNorESMBranch
+	url = https://github.com/gold2718/OSLO_AERO
+	fxrequired = AlwaysRequired
+	fxDONOTUSEurl = https://github.com/CAM-Nor-physics.git
 
 [submodule "pumas"]
 	path = src/physics/pumas

diff --git a/src/chemistry/oslo_aero b/src/chemistry/oslo_aero
diff --git a/src/hemco b/src/hemco
diff --git a/src/physics/clubb b/src/physics/clubb
+1 −14		src/aero_model.F90
+2 −2		src_cam/prescribed_volcaero.F90
+24 −1		CHANGELOG.md
+10 −0		Externals_HCO.cfg
+1 −1		HEMCO
+14 −6		README.md
+6 −2		hco_esmf_grid.F90
+54 −38		hemco_interface.F90