From 3c4d2531275c1ebb6a650c429cd263b5c3e50832 Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Wed, 3 Dec 2025 11:54:44 -0500
Subject: [PATCH 01/11] Update components.yaml with routing branches for
 GEOSldas_GridComp and GEOSgcm_GridComp

---
 components.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components.yaml b/components.yaml
index 4fa50a73..d991402c 100644
--- a/components.yaml
+++ b/components.yaml
@@ -57,12 +57,12 @@ MAPL:
 GEOSldas_GridComp:
   local: ./src/Components/@GEOSldas_GridComp
   remote: ../GEOSldas_GridComp.git
-  branch: develop
+  branch: feature/wjiang/route
   develop: develop
 
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  branch: develop
+  branch: feature/wjiang/Routing_GEOSroute_on_yujin
   sparse: ./config/GEOSgcm_GridComp_ldas.sparse
   develop: develop

From 24b621555a1c83a735c86e09ccd07b9cf79e35ab Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Wed, 3 Dec 2025 13:04:25 -0500
Subject: [PATCH 02/11] Use MAPL branch until new MAPL release is ready
 (components.yaml)

---
 components.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components.yaml b/components.yaml
index d991402c..f7c2d892 100644
--- a/components.yaml
+++ b/components.yaml
@@ -51,7 +51,8 @@ GMAO_perllib:
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.63.1
+#  tag: v2.63.1
+  branch: feature/wjiang/pfaf_index
   develop: develop
 
 GEOSldas_GridComp:

From 8e4ca41ce75d9e6344fd1920a037ba3a27685c3b Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Fri, 5 Dec 2025 12:17:44 -0500
Subject: [PATCH 03/11] Update MAPL to v2.64.0 in components.yaml

---
 components.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components.yaml b/components.yaml
index f7c2d892..3f4b0e18 100644
--- a/components.yaml
+++ b/components.yaml
@@ -51,8 +51,7 @@ GMAO_perllib:
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-#  tag: v2.63.1
-  branch: feature/wjiang/pfaf_index
+  tag: v2.64.0
   develop: develop
 
 GEOSldas_GridComp:

From 5a44efa1dc8e222c87398f77dab8d93d7fc93167 Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Fri, 5 Dec 2025 12:18:36 -0500
Subject: [PATCH 04/11] Update MAPL to v2.64 in CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d051fe24..e761ae37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ if (NOT Baselibs_FOUND)
   # Another issue with historical reasons, old/wrong zlib target used in GEOS
   add_library(ZLIB::zlib ALIAS ZLIB::ZLIB)
 
-  find_package(MAPL 2.63 QUIET)
+  find_package(MAPL 2.64 QUIET)
   if (MAPL_FOUND)
     message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"")
   endif ()

From 6b69699ec5aa52ce31297b42883a247f4f15dfe4 Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Mon, 8 Dec 2025 16:23:16 -0500
Subject: [PATCH 05/11] Clarify that all fields in a given collection must be
 in same tile space (applies to both 1d and 2d Collection)
 (README.OutputSpecs.md)

---
 doc/README.OutputSpecs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/README.OutputSpecs.md b/doc/README.OutputSpecs.md
index 51efe664..9414d260 100644
--- a/doc/README.OutputSpecs.md
+++ b/doc/README.OutputSpecs.md
@@ -69,7 +69,7 @@ In addition, the line "VERSION: 1" must be present in the header of `HISTORY.rc`
 
 **Special considerations for GEOSldas**
 
-1. Since the introduction of mixed land+landice simulations, the tile space can differ across gridded components.  For example, METFORCE fields are in the full land+landice tile space, whereas CATCH fields are in the land tilespace.  Therefore, in mixed land+landice simulations, METFORCE fields and CATCH fields can no longer appear in the same "1d" HISTORY collection (which was previously the case in the "1d_lfs" collection). 
+1. Since the introduction of mixed land+landice simulations, the tile space can differ across gridded components.  For example, METFORCE fields are in the full land+landice tile space, whereas CATCH fields are in the land tilespace.  Therefore, in mixed land+landice simulations, METFORCE fields and CATCH fields can no longer appear in the same HISTORY Collection (which was previously the case in the "lfs" Collection, for both "1d" and "2d" output). 
 
 2. Beginning with MAPL v2.63.1, simulations on the EASE grid tile space can write "2d" gridded output on the native EASE grid as well as interpolated to lat/lon and cube-sphere grids.
 

