Merge pull request #1136 from GEOS-ESM/feature/zhaobin74/improve-runoff-distribution

improve runoff distribution

Author: sdrabenh

GEOSdataatm_GridComp/GEOS_DataAtmGridComp.F90

@@ -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',     &
@@ -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()
@@ -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__)

GEOSdataatm_GridComp/JRA55-DO_DataAtm_Forcings_ExtData.yaml

@@ -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"
@@ -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}

GEOSogcm_GridComp/GEOS_OgcmGridComp.F90

@@ -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
@@ -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