Skip to content

improve runoff distribution #1136

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

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

improve runoff distribution #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3a6e68c
disable RUNOFF in DataAtm; let DISCHARGE and CALVING propagate to be …
zhaobin74 Jul 9, 2025
5a8f7c5
add remapped friver and licalvf collections and provide DISCHARGE and…
zhaobin74 Jul 10, 2025
d31d62c
fixed a typo
zhaobin74 Jul 11, 2025
a7f5f53
claving causes huge frazil generation at isolated locations near ices…
zhaobin74 Jul 28, 2025
bb98b3f
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribu…
sdrabenh Aug 20, 2025
2327fd3
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribu…
mathomp4 Sep 11, 2025
3869f67
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribu…
mathomp4 Nov 21, 2025
5611f5b
Fix for gfortran
mathomp4 Nov 21, 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
12 changes: 2 additions & 10 deletions GEOSdataatm_GridComp/GEOS_DataAtmGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,6 @@ subroutine SetServices ( GC, RC )
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, __RC__)

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'RUNOFF', &
LONG_NAME = 'overland_runoff_including_throughflow', &
UNITS = 'kg m-2 s-1', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, __RC__)

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'PCU', &
LONG_NAME = 'convective_rainfall', &
Expand Down Expand Up @@ -462,7 +455,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
real, pointer, dimension(:,:) :: QA ! => null()
real, pointer, dimension(:,:) :: UA ! => null()
real, pointer, dimension(:,:) :: VA ! => null()
real, pointer, dimension(:,:) :: RUNOFF ! => null()
real, pointer, dimension(:,:) :: PCU ! => null()
real, pointer, dimension(:,:) :: PLS ! => null()
real, pointer, dimension(:,:) :: SNO ! => null()
Expand Down Expand Up @@ -606,8 +598,8 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
! River runoff
! call ReadForcingData(impName='DISCHARGE', frcName='RR', default=0., __RC__)
call MAPL_GetPointer(SurfImport, DISCHARGE, 'DISCHARGE', __RC__)
call MAPL_GetPointer(import, RUNOFF, 'RUNOFF', __RC__)
DISCHARGE=RUNOFF
! runoff is provided directly by Ocean Gc on the tripolar grid
DISCHARGE=0.0

!ALT: we should read topo, but for now over ocean this is fine
call SetVarToZero('PHIS', __RC__)
Expand Down
24 changes: 24 additions & 0 deletions GEOSdataatm_GridComp/JRA55-DO_DataAtm_Forcings_ExtData.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,24 @@ Collections:
friver_1_5_0_1:
template: ExtData/JRA55-DO/v1-5-0-1/friver/friver_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y40101-%y41231.nc
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
friver_remap_1_5_0:
template: ExtData/JRA55-DO/v1-5-0/friver_remap/%OCN_RES%/friver_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y40101-%y41231.nc
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
friver_remap_1_5_0_1:
template: ExtData/JRA55-DO/v1-5-0-1/friver_remap/%OCN_RES%/friver_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y40101-%y41231.nc
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
licalvf_1_5_0:
template: ExtData/JRA55-DO/v1-5-0/licalvf/licalvf_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y40101-%y41231.nc
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
licalvf_1_5_0_1:
template: ExtData/JRA55-DO/v1-5-0-1/licalvf/licalvf_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y40101-%y41231.nc
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
licalvf_remap_1_5_0:
template: ExtData/JRA55-DO/v1-5-0/licalvf_remap/%OCN_RES%/licalvf_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y40101-%y41231.nc
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
licalvf_remap_1_5_0_1:
template: ExtData/JRA55-DO/v1-5-0-1/licalvf_remap/%OCN_RES%/licalvf_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y40101-%y41231.nc
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
prra_1_5_0:
template: ExtData/JRA55-DO/v1-5-0/prra/prra_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010130-%y412312230.nc
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
Expand Down Expand Up @@ -91,6 +109,12 @@ Exports:
RUNOFF:
- {starting: "1958-01-01T00:00:00", collection: friver_1_5_0, regrid: CONSERVE, sample: river_conserve_sample, variable: friver}
- {starting: "2020-01-01T00:00:00", collection: friver_1_5_0_1, regrid: CONSERVE, sample: river_conserve_sample, variable: friver}
DISCHARGE:
- {starting: "1958-01-01T00:00:00", collection: friver_remap_1_5_0, regrid: NEAREST_STOD, sample: river_conserve_sample, variable: friver}
- {starting: "2020-01-01T00:00:00", collection: friver_remap_1_5_0_1, regrid: NEAREST_STOD, sample: river_conserve_sample, variable: friver}
CALVING: {collection: /dev/null}
# - {starting: "1958-01-01T00:00:00", collection: licalvf_remap_1_5_0, regrid: NEAREST_STOD, sample: river_conserve_sample, variable: licalvf}
# - {starting: "2020-01-01T00:00:00", collection: licalvf_remap_1_5_0_1, regrid: NEAREST_STOD, sample: river_conserve_sample, variable: licalvf}
PCU:
- {starting: "1958-01-01T00:00:00", collection: prra_1_5_0, regrid: CONSERVE, sample: flux_conserve_sample, variable: prra}
- {starting: "2020-01-01T00:00:00", collection: prra_1_5_0_1, regrid: CONSERVE, sample: flux_conserve_sample, variable: prra}
Expand Down
12 changes: 9 additions & 3 deletions GEOSogcm_GridComp/GEOS_OgcmGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,11 @@ subroutine SetServices ( GC, RC )
call MAPL_TerminateImport ( GC, ["DATA_KPAR "], [orad], RC=STATUS ) ! need to terminate others as well: cosz, discharge, frocean, pice, taux, tauy
endif
else
call MAPL_TerminateImport(GC, ['DATA_UW', 'DATA_VW'], [OCEAN, OCEAN], _RC)
if(DO_DATA_ATM4OCN) then
call MAPL_TerminateImport(GC, ['DATA_UW ', 'DATA_VW ', 'DISCHARGE', 'CALVING '], [OCEAN, OCEAN, OCEAN, OCEAN], _RC)
else
call MAPL_TerminateImport(GC, ['DATA_UW', 'DATA_VW'], [OCEAN, OCEAN], _RC)
endif
endif

! Set the Profiling timers
Expand Down Expand Up @@ -1824,8 +1828,10 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
VERIFY_(STATUS)

if(DO_DATASEAONLY==0) then
call MAPL_LocStreamTransform( ExchGrid, DISCHARGEO, DISCHARGE, RC=STATUS)
VERIFY_(STATUS)
if(.not. DO_DATA_ATM4OCN) then
call MAPL_LocStreamTransform( ExchGrid, DISCHARGEO, DISCHARGE, RC=STATUS)
VERIFY_(STATUS)
endif

PENUVRM= PENUVRO
PENUVFM= PENUVFO
Expand Down
Loading