Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

River routing for GEOSldas #1023

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from
Draft

River routing for GEOSldas #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7faae9f
branch feature/yujinz/Routing_GEOSroute started, offline model was pu…
Oct 24, 2024
54950b8
change some paths for Discover
Oct 28, 2024
982bdd9
script build is replaced by run
Oct 29, 2024
f2a19da
readme.txt added
Oct 29, 2024
bf8b9a8
update K_str
Oct 31, 2024
71e44c5
Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou…
Oct 31, 2024
c6e341b
removing some Chinese characters in the comments
Oct 31, 2024
d2a0c95
more cleaning up
Nov 5, 2024
0d8ebcb
Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou…
Dec 2, 2024
5e9377a
move offline model to dir offline
Dec 2, 2024
7ceed5a
routing model was implemented to GEOSldas
Dec 2, 2024
17b7d4b
back to TAKI
Dec 6, 2024
431674c
back to Discover
Dec 6, 2024
5d98b30
a small bug fix for the offline model
Dec 18, 2024
abcf705
update the offline model to the coupled model
Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 37 additions & 34 deletions ...ridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOS_LandGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module GEOS_LandGridCompMod
use GEOS_CatchGridCompMod, only : CatchSetServices => SetServices
use GEOS_CatchCNGridCompMod, only : CatchCNSetServices => SetServices
use GEOS_IgniGridCompMod, only : IgniSetServices => SetServices
! use GEOS_RouteGridCompMod, only : RouteSetServices => SetServices
use GEOS_RouteGridCompMod, only : RouteSetServices => SetServices

implicit none
private
Expand Down Expand Up @@ -195,19 +195,21 @@ subroutine SetServices ( GC, RC )

END SELECT

! IF(RUN_ROUTE == 1) THEN
! if (NUM_CATCH == 1) then
! ROUTE(1) = MAPL_AddChild(GC, NAME='ROUTE', SS=RouteSetServices, RC=STATUS)
! VERIFY_(STATUS)
! else
! do I = 1, NUM_CATCH
! WRITE(TMP,'(I3.3)') I
! GCName = 'ens' // trim(TMP) // ':ROUTE'
! ROUTE(I) = MAPL_AddChild(GC, NAME=GCName, SS=RouteSetServices, RC=STATUS)
! VERIFY_(STATUS)
! end do
! end if
! ENDIF
allocate (ROUTE(NUM_CATCH), stat=status)
VERIFY_(STATUS)
IF(RUN_ROUTE == 1) THEN
if (NUM_CATCH == 1) then
ROUTE(1) = MAPL_AddChild(GC, NAME='ROUTE', SS=RouteSetServices, RC=STATUS)
VERIFY_(STATUS)
else
do I = 1, NUM_CATCH
WRITE(TMP,'(I3.3)') I
GCName = 'ens' // trim(TMP) // ':ROUTE'
ROUTE(I) = MAPL_AddChild(GC, NAME=GCName, SS=RouteSetServices, RC=STATUS)
VERIFY_(STATUS)
end do
end if
ENDIF

if (DO_FIRE_DANGER) then
IGNI = MAPL_AddChild(GC, NAME='IGNI'//trim(tmp), SS=IgniSetServices, RC=STATUS)
Expand Down Expand Up @@ -1453,16 +1455,16 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)
end if

! IF(RUN_ROUTE == 1) THEN
! call MAPL_AddConnectivity ( &
! GC ,&
! SHORT_NAME = (/'RUNOFF '/) ,&
! SRC_ID = CATCH(I) ,&
! DST_ID = ROUTE(I) ,&
!
! RC=STATUS )
! VERIFY_(STATUS)
! ENDIF
IF(RUN_ROUTE == 1) THEN
call MAPL_AddConnectivity ( &
GC ,&
SHORT_NAME = (/'RUNOFF '/) ,&
SRC_ID = CATCH(I) ,&
DST_ID = ROUTE(I) ,&

RC=STATUS )
VERIFY_(STATUS)
ENDIF

CASE (2,3)
call MAPL_AddConnectivity ( &
Expand All @@ -1486,16 +1488,16 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)
end if

! IF(RUN_ROUTE == 1) THEN
! call MAPL_AddConnectivity ( &
! GC ,&
! SHORT_NAME = (/'RUNOFF '/) ,&
! SRC_ID = CATCHCN(I) ,&
! DST_ID = ROUTE(I) ,&
!
! RC=STATUS )
! VERIFY_(STATUS)
! ENDIF
IF(RUN_ROUTE == 1) THEN
call MAPL_AddConnectivity ( &
GC ,&
SHORT_NAME = (/'RUNOFF '/) ,&
SRC_ID = CATCHCN(I) ,&
DST_ID = ROUTE(I) ,&

RC=STATUS )
VERIFY_(STATUS)
ENDIF
END SELECT
END DO

Expand Down Expand Up @@ -1669,6 +1671,7 @@ subroutine Run1(GC, IMPORT, EXPORT, CLOCK, RC )
!--------------------------------

DO I = 1, size(GCS)
if (trim(GCnames(i)) == "ROUTE") cycle
call MAPL_TimerOn(MAPL,trim(GCnames(i)), RC=STATUS ); VERIFY_(STATUS)
call ESMF_GridCompRun(GCS(I), importState=GIM(I), exportState=GEX(I), &
CLOCK=CLOCK, PHASE=1, userRC=STATUS)
Expand Down
4 changes: 2 additions & 2 deletions ...physics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOSroute_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
esma_set_this ()

set (srcs
#GEOS_RouteGridComp.F90
GEOS_RouteGridComp.F90
routing_model.F90
)

esma_add_library (${this} SRCS ${srcs} DEPENDENCIES MAPL ESMF::ESMF NetCDF::NetCDF_Fortran)
esma_add_library (${this} SRCS ${srcs} DEPENDENCIES MAPL esmf NetCDF::NetCDF_Fortran)

install(PROGRAMS build_rivernetwork.py DESTINATION bin)
Loading
Loading