From e6ffcb82841c76db7faa62ef33a20cf689143e3e Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 19 May 2026 11:17:48 -0400 Subject: [PATCH 1/2] pass parameters to ensavg --- .../GEOSlandice_GridComp/GEOS_LandIceGridComp.F90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp/GEOS_LandIceGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp/GEOS_LandIceGridComp.F90 index c22870a00..3c8a09ebb 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp/GEOS_LandIceGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp/GEOS_LandIceGridComp.F90 @@ -45,6 +45,8 @@ module GEOS_LandiceGridCompMod use DragCoefficientsMod implicit none + public :: NUM_SNOW_LAYERS + public :: NUM_ICE_LAYERS private integer, parameter :: ICE = 1 From 070ce6a99b51e1e659a22c3522b4d701691df38b Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 19 May 2026 11:53:04 -0400 Subject: [PATCH 2/2] export Routes's frid and locstream --- .../GEOSroute_GridComp/GEOS_RouteGridComp.F90 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSroute_GridComp/GEOS_RouteGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSroute_GridComp/GEOS_RouteGridComp.F90 index 2067be9aa..3f64b76ea 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSroute_GridComp/GEOS_RouteGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSroute_GridComp/GEOS_RouteGridComp.F90 @@ -70,9 +70,14 @@ module GEOS_RouteGridCompMod ! !PUBLIC MEMBER FUNCTIONS: - public SetServices + public :: SetServices -!EOP + ! used by its ensavg + public :: pfaf_grid + public :: pfaf_locstream + + type (ESMF_Grid) :: pfaf_grid + type (MAPL_LocStream) :: pfaf_locstream contains @@ -389,12 +394,12 @@ subroutine INITIALIZE (GC,IMPORT, EXPORT, CLOCK, RC ) integer :: ROUTE_DT, route_flag REAL :: HEARTBEAT type(ESMF_Grid) :: tileGrid - type(ESMF_Grid) :: pfaf_tilegrid, pfaf_grid + type(ESMF_Grid) :: pfaf_tilegrid character(len=ESMF_MAXSTR) :: SURFRC type(ESMF_Config) :: SCF, CF type(MAPL_MetaComp), pointer :: MAPL - type(MAPL_LocStream) :: locstream, pfaf_LocStream + type(MAPL_LocStream) :: locstream character(len=ESMF_MAXSTR) :: RIVER_INPUT_FILE