From ca74bfe0f22aa3e5a5d66a4fcd8eb31449024e16 Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Mon, 8 Dec 2025 16:29:22 -0500
Subject: [PATCH 06/11] Minor clarification of output specs
 (README.OutputSpecs.md)

Updated the README to clarify output specifications for Collections.
---
 doc/README.OutputSpecs.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/README.OutputSpecs.md b/doc/README.OutputSpecs.md
index 9414d260..3e772310 100644
--- a/doc/README.OutputSpecs.md
+++ b/doc/README.OutputSpecs.md
@@ -19,18 +19,18 @@ Output of the latter two sets of files can be turned on/off in the `[NML_INPUT_P
 
 As part of `ldas_setup`, a sample `HISTORY.rc` configuration file is created in the experiment's `./run` directory.  Users specify the desired output by editing `HISTORY.rc`.
 
-`HISTORY.rc` defines a number of output file "Collections", each of which contains one or more output variables.  Output can be in the native tile space ("1d") or gridded ("2d"), _**except**_ when the simulation is in the EASE grid tile space (see below).
+`HISTORY.rc` defines a number of output file "Collections", each of which contains one or more output variables.  Output can be in the native tile space ("1d") or gridded ("2d").
 
 All variables contained in a given Collection are written:
 * on the same ("2d") grid (if gridded),
 * at the same frequency, and
 * with either time-average ("tavg") or instantaneous ("inst") sampling mode.
 
-In the following example, two Collections are written.  The `tavg3_2d_lnd_Nx` Collection contains time-average ("tavg"), 3-hourly ("3"), gridded ("2d") data, and the `inst1_1d_lfs_Nt` Collection contains snapshot/instantaneous ("inst"), 1-hourly, tile-space ("1d") data.
+In the following example, two Collections are written.  The `tavg3_2d_lnd_Nx` Collection contains time-average ("tavg"), 3-hourly ("3"), gridded ("2d") land ("lnd") data, and the `inst1_1d_glc_Nt` Collection contains snapshot/instantaneous ("inst"), 1-hourly, tile-space ("1d") glacier ("glc") data.
 ```
 COLLECTIONS:
             'tavg3_2d_lnd_Nx'
