Skip to content

Commit b4c2da1

Browse files
sdrabenhsdrabenh
authored
Merge branch 'develop' into feature/mathomp4/fix-for-ninja
2 parents d987fb9 + 652182b commit b4c2da1

File tree

5 files changed

+194
-102
lines changed

5 files changed

+194
-102
lines changed

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ subroutine SetServices ( GC, RC )
16211621
VERIFY_(STATUS)
16221622

16231623
call MAPL_AddExportSpec(GC, &
1624-
LONG_NAME = 'interception_loss_energy_flux',&
1624+
LONG_NAME = 'interception_loss_latent_heat_flux',&
16251625
UNITS = 'W m-2' ,&
16261626
SHORT_NAME = 'EVPINT' ,&
16271627
DIMS = MAPL_DimsHorzOnly ,&
@@ -1630,7 +1630,7 @@ subroutine SetServices ( GC, RC )
16301630
VERIFY_(STATUS)
16311631

16321632
call MAPL_AddExportSpec(GC, &
1633-
LONG_NAME = 'baresoil_evap_energy_flux' ,&
1633+
LONG_NAME = 'baresoil_evaporation_latent_heat_flux' ,&
16341634
UNITS = 'W m-2' ,&
16351635
SHORT_NAME = 'EVPSOI' ,&
16361636
DIMS = MAPL_DimsHorzOnly ,&
@@ -1639,7 +1639,7 @@ subroutine SetServices ( GC, RC )
16391639
VERIFY_(STATUS)
16401640

16411641
call MAPL_AddExportSpec(GC, &
1642-
LONG_NAME = 'transpiration_energy_flux' ,&
1642+
LONG_NAME = 'transpiration_latent_heat_flux' ,&
16431643
UNITS = 'W m-2' ,&
16441644
SHORT_NAME = 'EVPVEG' ,&
16451645
DIMS = MAPL_DimsHorzOnly ,&
@@ -1648,7 +1648,7 @@ subroutine SetServices ( GC, RC )
16481648
VERIFY_(STATUS)
16491649

16501650
call MAPL_AddExportSpec(GC, &
1651-
LONG_NAME = 'snow_ice_evaporation_energy_flux',&
1651+
LONG_NAME = 'snowpack_evaporation_latent_heat_flux_on_land',&
16521652
UNITS = 'W m-2' ,&
16531653
SHORT_NAME = 'EVPICE' ,&
16541654
DIMS = MAPL_DimsHorzOnly ,&
@@ -1657,7 +1657,7 @@ subroutine SetServices ( GC, RC )
16571657
VERIFY_(STATUS)
16581658

16591659
call MAPL_AddExportSpec(GC, &
1660-
LONG_NAME = 'snowpack_evaporation_energy_flux',&
1660+
LONG_NAME = 'snowpack_evaporation_latent_heat_flux',&
16611661
UNITS = 'W m-2' ,&
16621662
SHORT_NAME = 'EVPSNO' ,&
16631663
DIMS = MAPL_DimsHorzOnly ,&
@@ -1712,7 +1712,7 @@ subroutine SetServices ( GC, RC )
17121712

17131713
call MAPL_AddExportSpec(GC, &
17141714
SHORT_NAME = 'EVLAND', &
1715-
LONG_NAME = 'Evaporation_land', &
1715+
LONG_NAME = 'Total_evapotranspiration_land', &
17161716
UNITS = 'kg m-2 s-1', &
17171717
DIMS = MAPL_DimsHorzOnly, &
17181718
VLOCATION = MAPL_VLocationNone, &
@@ -1954,17 +1954,26 @@ subroutine SetServices ( GC, RC )
19541954
VERIFY_(STATUS)
19551955

19561956
call MAPL_AddExportSpec(GC, &
1957-
SHORT_NAME = 'SPLAND', &
1958-
LONG_NAME = 'rate_of_spurious_land_energy_source',&
1957+
SHORT_NAME = 'SPLAND', & ! a.k.a. SPSHLAND
1958+
LONG_NAME = 'Spurious_sensible_heat_flux_land',&
19591959
UNITS = 'W m-2', &
19601960
DIMS = MAPL_DimsHorzOnly, &
19611961
VLOCATION = MAPL_VLocationNone, &
19621962
RC=STATUS )
19631963
VERIFY_(STATUS)
19641964

19651965
call MAPL_AddExportSpec(GC, &
1966-
SHORT_NAME = 'SPWATR', &
1967-
LONG_NAME = 'rate_of_spurious_land_water_source',&
1966+
SHORT_NAME = 'SPLH', &
1967+
LONG_NAME = 'Spurious_latent_heat_flux_land',&
1968+
UNITS = 'W m-2', &
1969+
DIMS = MAPL_DimsHorzOnly, &
1970+
VLOCATION = MAPL_VLocationNone, &
1971+
RC=STATUS )
1972+
VERIFY_(STATUS)
1973+
1974+
call MAPL_AddExportSpec(GC, &
1975+
SHORT_NAME = 'SPWATR', & ! a.k.a. SPEVLAND
1976+
LONG_NAME = 'Spurious_evapotranspiration_flux_land',&
19681977
UNITS = 'kg m-2 s-1', &
19691978
DIMS = MAPL_DimsHorzOnly, &
19701979
VLOCATION = MAPL_VLocationNone, &
@@ -1973,7 +1982,7 @@ subroutine SetServices ( GC, RC )
19731982

19741983
call MAPL_AddExportSpec(GC, &
19751984
SHORT_NAME = 'SPSNOW', &
1976-
LONG_NAME = 'rate_of_spurious_snow_energy',&
1985+
LONG_NAME = 'Spurious_snow_energy_flux_land',&
19771986
UNITS = 'W m-2', &
19781987
DIMS = MAPL_DimsHorzOnly, &
19791988
VLOCATION = MAPL_VLocationNone, &
@@ -2017,7 +2026,7 @@ subroutine SetServices ( GC, RC )
20172026
VERIFY_(STATUS)
20182027

20192028
call MAPL_AddExportSpec(GC, &
2020-
LONG_NAME = 'total_latent_energy_flux' ,&
2029+
LONG_NAME = 'total_latent_heat_flux_consistent_with_evaporation_from_turbulence' ,&
20212030
UNITS = 'W m-2' ,&
20222031
SHORT_NAME = 'LHFX' ,&
20232032
DIMS = MAPL_DimsHorzOnly ,&
@@ -5425,6 +5434,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
54255434
real, pointer, dimension(:,:) :: DWLAND => NULL()
54265435
real, pointer, dimension(:,:) :: DHLAND => NULL()
54275436
real, pointer, dimension(:,:) :: SPLAND => NULL()
5437+
real, pointer, dimension(:,:) :: SPLH => NULL()
54285438
real, pointer, dimension(:,:) :: SPWATR => NULL()
54295439
real, pointer, dimension(:,:) :: SPSNOW => NULL()
54305440
real, pointer, dimension(:,:) :: RCU => NULL()
@@ -5727,6 +5737,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
57275737
real, pointer, dimension(:) :: DWLANDTILE => NULL()
57285738
real, pointer, dimension(:) :: DHLANDTILE => NULL()
57295739
real, pointer, dimension(:) :: SPLANDTILE => NULL()
5740+
real, pointer, dimension(:) :: SPLHTILE => NULL()
57305741
real, pointer, dimension(:) :: SPWATRTILE => NULL()
57315742
real, pointer, dimension(:) :: SPSNOWTILE => NULL()
57325743
real, pointer, dimension(:,:) :: RDU001TILE => NULL()
@@ -6593,6 +6604,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
65936604
call MAPL_GetPointer(EXPORT , DWLAND , 'DWLAND' , RC=STATUS); VERIFY_(STATUS)
65946605
call MAPL_GetPointer(EXPORT , DHLAND , 'DHLAND' , RC=STATUS); VERIFY_(STATUS)
65956606
call MAPL_GetPointer(EXPORT , SPLAND , 'SPLAND' , RC=STATUS); VERIFY_(STATUS)
6607+
call MAPL_GetPointer(EXPORT , SPLH , 'SPLH' , RC=STATUS); VERIFY_(STATUS)
65966608
call MAPL_GetPointer(EXPORT , SPWATR , 'SPWATR' , RC=STATUS); VERIFY_(STATUS)
65976609
call MAPL_GetPointer(EXPORT , SPSNOW , 'SPSNOW' , RC=STATUS); VERIFY_(STATUS)
65986610
call MAPL_GetPointer(EXPORT , RDU001 , 'RDU001' , RC=STATUS); VERIFY_(STATUS)
@@ -7201,6 +7213,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
72017213
call MKTILE(DWLAND ,DWLANDTILE ,NT,RC=STATUS); VERIFY_(STATUS)
72027214
call MKTILE(DHLAND ,DHLANDTILE ,NT,RC=STATUS); VERIFY_(STATUS)
72037215
call MKTILE(SPLAND ,SPLANDTILE ,NT,RC=STATUS); VERIFY_(STATUS)
7216+
call MKTILE(SPLH ,SPLHTILE ,NT,RC=STATUS); VERIFY_(STATUS)
72047217
call MKTILE(SPWATR ,SPWATRTILE ,NT,RC=STATUS); VERIFY_(STATUS)
72057218
call MKTILE(SPSNOW ,SPSNOWTILE ,NT,RC=STATUS); VERIFY_(STATUS)
72067219
call MKTILE(RDU001 ,RDU001TILE ,NT,RC=STATUS); VERIFY_(STATUS)
@@ -8078,6 +8091,10 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
80788091
call MAPL_LocStreamTransform( LOCSTREAM,SPLAND,SPLANDTILE, RC=STATUS)
80798092
VERIFY_(STATUS)
80808093
endif
8094+
if(associated(SPLH )) then
8095+
call MAPL_LocStreamTransform( LOCSTREAM,SPLH ,SPLHTILE , RC=STATUS)
8096+
VERIFY_(STATUS)
8097+
endif
80818098
if(associated(SPWATR)) then
80828099
call MAPL_LocStreamTransform( LOCSTREAM,SPWATR,SPWATRTILE, RC=STATUS)
80838100
VERIFY_(STATUS)
@@ -8732,6 +8749,7 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
87328749
if(associated(DWLANDTILE )) deallocate(DWLANDTILE )
87338750
if(associated(DHLANDTILE )) deallocate(DHLANDTILE )
87348751
if(associated(SPLANDTILE )) deallocate(SPLANDTILE )
8752+
if(associated(SPLHTILE )) deallocate(SPLHTILE )
87358753
if(associated(SPWATRTILE )) deallocate(SPWATRTILE )
87368754
if(associated(SPSNOWTILE )) deallocate(SPSNOWTILE )
87378755
if(associated(RDU001TILE )) deallocate(RDU001TILE )
@@ -9044,6 +9062,8 @@ subroutine DOTYPE(type,RC)
90449062
VERIFY_(STATUS)
90459063
call MAPL_GetPointer(GEX(type), dum, 'SPLAND' , ALLOC=associated(SPLANDTILE ), notFoundOK=.true., RC=STATUS)
90469064
VERIFY_(STATUS)
9065+
call MAPL_GetPointer(GEX(type), dum, 'SPLH' , ALLOC=associated(SPLHTILE ), notFoundOK=.true., RC=STATUS)
9066+
VERIFY_(STATUS)
90479067
call MAPL_GetPointer(GEX(type), dum, 'SPWATR' , ALLOC=associated(SPWATRTILE ), notFoundOK=.true., RC=STATUS)
90489068
VERIFY_(STATUS)
90499069
call MAPL_GetPointer(GEX(type), dum, 'SPSNOW' , ALLOC=associated(SPSNOWTILE ), notFoundOK=.true., RC=STATUS)
@@ -9684,6 +9704,10 @@ subroutine DOTYPE(type,RC)
96849704
call FILLOUT_TILE(GEX(type), 'SPLAND', SPLANDTILE, XFORM, RC=STATUS)
96859705
VERIFY_(STATUS)
96869706
end if
9707+
if(associated(SPLHTILE )) then
9708+
call FILLOUT_TILE(GEX(type), 'SPLH' , SPLHTILE, XFORM, RC=STATUS)
9709+
VERIFY_(STATUS)
9710+
end if
96879711
if(associated(SPWATRTILE)) then
96889712
call FILLOUT_TILE(GEX(type), 'SPWATR', SPWATRTILE, XFORM, RC=STATUS)
96899713
VERIFY_(STATUS)

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOS_LandGridComp.F90‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,11 @@ subroutine SetServices ( GC, RC )
655655
CHILD_ID = CATCH(1), &
656656
RC=STATUS )
657657
VERIFY_(STATUS)
658+
call MAPL_AddExportSpec ( GC, &
659+
SHORT_NAME = 'SPLH', &
660+
CHILD_ID = CATCH(1), &
661+
RC=STATUS )
662+
VERIFY_(STATUS)
658663
call MAPL_AddExportSpec ( GC, &
659664
SHORT_NAME = 'SPWATR', &
660665
CHILD_ID = CATCH(1), &
@@ -1114,9 +1119,12 @@ subroutine SetServices ( GC, RC )
11141119
VERIFY_(STATUS)
11151120
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'DHLAND' , CHILD_ID = CATCHCN(1), RC=STATUS )
11161121
VERIFY_(STATUS)
1117-
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPLAND' , CHILD_ID = CATCHCN(1), RC=STATUS )
1122+
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPLAND' , CHILD_ID = CATCHCN(1), RC=STATUS ) ! a.k.a. SPSHLAND
11181123
VERIFY_(STATUS)
1119-
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPWATR' , CHILD_ID = CATCHCN(1), RC=STATUS )
1124+
! will need later for CatchCN:
1125+
! call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPLH' , CHILD_ID = CATCHCN(1), RC=STATUS )
1126+
! VERIFY_(STATUS)
1127+
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPWATR' , CHILD_ID = CATCHCN(1), RC=STATUS ) ! a.k.a. SPEVLAND
11201128
VERIFY_(STATUS)
11211129
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPSNOW' , CHILD_ID = CATCHCN(1), RC=STATUS )
11221130
VERIFY_(STATUS)

0 commit comments

Comments
 (0)