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

Auto PR - develop → MAPL-v3 - new export spurious latent land (SPLH=LHACC); edited long names of EVLAND and spurious land terms #967

Merged
merged 21 commits into from
Jul 31, 2024
Merged

Auto PR - develop → MAPL-v3 - new export spurious latent land (SPLH=LHACC); edited long names of EVLAND and spurious land terms #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
afdc6ad
new export spurious latent land (SPLH=LHACC); edited long names of EV…
gmao-rreichle Jun 28, 2024
d95a4a1
fix units
biljanaorescanin Jul 5, 2024
96237cf
try #2 to change units
biljanaorescanin Jul 12, 2024
db47572
Merge branch 'develop' into feature/rreichle/land_balances
biljanaorescanin Jul 12, 2024
bc3ff00
revised treatment of latent heat "accounting" term (LHACC) (catchment…
gmao-rreichle Jul 15, 2024
6ccc43a
fix syntax error from previous commit (GEOS_CatchGridComp.F90)
gmao-rreichle Jul 15, 2024
546c562
fix units error in previous commit (catchment.F90)
gmao-rreichle Jul 15, 2024
3f27538
added correction of EVPICE that was missing in earlier commit (GEOS_C…
gmao-rreichle Jul 15, 2024
68bd386
revised approach to "accounting" terms for surface turbulent fluxes
gmao-rreichle Jul 18, 2024
0664234
undoing rename of SPLAND and SPWATR
gmao-rreichle Jul 18, 2024
3170ced
fixed syntax error in previous commit (GEOS_SurfaceGridComp.F90)
gmao-rreichle Jul 18, 2024
f8503ed
added documentation of variable names for surface turbulent fluxes; r…
gmao-rreichle Jul 22, 2024
82b359f
clarified long name of HLATN / LHFX latent heat exports (GEOS_CatchGr…
gmao-rreichle Jul 22, 2024
6831b37
additional clarification of long names for surface turbulent flux exp…
gmao-rreichle Jul 22, 2024
c051219
removed execute permissions from GEOS_CatchGridComp.F90
gmao-rreichle Jul 22, 2024
feb6d1d
additional corrections to long names of longwave exports (apparently …
gmao-rreichle Jul 23, 2024
9e8d76c
added minor comment (catchment.F90)
gmao-rreichle Jul 23, 2024
d987fb9
Fixes for Ninja builds
mathomp4 Jul 30, 2024
652182b
Merge pull request #957 from GEOS-ESM/feature/rreichle/land_balances
sdrabenh Jul 31, 2024
b4c2da1
Merge branch 'develop' into feature/mathomp4/fix-for-ninja
sdrabenh Jul 31, 2024
95b31b7
Merge pull request #966 from GEOS-ESM/feature/mathomp4/fix-for-ninja
mathomp4 Jul 31, 2024
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
48 changes: 36 additions & 12 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90
View file
Open in desktop
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
Open in desktop
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
Loading