From 7ea7a4f93275e2ce32c8044354a195b3ef1a127f Mon Sep 17 00:00:00 2001 From: Steve Goldhaber Date: Thu, 31 Oct 2024 13:34:09 +0100 Subject: [PATCH] Fix git submodules --- .gitmodules | 24 +++++++++++++----------- src/chemistry/oslo_aero | 2 +- src/hemco | 2 +- src/physics/clubb | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0974abc1d7..8278f588dc 100644 --- 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 index 8dba2ecbf1..6fa54c4e88 160000 --- a/src/chemistry/oslo_aero +++ b/src/chemistry/oslo_aero @@ -1 +1 @@ -Subproject commit 8dba2ecbf174b8d16cc9106cec131581e3367ff9 +Subproject commit 6fa54c4e8899d81715dad2f2f6b2956aab080769 diff --git a/src/hemco b/src/hemco index 3a6d999ab0..7bd8358229 160000 --- a/src/hemco +++ b/src/hemco @@ -1 +1 @@ -Subproject commit 3a6d999ab0dbee9f03ab6b9a13dd3b6d9670eb54 +Subproject commit 7bd8358229eefd2cbb910ff30c46dfc97e34fb6f diff --git a/src/physics/clubb b/src/physics/clubb index 50cee042e5..15e802092f 160000 --- a/src/physics/clubb +++ b/src/physics/clubb @@ -1 +1 @@ -Subproject commit 50cee042e588fefd3fe58c2a1d638affec8c0389 +Subproject commit 15e802092f65b3a20e5d67cb32d40f8a2771ca9b