Skip to content

Commit cd45a6c

Browse files
committed
restored GEOS_LakeGridComp.F90 from develop (to avoid the non-0-diff changes that come with the revisions of GEOS_LakeGridComp.F90)
1 parent 291482a commit cd45a6c

File tree

1 file changed

+3
-26
lines changed

1 file changed

+3
-26
lines changed

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlake_GridComp/GEOS_LakeGridComp.F90

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -742,25 +742,6 @@ subroutine SetServices ( GC, RC )
742742
RC=STATUS )
743743
VERIFY_(STATUS)
744744

745-
call MAPL_AddImportSpec(GC, &
746-
LONG_NAME = 'icefall', &
747-
UNITS = 'kg m-2 s-1', &
748-
SHORT_NAME = 'ICE', &
749-
DIMS = MAPL_DimsTileOnly, &
750-
VLOCATION = MAPL_VLocationNone, &
751-
RC=STATUS )
752-
753-
VERIFY_(STATUS)
754-
755-
call MAPL_AddImportSpec(GC, &
756-
LONG_NAME = 'freezing_rain_fall', &
757-
UNITS = 'kg m-2 s-1', &
758-
SHORT_NAME = 'FRZR', &
759-
DIMS = MAPL_DimsTileOnly, &
760-
VLOCATION = MAPL_VLocationNone, &
761-
RC=STATUS )
762-
VERIFY_(STATUS)
763-
764745
call MAPL_AddImportSpec(GC, &
765746
LONG_NAME = 'liquid_water_convective_precipitation', &
766747
UNITS = 'kg m-2 s-1', &
@@ -1538,9 +1519,7 @@ subroutine LAKECORE(NT,RC)
15381519
real, pointer, dimension(:) :: SH
15391520
real, pointer, dimension(:) :: DEV
15401521
real, pointer, dimension(:) :: DSH
1541-
real, pointer, dimension(:) :: SNO
1542-
real, pointer, dimension(:) :: ICEF
1543-
real, pointer, dimension(:) :: FRZR
1522+
real, pointer, dimension(:) :: SNO
15441523
real, pointer, dimension(:) :: PCU
15451524
real, pointer, dimension(:) :: PLS
15461525
real, pointer, dimension(:) :: PS
@@ -1615,8 +1594,6 @@ subroutine LAKECORE(NT,RC)
16151594
call MAPL_GetPointer(IMPORT,DEV , 'DEVAP' , RC=STATUS); VERIFY_(STATUS)
16161595
call MAPL_GetPointer(IMPORT,DSH , 'DSH' , RC=STATUS); VERIFY_(STATUS)
16171596
call MAPL_GetPointer(IMPORT,SNO , 'SNO' , RC=STATUS); VERIFY_(STATUS)
1618-
call MAPL_GetPointer(IMPORT,ICEF , 'ICE' , RC=STATUS); VERIFY_(STATUS)
1619-
call MAPL_GetPointer(IMPORT,FRZR , 'FRZR' , RC=STATUS); VERIFY_(STATUS)
16201597
call MAPL_GetPointer(IMPORT,PCU , 'PCU' , RC=STATUS); VERIFY_(STATUS)
16211598
call MAPL_GetPointer(IMPORT,PLS , 'PLS' , RC=STATUS); VERIFY_(STATUS)
16221599
call MAPL_GetPointer(IMPORT,PS , 'PS' , RC=STATUS); VERIFY_(STATUS)
@@ -1848,7 +1825,7 @@ subroutine LAKECORE(NT,RC)
18481825
DTX = (DT/LAKECAP)*FR(:,N) ! FR accounts for skin under ice
18491826
SWN = (1.-ALBVRO)*VSUVR + (1.-ALBVFO)*VSUVF + &
18501827
(1.-ALBNRO)*DRNIR + (1.-ALBNFO)*DFNIR
1851-
DTS = DTX * ( DTS + SWN - EVP*MAPL_ALHL - MAPL_ALHF*(SNO + ICEF) ) !include icefall with snow for energy needed to melt
1828+
DTS = DTX * ( DTS + SWN - EVP*MAPL_ALHL - MAPL_ALHF*SNO )
18521829
DTS = DTS / ( 1.0 + DTX*(BLW + SHD + EVD*MAPL_ALHL) )
18531830
EVP = EVP + EVD * DTS
18541831
SHF = SHF + SHD * DTS
@@ -1865,7 +1842,7 @@ subroutine LAKECORE(NT,RC)
18651842
if(associated(SUBLIM)) SUBLIM = EVP*FR(:,N)
18661843
end if
18671844

1868-
RNF = PCU + PLS + SNO + ICEF - EVP !Supercooled rainfall (FRZR is included in PCU + PLS as of June 2025 github pull request #111)
1845+
RNF = PCU + PLS + SNO - EVP
18691846

18701847
! Update surface temperature and moisture
18711848
!----------------------------------------

0 commit comments

Comments
 (0)