Merge branch 'mslong1/rrg+rad' into feature/mathomp4/split-chem-2025J…

…an23-and-rrg # Conflicts: # components.yaml
GEOS-ESM · Jan 27, 2025 · 3a36091 · 3a36091
2 parents cedfe8c + 8b73305
commit 3a36091
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/components.yaml b/components.yaml
@@ -56,7 +56,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v2.7.0
+  branch: feature/mathomp4/split-chem-2025Jan23-and-rrg
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop
 
@@ -81,7 +81,7 @@ fvdycore:
 GEOSchem_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp
   remote: ../GEOSchem_GridComp.git
-  branch: feature/mathomp4/split-chem-2025Jan23
+  branch: feature/mathomp4/split-chem-2025Jan23-and-rrg
   develop: develop
 
 HEMCO:
@@ -108,6 +108,12 @@ QuickChem:
   tag: v1.0.0
   develop: main
 
+RRG:
+  local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@RRG
+  remote: ../RRG.git
+  branch: main
+  develop: develop
+
 TR:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@TR
   remote: ../TR.git
@@ -202,7 +208,7 @@ sis2:
 GEOSradiation_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp
   remote: ../GEOSradiation_GridComp.git
-  tag: v1.10.0
+  branch: feature/mathomp4/split-chem-2025Jan23-and-rrg
   develop: develop
 
 RRTMGP:
@@ -227,7 +233,7 @@ umwm:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  branch: feature/mathomp4/split-chem-2025Jan23
+  branch: feature/mathomp4/split-chem-2025Jan23-and-rrg
   develop: develop
 
 UMD_Etc: