Skip to content

Commit

Permalink
(tentatively) renamed irrigation exports
Browse files Browse the repository at this point in the history
  • Loading branch information
@gmao-rreichle
gmao-rreichle committed Feb 3, 2025
1 parent ed1a37f commit 9486c7d
Show file tree
Hide file tree
Showing 7 changed files with 192 additions and 189 deletions.
20 changes: 10 additions & 10 deletions ...ridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOS_LandGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ subroutine SetServices ( GC, RC )
RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, &
SHORT_NAME = 'IRRLAND', &
SHORT_NAME = 'IRRG_RATE_TOT', &
CHILD_ID = CATCH(1), &
RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -1122,7 +1122,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'PRLAND' , CHILD_ID = CATCHCN(1), RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'IRRLAND', CHILD_ID = CATCHCN(1), RC=STATUS )
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'IRRG_RATE_TOT', CHILD_ID = CATCHCN(1), RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SNOLAND' , CHILD_ID = CATCHCN(1), RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -1384,10 +1384,10 @@ subroutine SetServices ( GC, RC )
END SELECT ! LSM_CHOICE (Catch, CatchCN)

if (RUN_IRRIG == 1) then
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPRINKLERRATE', CHILD_ID = IRRIGATION(1),RC=STATUS ) ; VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'FLOODRATE', CHILD_ID = IRRIGATION(1),RC=STATUS ) ; VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'FURROWRATE', CHILD_ID = IRRIGATION(1),RC=STATUS ) ; VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'DRIPRATE', CHILD_ID = IRRIGATION(1),RC=STATUS ) ; VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'IRRG_RATE_SPR', CHILD_ID = IRRIGATION(1),RC=STATUS ) ; VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'IRRG_RATE_PDY', CHILD_ID = IRRIGATION(1),RC=STATUS ) ; VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'IRRG_RATE_FRW', CHILD_ID = IRRIGATION(1),RC=STATUS ) ; VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'IRRG_RATE_DRP', CHILD_ID = IRRIGATION(1),RC=STATUS ) ; VERIFY_(STATUS)
end if


Expand Down Expand Up @@ -1506,8 +1506,8 @@ subroutine SetServices ( GC, RC )

call MAPL_AddConnectivity ( &
GC ,&
SHORT_NAME = (/'SPRINKLERRATE', 'DRIPRATE ' ,&
'FURROWRATE ', 'FLOODRATE '/) ,&
SHORT_NAME = (/'IRRG_RATE_SPR', 'IRRG_RATE_DRP' ,&
'IRRG_RATE_FRW', 'IRRG_RATE_PDY'/) ,&
SRC_ID = IRRIGATION(I) ,&
DST_ID = CATCH(I) ,&
RC = STATUS )
Expand Down Expand Up @@ -1559,8 +1559,8 @@ subroutine SetServices ( GC, RC )

call MAPL_AddConnectivity ( &
GC ,&
SHORT_NAME = (/'SPRINKLERRATE', 'DRIPRATE ' ,&
'FURROWRATE ', 'FLOODRATE '/) ,&
SHORT_NAME = (/'IRRG_RATE_SPR', 'IRRG_RATE_DRP' ,&
'IRRG_RATE_FRW', 'IRRG_RATE_PDY'/) ,&
SRC_ID = IRRIGATION(I) ,&
DST_ID = CATCH(I) ,&
RC=STATUS )
Expand Down
18 changes: 9 additions & 9 deletions ...Comp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -672,35 +672,35 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'SPRINKLERRATE' ,&
LONG_NAME = 'sprinkler_irrigation_rate' ,&
SHORT_NAME = 'IRRG_RATE_SPR' ,&
LONG_NAME = 'irrigation_flux_sprinkler' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'DRIPRATE' ,&
LONG_NAME = 'drip_irrigation_rate' ,&
SHORT_NAME = 'IRRG_RATE_DRP' ,&
LONG_NAME = 'irrigation_flux_drip' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'FURROWRATE' ,&
LONG_NAME = 'furrow_irrigation_rate' ,&
SHORT_NAME = 'IRRG_RATE_FRW' ,&
LONG_NAME = 'irrigation_flux_furrow' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'FLOODRATE' ,&
LONG_NAME = 'flood_irrigation_rate' ,&
SHORT_NAME = 'IRRG_RATE_PDY' ,&
LONG_NAME = 'irrigation_flux_paddy' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
Expand Down Expand Up @@ -826,7 +826,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'PRLAND' , CHILD_ID = CATCHCN, RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'IRRLAND' , CHILD_ID = CATCHCN, RC=STATUS )
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'IRRG_RATE_TOT' , CHILD_ID = CATCHCN, RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SNOLAND' , CHILD_ID = CATCHCN, RC=STATUS )
VERIFY_(STATUS)
Expand Down
60 changes: 30 additions & 30 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,35 +771,35 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'SPRINKLERRATE' ,&
LONG_NAME = 'sprinkler_irrigation_rate' ,&
SHORT_NAME = 'IRRG_RATE_SPR' ,&
LONG_NAME = 'irrigation_flux_sprinkler' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'DRIPRATE' ,&
LONG_NAME = 'drip_irrigation_rate' ,&
SHORT_NAME = 'IRRG_RATE_DRP' ,&
LONG_NAME = 'irrigation_flux_drip' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'FURROWRATE' ,&
LONG_NAME = 'furrow_irrigation_rate' ,&
SHORT_NAME = 'IRRG_RATE_FRW' ,&
LONG_NAME = 'irrigation_flux_furrow' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'FLOODRATE' ,&
LONG_NAME = 'flood_irrigation_rate' ,&
SHORT_NAME = 'IRRG_RATE_PDY' ,&
LONG_NAME = 'irrigation_flux_paddy' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
Expand Down Expand Up @@ -2879,8 +2879,8 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'IRRLAND', &
LONG_NAME = 'Total_irrigation_land', &
SHORT_NAME = 'IRRG_RATE_TOT', &
LONG_NAME = 'irrigation_flux_total', &
UNITS = 'kg m-2 s-1', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -4527,10 +4527,10 @@ subroutine Driver ( RC )
real, dimension(:), pointer :: GRN
real, dimension(:), pointer :: ASCATZ0
real, dimension(:), pointer :: NDVI
real, dimension(:), pointer :: SPRINKLERRATE
real, dimension(:), pointer :: DRIPRATE
real, dimension(:), pointer :: FURROWRATE
real, dimension(:), pointer :: FLOODRATE
real, dimension(:), pointer :: IRRG_RATE_SPR
real, dimension(:), pointer :: IRRG_RATE_DRP
real, dimension(:), pointer :: IRRG_RATE_FRW
real, dimension(:), pointer :: IRRG_RATE_PDY
real, dimension(:,:), pointer :: DUDP
real, dimension(:,:), pointer :: DUSV
real, dimension(:,:), pointer :: DUWT
Expand Down Expand Up @@ -4716,7 +4716,7 @@ subroutine Driver ( RC )

