From 615441cacb95a8c2d2f74a7ce923820acd796ec4 Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Mon, 18 May 2026 18:13:43 -0400 Subject: [PATCH 1/2] add stop during setup when running routing but domain is not global (ldas.py) --- GEOSldas_App/ldas.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/GEOSldas_App/ldas.py b/GEOSldas_App/ldas.py index df3304f..0cc0459 100644 --- a/GEOSldas_App/ldas.py +++ b/GEOSldas_App/ldas.py @@ -362,6 +362,7 @@ def __init__(self, cmdLineArgs): gridname_ = gridname_.replace('SMAP-','').replace('-M','_M') self.ExeInputs['GRIDNAME'] = gridname_ + # to run routing on standard EASE tile space, need EASE_PFAF_TILE_FILE if (self.run_route > 0 and 'EASE' in self.ExeInputs['GRIDNAME']): tmp_ = glob.glob(inpgeom_ + '*Pfafstetter.nc4' + domain_) if (len(tmp_) > 0) : @@ -763,6 +764,10 @@ def createLnRstBc(self) : self.isZoomIn= True #os.remove(self.domain_def.name) + # if running routing, make sure domain is global + if self.run_route>0 and self.isZoomIn=True: + exit( "Must have global domain to run routing model, RUN_ROUTE=" + self.run_route ) + # update tile domain if self.isZoomIn: newZoominTile = tile+'.domain' @@ -908,11 +913,11 @@ def createLnRstBc(self) : for iens in range(self.nens) : ensdir = self.ensdirs[iens] ensid = self.ensids[iens] - myCatchRst = myRstDir+'/'+self.catch +ensid +'_internal_rst' - myLandiceRst = myRstDir+'/'+ 'landice' +ensid +'_internal_rst' - myVegRst = myRstDir+'/'+ 'vegdyn'+ensid +'_internal_rst' + myCatchRst = myRstDir+'/'+ self.catch +ensid +'_internal_rst' + myLandiceRst = myRstDir+'/'+ 'landice' +ensid +'_internal_rst' + myVegRst = myRstDir+'/'+ 'vegdyn' +ensid +'_internal_rst' myPertRst = myRstDir+'/'+ 'landpert' +ensid +'_internal_rst' - myRouteRst = myRstDir+'/'+ 'route' +ensid +'_internal_rst' + myRouteRst = myRstDir+'/'+ 'route' +ensid +'_internal_rst' catchRstFile = '' vegdynRstFile = '' From a65c05b8fbce892abc7ed0914aee72dcee7bc8e8 Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Tue, 19 May 2026 16:45:01 -0400 Subject: [PATCH 2/2] fix if condition in new consistency check (ldas.py) Co-authored-by: Weiyuan Jiang <52509753+weiyuan-jiang@users.noreply.github.com> --- GEOSldas_App/ldas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GEOSldas_App/ldas.py b/GEOSldas_App/ldas.py index 0cc0459..63fcab1 100644 --- a/GEOSldas_App/ldas.py +++ b/GEOSldas_App/ldas.py @@ -765,7 +765,7 @@ def createLnRstBc(self) : #os.remove(self.domain_def.name) # if running routing, make sure domain is global - if self.run_route>0 and self.isZoomIn=True: + if self.run_route>0 and self.isZoomIn: exit( "Must have global domain to run routing model, RUN_ROUTE=" + self.run_route ) # update tile domain