-            'inst1_1d_lfs_Nt'
+            'inst1_1d_glc_Nt'
            ::
 ```
 

From 985c69edaf6c78dea665f552305c4eb8dc717be6 Mon Sep 17 00:00:00 2001
From: Rolf Reichle <rolf.reichle@nasa.gov>
Date: Thu, 16 Apr 2026 16:13:14 -0400
Subject: [PATCH 07/11] revert GEOSgcm_GridComp branch back to "develop" now
 that GEOSgcm_GridComp routing PR has been merged (components.yaml)

---
 components.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components.yaml b/components.yaml
index 56458873..c20c0ac8 100644
--- a/components.yaml
+++ b/components.yaml
@@ -63,6 +63,6 @@ GEOSldas_GridComp:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  branch: feature/wjiang/Routing_GEOSroute_on_yujin
+  branch: develop
   sparse: ./config/GEOSgcm_GridComp_ldas.sparse
   develop: develop

From 3e7b6d2abb5f1479790af5cb27769d2651279d30 Mon Sep 17 00:00:00 2001
From: Rolf Reichle <rolf.reichle@nasa.gov>
Date: Thu, 16 Apr 2026 16:25:44 -0400
Subject: [PATCH 08/11] updated documentation for river routing output
 (README.OutputSpecs.md)

---
 doc/README.OutputSpecs.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/README.OutputSpecs.md b/doc/README.OutputSpecs.md
index 3e772310..d934834c 100644
--- a/doc/README.OutputSpecs.md
+++ b/doc/README.OutputSpecs.md
@@ -19,10 +19,10 @@ Output of the latter two sets of files can be turned on/off in the `[NML_INPUT_P
 
 As part of `ldas_setup`, a sample `HISTORY.rc` configuration file is created in the experiment's `./run` directory.  Users specify the desired output by editing `HISTORY.rc`.
 
-`HISTORY.rc` defines a number of output file "Collections", each of which contains one or more output variables.  Output can be in the native tile space ("1d") or gridded ("2d").
+`HISTORY.rc` defines a number of output file "Collections", each of which contains one or more output variables.  For most "Collections", output can be in the native model tile space ("1d") or gridded ("2d").  Output from the river routing module is only available in the "1d" space of the Pfafstetter hydrological catchments. 
 
 All variables contained in a given Collection are written:
-* on the same ("2d") grid (if gridded),
+* on the same ("2d") grid (if gridded) or in the same "1d" space (model tiles or Pfafstetter catchments),
 * at the same frequency, and
 * with either time-average ("tavg") or instantaneous ("inst") sampling mode.
 
@@ -46,7 +46,7 @@ For example, to write 3-hourly, time-average output of the "WCSF" and "WCRZ" var
                               ::
 ```
 
-To be available for output through MAPL HISTORY, a variable ("field") must be defined as an `ExportSpec` in a `GEOS_*GridComp.F90` file.  The list of variables ("fields") in the definition of each Collection consists of three columns:
+To be available for output through MAPL HISTORY, a variable ("field") must be defined as an `ExportSpec` or `InternalSpec` in a `GEOS_*GridComp.F90` file.  The list of variables ("fields") in the definition of each Collection consists of three columns:
 - (column 1) variable name in `GEOS_[GCNAME]GridComp.F90` file,
 - (column 2) GridComp name [GCNAME], and
 - (column 3) user-specified variable name that appears in nc4 output (optional).

From b2132f598ab110b82fb0dd570f7ba73d00e7ea12 Mon Sep 17 00:00:00 2001
From: Rolf Reichle <rolf.reichle@nasa.gov>
Date: Thu, 16 Apr 2026 16:28:40 -0400
Subject: [PATCH 09/11] updated documentation for ObsFcstAna output in nc4
 format (README.OutputSpecs.md)

---
 doc/README.OutputSpecs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/README.OutputSpecs.md b/doc/README.OutputSpecs.md
index d934834c..47ca153e 100644
--- a/doc/README.OutputSpecs.md
+++ b/doc/README.OutputSpecs.md
@@ -8,7 +8,7 @@ Restart/checkpoint files are also written through MAPL (although not through HIS
 
 Notable exceptions from the MAPL-generated output include:
 * log files [ASCII],
-* observation-space "ObsFcstAna" data assimilation diagnostics [BINARY], and
+* observation-space "ObsFcstAna" data assimilation diagnostics [BINARY or NETCDF-4], and
 * SMAP L4_SM-specific "aup" data assimilation diagnostics files (available _**only**_ for simulations in EASEv2_M09 tile space) [BINARY].
 
 Output of the latter two sets of files can be turned on/off in the `[NML_INPUT_PATH]/LDASsa_SPECIAL_inputs_ensupd.nml` configuration file, and Matlab readers are available in the

From 6171fb3f300488226d312eb7ad76ed1f9247c6ed Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Fri, 17 Apr 2026 16:54:31 -0400
Subject: [PATCH 10/11] Update GEOS_Util tag to v2.1.15

GEOS_Util v2.1.15 include functionality to remap river routing restarts
---
 components.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components.yaml b/components.yaml
index c20c0ac8..4f72870e 100644
--- a/components.yaml
+++ b/components.yaml
@@ -36,7 +36,7 @@ GMAO_Shared:
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v2.1.12
+  tag: v2.1.15
   sparse: ./config/GEOS_Util.sparse
   develop: main
 

From bceab62799eca68b8b07c2185ae1fffc833634ef Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Thu, 7 May 2026 09:02:02 -0400
Subject: [PATCH 11/11] revert GEOSldas_GridComp branch back to develop
 (components.yaml)

---
 components.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components.yaml b/components.yaml
index 4f72870e..9fd4f948 100644
--- a/components.yaml
+++ b/components.yaml
@@ -57,7 +57,7 @@ MAPL:
 GEOSldas_GridComp:
   local: ./src/Components/@GEOSldas_GridComp
   remote: ../GEOSldas_GridComp.git
-  branch: feature/wjiang/route
+  branch: develop
   develop: develop
 
 GEOSgcm_GridComp: