Skip to content

Commit

Permalink
Merge pull request #971 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history 
Sync develop into main
  • Loading branch information
@sdrabenh
sdrabenh authored Aug 1, 2024
2 parents 68afe5e + 95b31b7 commit 62d7a86
Show file tree
Hide file tree
Showing 23 changed files with 1,859 additions and 331 deletions.
48 changes: 36 additions & 12 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1621,7 +1621,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'interception_loss_energy_flux',&
LONG_NAME = 'interception_loss_latent_heat_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'EVPINT' ,&
DIMS = MAPL_DimsHorzOnly ,&
Expand All @@ -1630,7 +1630,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'baresoil_evap_energy_flux' ,&
LONG_NAME = 'baresoil_evaporation_latent_heat_flux' ,&
UNITS = 'W m-2' ,&
SHORT_NAME = 'EVPSOI' ,&
DIMS = MAPL_DimsHorzOnly ,&
Expand All @@ -1639,7 +1639,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'transpiration_energy_flux' ,&
LONG_NAME = 'transpiration_latent_heat_flux' ,&
UNITS = 'W m-2' ,&
SHORT_NAME = 'EVPVEG' ,&
DIMS = MAPL_DimsHorzOnly ,&
Expand All @@ -1648,7 +1648,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'snow_ice_evaporation_energy_flux',&
LONG_NAME = 'snowpack_evaporation_latent_heat_flux_on_land',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'EVPICE' ,&
DIMS = MAPL_DimsHorzOnly ,&
Expand All @@ -1657,7 +1657,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'snowpack_evaporation_energy_flux',&
LONG_NAME = 'snowpack_evaporation_latent_heat_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'EVPSNO' ,&
DIMS = MAPL_DimsHorzOnly ,&
Expand Down Expand Up @@ -1712,7 +1712,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'EVLAND', &
LONG_NAME = 'Evaporation_land', &
LONG_NAME = 'Total_evapotranspiration_land', &
UNITS = 'kg m-2 s-1', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -1954,17 +1954,26 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'SPLAND', &
LONG_NAME = 'rate_of_spurious_land_energy_source',&
SHORT_NAME = 'SPLAND', & ! a.k.a. SPSHLAND
LONG_NAME = 'Spurious_sensible_heat_flux_land',&
UNITS = 'W m-2', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'SPWATR', &
LONG_NAME = 'rate_of_spurious_land_water_source',&
SHORT_NAME = 'SPLH', &
LONG_NAME = 'Spurious_latent_heat_flux_land',&
UNITS = 'W m-2', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'SPWATR', & ! a.k.a. SPEVLAND
LONG_NAME = 'Spurious_evapotranspiration_flux_land',&
UNITS = 'kg m-2 s-1', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand All @@ -1973,7 +1982,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'SPSNOW', &
LONG_NAME = 'rate_of_spurious_snow_energy',&
LONG_NAME = 'Spurious_snow_energy_flux_land',&
UNITS = 'W m-2', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -2017,7 +2026,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'total_latent_energy_flux' ,&
LONG_NAME = 'total_latent_heat_flux_consistent_with_evaporation_from_turbulence' ,&
UNITS = 'W m-2' ,&
SHORT_NAME = 'LHFX' ,&
DIMS = MAPL_DimsHorzOnly ,&
Expand Down Expand Up @@ -5425,6 +5434,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
real, pointer, dimension(:,:) :: DWLAND => NULL()
real, pointer, dimension(:,:) :: DHLAND => NULL()
real, pointer, dimension(:,:) :: SPLAND => NULL()
real, pointer, dimension(:,:) :: SPLH => NULL()
real, pointer, dimension(:,:) :: SPWATR => NULL()
real, pointer, dimension(:,:) :: SPSNOW => NULL()
real, pointer, dimension(:,:) :: RCU => NULL()
Expand Down Expand Up @@ -5727,6 +5737,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
real, pointer, dimension(:) :: DWLANDTILE => NULL()
real, pointer, dimension(:) :: DHLANDTILE => NULL()
real, pointer, dimension(:) :: SPLANDTILE => NULL()
real, pointer, dimension(:) :: SPLHTILE => NULL()
real, pointer, dimension(:) :: SPWATRTILE => NULL()
real, pointer, dimension(:) :: SPSNOWTILE => NULL()
real, pointer, dimension(:,:) :: RDU001TILE => NULL()
Expand Down Expand Up @@ -6593,6 +6604,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
call MAPL_GetPointer(EXPORT , DWLAND , 'DWLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT , DHLAND , 'DHLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT , SPLAND , 'SPLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT , SPLH , 'SPLH' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT , SPWATR , 'SPWATR' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT , SPSNOW , 'SPSNOW' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT , RDU001 , 'RDU001' , RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -7201,6 +7213,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
call MKTILE(DWLAND ,DWLANDTILE ,NT,RC=STATUS); VERIFY_(STATUS)
call MKTILE(DHLAND ,DHLANDTILE ,NT,RC=STATUS); VERIFY_(STATUS)
call MKTILE(SPLAND ,SPLANDTILE ,NT,RC=STATUS); VERIFY_(STATUS)
call MKTILE(SPLH ,SPLHTILE ,NT,RC=STATUS); VERIFY_(STATUS)
call MKTILE(SPWATR ,SPWATRTILE ,NT,RC=STATUS); VERIFY_(STATUS)
call MKTILE(SPSNOW ,SPSNOWTILE ,NT,RC=STATUS); VERIFY_(STATUS)
call MKTILE(RDU001 ,RDU001TILE ,NT,RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -8078,6 +8091,10 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
call MAPL_LocStreamTransform( LOCSTREAM,SPLAND,SPLANDTILE, RC=STATUS)
VERIFY_(STATUS)
endif
if(associated(SPLH )) then
call MAPL_LocStreamTransform( LOCSTREAM,SPLH ,SPLHTILE , RC=STATUS)
VERIFY_(STATUS)
endif
if(associated(SPWATR)) then
call MAPL_LocStreamTransform( LOCSTREAM,SPWATR,SPWATRTILE, RC=STATUS)
VERIFY_(STATUS)
Expand Down Expand Up @@ -8732,6 +8749,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
if(associated(DWLANDTILE )) deallocate(DWLANDTILE )
if(associated(DHLANDTILE )) deallocate(DHLANDTILE )
if(associated(SPLANDTILE )) deallocate(SPLANDTILE )
if(associated(SPLHTILE )) deallocate(SPLHTILE )
if(associated(SPWATRTILE )) deallocate(SPWATRTILE )
if(associated(SPSNOWTILE )) deallocate(SPSNOWTILE )
if(associated(RDU001TILE )) deallocate(RDU001TILE )
Expand Down Expand Up @@ -9044,6 +9062,8 @@ subroutine DOTYPE(type,RC)
VERIFY_(STATUS)
call MAPL_GetPointer(GEX(type), dum, 'SPLAND' , ALLOC=associated(SPLANDTILE ), notFoundOK=.true., RC=STATUS)
VERIFY_(STATUS)
call MAPL_GetPointer(GEX(type), dum, 'SPLH' , ALLOC=associated(SPLHTILE ), notFoundOK=.true., RC=STATUS)
VERIFY_(STATUS)
call MAPL_GetPointer(GEX(type), dum, 'SPWATR' , ALLOC=associated(SPWATRTILE ), notFoundOK=.true., RC=STATUS)
VERIFY_(STATUS)
call MAPL_GetPointer(GEX(type), dum, 'SPSNOW' , ALLOC=associated(SPSNOWTILE ), notFoundOK=.true., RC=STATUS)
Expand Down Expand Up @@ -9684,6 +9704,10 @@ subroutine DOTYPE(type,RC)
call FILLOUT_TILE(GEX(type), 'SPLAND', SPLANDTILE, XFORM, RC=STATUS)
VERIFY_(STATUS)
end if
if(associated(SPLHTILE )) then
call FILLOUT_TILE(GEX(type), 'SPLH' , SPLHTILE, XFORM, RC=STATUS)
VERIFY_(STATUS)
end if
if(associated(SPWATRTILE)) then
call FILLOUT_TILE(GEX(type), 'SPWATR', SPWATRTILE, XFORM, RC=STATUS)
VERIFY_(STATUS)
Expand Down
12 changes: 10 additions & 2 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 @@ -655,6 +655,11 @@ subroutine SetServices ( GC, RC )
CHILD_ID = CATCH(1), &
RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, &
SHORT_NAME = 'SPLH', &
CHILD_ID = CATCH(1), &
RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, &
SHORT_NAME = 'SPWATR', &
CHILD_ID = CATCH(1), &
Expand Down Expand Up @@ -1114,9 +1119,12 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'DHLAND' , CHILD_ID = CATCHCN(1), RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPLAND' , CHILD_ID = CATCHCN(1), RC=STATUS )
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPLAND' , CHILD_ID = CATCHCN(1), RC=STATUS ) ! a.k.a. SPSHLAND
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPWATR' , CHILD_ID = CATCHCN(1), RC=STATUS )
! will need later for CatchCN:
! call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPLH' , CHILD_ID = CATCHCN(1), RC=STATUS )
! VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPWATR' , CHILD_ID = CATCHCN(1), RC=STATUS ) ! a.k.a. SPEVLAND
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPSNOW' , CHILD_ID = CATCHCN(1), RC=STATUS )
VERIFY_(STATUS)
Expand Down
Loading

0 comments on commit 62d7a86

Please sign in to comment.