real, dimension(:), pointer :: EVLAND
real, dimension(:), pointer :: PRLAND
real, dimension(:), pointer :: IRRLAND
real, dimension(:), pointer :: IRRG_RATE_TOT
real, dimension(:), pointer :: SNOLAND
real, dimension(:), pointer :: DRPARLAND
real, dimension(:), pointer :: DFPARLAND
Expand Down Expand Up @@ -5185,10 +5185,10 @@ subroutine Driver ( RC )
call MAPL_GetPointer(IMPORT,SSSV ,'SSSV' ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,SSWT ,'SSWT' ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,SSSD ,'SSSD' ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,SPRINKLERRATE,'SPRINKLERRATE',RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,DRIPRATE,'DRIPRATE' ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,FLOODRATE,'FLOODRATE' ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,FURROWRATE,'FURROWRATE' ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,IRRG_RATE_SPR,'IRRG_RATE_SPR',RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,IRRG_RATE_DRP,'IRRG_RATE_DRP',RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,IRRG_RATE_PDY,'IRRG_RATE_PDY',RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT,IRRG_RATE_FRW,'IRRG_RATE_FRW',RC=STATUS); VERIFY_(STATUS)

! -----------------------------------------------------
! INTERNAL Pointers
Expand Down Expand Up @@ -5357,7 +5357,7 @@ subroutine Driver ( RC )
call MAPL_GetPointer(EXPORT,SNOWDP, 'SNOWDP' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT,EVLAND, 'EVLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT,PRLAND, 'PRLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT,IRRLAND,'IRRLAND', RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT,IRRG_RATE_TOT,'IRRG_RATE_TOT', RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT,SNOLAND, 'SNOLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT,DRPARLAND, 'DRPARLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT,DFPARLAND, 'DFPARLAND' , RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -6965,17 +6965,17 @@ subroutine Driver ( RC )
! --------------------------------------------------------------------------

IF ((catchcn_internal%RUN_IRRIG /= 0)) THEN
where (SPRINKLERRATE > 0)
PLS_IN = PLS_IN + SPRINKLERRATE
where (IRRG_RATE_SPR > 0)
PLS_IN = PLS_IN + IRRG_RATE_SPR
end where
where (DRIPRATE > 0)
RZEXC = RZEXC + DRIPRATE*DT
where (IRRG_RATE_DRP > 0)
RZEXC = RZEXC + IRRG_RATE_DRP * DT
end where
where (FLOODRATE > 0)
SRFEXC = SRFEXC + FLOODRATE*DT
where (IRRG_RATE_PDY > 0)
SRFEXC = SRFEXC + IRRG_RATE_PDY * DT
end where
where (FURROWRATE > 0)
RZEXC = RZEXC + FURROWRATE*DT
where (IRRG_RATE_FRW > 0)
RZEXC = RZEXC + IRRG_RATE_FRW * DT
end where
ENDIF
#ifdef DBG_CNLSM_INPUTS
Expand Down Expand Up @@ -7397,8 +7397,8 @@ subroutine Driver ( RC )
if(associated( WCPR )) WCPR = PRMC
if(associated( ACCUM)) ACCUM = SLDTOT - EVPICE*(1./MAPL_ALHS) - SMELT
if(associated(PRLAND)) PRLAND = PCU+PLS+SLDTOT
if(associated(IRRLAND)) then
if (catchcn_internal%RUN_IRRIG /= 0) IRRLAND = SPRINKLERRATE + FURROWRATE + FLOODRATE + DRIPRATE
if(associated(IRRG_RATE_TOT)) then
if (catchcn_internal%RUN_IRRIG /= 0) IRRG_RATE_TOT = IRRG_RATE_SPR + IRRG_RATE_FRW + IRRG_RATE_PDY + IRRG_RATE_DRP
endif
if(associated(SNOLAND)) SNOLAND = SLDTOT
if(associated(EVPSNO)) EVPSNO = EVPICE
Expand Down
Loading

0 comments on commit 9486c7d

Please sign in to comment.