Skip to content

Commit 68afe5e

Browse files
mathomp4mathomp4
authored
Merge pull request #949 from GEOS-ESM/develop
Sync develop into main
2 parents 3593b60 + 462d45d commit 68afe5e

File tree

19 files changed

+373
-225
lines changed

19 files changed

+373
-225
lines changed

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5186,8 +5186,8 @@ subroutine Driver ( RC )
51865186
call MAPL_Get ( MAPL ,&
51875187
RUNALARM = ALARM ,&
51885188
ORBIT = ORBIT ,&
5189-
TILELATS = LATS ,&
5190-
TILELONS = LONS ,&
5189+
TILELATS = LATS ,& ! [radians]
5190+
TILELONS = LONS ,& ! [radians]
51915191
INTERNAL_ESMF_STATE = INTERNAL ,&
51925192
RC=STATUS )
51935193
VERIFY_(STATUS)
@@ -7238,7 +7238,7 @@ subroutine Driver ( RC )
72387238

72397239
if (ntiles > 0) then
72407240

7241-
call CATCHCN ( NTILES, LONS, LATS, DT,catchcn_internal%USE_FWET_FOR_RUNOFF, &
7241+
call CATCHCN ( NTILES, LONS, LATS, DT,catchcn_internal%USE_FWET_FOR_RUNOFF, & ! LONS, LATS are in [radians] !!!
72427242
catchcn_internal%FWETC, catchcn_internal%FWETL, cat_id, VEG1,VEG2,FVEG1,FVEG2,DZSF ,&
72437243
PCU , PLSIN , SNO, ICE, FRZR ,&
72447244
UUU ,&

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5205,8 +5205,8 @@ subroutine Driver ( RC )
52055205
call MAPL_Get ( MAPL ,&
52065206
RUNALARM = ALARM ,&
52075207
ORBIT = ORBIT ,&
5208-
TILELATS = LATS ,&
5209-
TILELONS = LONS ,&
5208+
TILELATS = LATS ,& ! [radians]
5209+
TILELONS = LONS ,& ! [radians]
52105210
INTERNAL_ESMF_STATE = INTERNAL ,&
52115211
RC=STATUS )
52125212
VERIFY_(STATUS)
@@ -7518,7 +7518,7 @@ subroutine Driver ( RC )
75187518
! -----------------------
75197519
if (ntiles > 0) then
75207520

7521-
call CATCHCN ( NTILES, LONS, LATS, DT,catchcn_internal%USE_FWET_FOR_RUNOFF, &
7521+
call CATCHCN ( NTILES, LONS, LATS, DT,catchcn_internal%USE_FWET_FOR_RUNOFF, & ! LONS, LATS are in [radians] !!!
75227522
catchcn_internal%FWETC, catchcn_internal%FWETL, cat_id, VEG1,VEG2,FVEG1,FVEG2,DZSF ,&
75237523
PCU , PLSIN , SNO, ICE, FRZR ,&
75247524
UUU ,&

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ MODULE CATCHMENT_CN_MODEL
135135
! and the most recent version of the "unified" model (from Sept. 20, 2006).
136136

137137
SUBROUTINE CATCHCN ( &
138-
NCH, LONS, LATS, DTSTEP, UFW4RO, FWETC, FWETL, cat_id, &
138+
NCH, LONS, LATS, DTSTEP, UFW4RO, FWETC, FWETL, cat_id, & ! LONS, LATS are in [radians] !!!
139139
ITYP1,ITYP2,FVEG1,FVEG2, &
140140
DZSF, TRAINC,TRAINL, TSNOW, TICE, TFRZR, UM, &
141141
ETURB1, DEDQA1, DEDTC1, HSTURB1,DHSDQA1, DHSDTC1, &
@@ -870,6 +870,7 @@ SUBROUTINE CATCHCN ( &
870870
sumdepth=sum(sndz)
871871

872872
CALL StieglitzSnow_snowrt( &
873+
LONS(N), LATS(N), & ! in [radians] !!!
873874
N_sm, N_snow, MAPL_Land, & ! in
874875
CATCH_SNOW_MAXDEPTH, CATCH_SNOW_RHOFS, CATCH_SNOW_DZPARAM, & ! in
875876
t1, area, tkgnd, pr, snowf, ts, DTSTEP, & ! in

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4183,13 +4183,12 @@ subroutine Driver ( RC )
41834183
call MAPL_Get ( MAPL ,&
41844184
RUNALARM = ALARM ,&
41854185
ORBIT = ORBIT ,&
4186-
TILELATS = LATS ,&
4187-
TILELONS = LONS ,&
4186+
TILELATS = LATS ,& ! [radians]
4187+
TILELONS = LONS ,& ! [radians]
41884188
INTERNAL_ESMF_STATE = INTERNAL ,&
41894189
RC=STATUS )
41904190
VERIFY_(STATUS)
4191-
4192-
4191+
41934192
! --------------------------------------------------------------------------
41944193
! Get name of albedo files from configuration
41954194
! --------------------------------------------------------------------------
@@ -4631,7 +4630,7 @@ subroutine Driver ( RC )
46314630
! Catchment Id and vegetation types used to index into tables
46324631
! --------------------------------------------------------------------------
46334632

4634-
CAT_ID = 1
4633+
CAT_ID = -999 ! meaningless!!!
46354634
VEG = nint(ITY)
46364635

46374636
! --------------------------------------------------------------------------
@@ -5469,10 +5468,10 @@ subroutine Driver ( RC )
54695468

54705469
if (ntiles >0) then
54715470

5472-
call CATCHMENT ( NTILES, LONS, LATS ,&
5471+
call CATCHMENT ( NTILES, LONS, LATS ,& ! LONS, LATS are in [radians] !!!
54735472
DT,CATCH_INTERNAL_STATE%USE_FWET_FOR_RUNOFF ,&
54745473
CATCH_INTERNAL_STATE%FWETC, CATCH_INTERNAL_STATE%FWETL,&
5475-
cat_id, VEG, DZSF ,&
5474+
cat_id, VEG, DZSF ,& ! cat_id is set to no-data above !!!
54765475
PCU , PLS , SNO, ICE, FRZR ,&
54775476
UUU ,&
54785477

@@ -5582,7 +5581,7 @@ subroutine Driver ( RC )
55825581
currTime=CURRENT_TIME+DELT, &
55835582
RC=STATUS )
55845583
VERIFY_(STATUS)
5585-
5584+
55865585
ZTH = max(0.0,ZTH)
55875586

55885587
! --------------------------------------------------------------------------

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ MODULE CATCHMENT_MODEL
129129
CONTAINS
130130

131131
SUBROUTINE CATCHMENT ( &
132-
NCH, LONS, LATS, DTSTEP, UFW4RO, FWETC, FWETL, &
133-
cat_id,ITYP,DZSF,TRAINC,TRAINL, TSNOW, TICE, TFRZR, UM, &
132+
NCH, LONS, LATS, DTSTEP, UFW4RO, FWETC, FWETL, & ! LONS, LATS are in [radians] !!!
133+
cat_id,ITYP,DZSF,TRAINC,TRAINL, TSNOW, TICE, TFRZR, UM, & ! cat_id is set to no-data in GEOS_CatchGridcomp !!!
134134
ETURB1, DEDQA1, DEDTC1, HSTURB1,DHSDQA1, DHSDTC1, &
135135
ETURB2, DEDQA2, DEDTC2, HSTURB2,DHSDQA2, DHSDTC2, &
136136
ETURB4, DEDQA4, DEDTC4, HSTURB4,DHSDQA4, DHSDTC4, &
@@ -297,6 +297,8 @@ SUBROUTINE CATCHMENT ( &
297297
integer n_out
298298
integer n_outs(20)
299299

300+
! ---------------------------------
301+
300302
numout = 0
301303

302304
! choose output point by lon and lat Input lons and lats are in radians
@@ -911,8 +913,9 @@ SUBROUTINE CATCHMENT ( &
911913
tpsn1in(n) = tpsn1(n) ! tpsn1 is "intent(out)", should NOT be used here, use catch_calc_tpsnow instead? shouldn't this be the same as tcs_orig? - reichle, 8/8/2014
912914

913915
sumdepth=sum(sndz)
914-
916+
915917
CALL StieglitzSnow_snowrt( &
918+
LONS(N), LATS(N), & ! in [radians] !!!
916919
N_sm, N_snow, MAPL_Land, & ! in
917920
CATCH_SNOW_MAXDEPTH, CATCH_SNOW_RHOFS, CATCH_SNOW_DZPARAM, & ! in
918921
t1, area, tkgnd, pr, snowf, ts, DTSTEP, & ! in
@@ -924,8 +927,7 @@ SUBROUTINE CATCHMENT ( &
924927
EVSN, SHFLS, alhfsn, hcorr, ghfluxsno(n), & ! out
925928
sndzsc, wesnprec, sndzprec, sndz1perc, & ! out
926929
wesnperc, wesndens, wesnrepar, mltwtr, & ! out
927-
excs, drho0, wesnbot, tksno, dtss ) ! out
928-
930+
excs, drho0, wesnbot, tksno, dtss ) ! out
929931

930932
FICESOUT(:,N) = fices
931933

@@ -2938,8 +2940,6 @@ subroutine catch_calc_tsurf( NTILES, tc1, tc2, tc4, wesnn, htsnn, &
29382940

29392941
logical :: ice1, tzero
29402942

2941-
logical, parameter :: use_threshold_fac = .false.
2942-
29432943
! ------------------------------------------------------------------
29442944

29452945
! Compute tsurf excluding snow
@@ -2959,7 +2959,7 @@ subroutine catch_calc_tsurf( NTILES, tc1, tc2, tc4, wesnn, htsnn, &
29592959
! StieglitzSnow_calc_tpsnow() returns snow temperature in deg Celsius
29602960

29612961
call StieglitzSnow_calc_tpsnow( htsnn(1,n), wesnn(1,n), tpsn1, real_dummy, &
2962-
ice1, tzero, use_threshold_fac )
2962+
ice1, tzero, .false. )
29632963

29642964
tsurf(n) = (1. - asnow(n))*tsurf(n) + asnow(n)*(tpsn1 + TF)
29652965

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp/GEOS_LandIceGridComp.F90‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3086,7 +3086,8 @@ subroutine LANDICECORE(RC)
30863086
#endif
30873087
TKSNO = condice
30883088

3089-
call SNOWRT(1,NUM_SNOW_LAYERS,MAPL_LANDICE, & ! in
3089+
call SNOWRT( LONS(k), LATS(k), & ! in [radians] !!!
3090+
1,NUM_SNOW_LAYERS,MAPL_LANDICE, & ! in
30903091
MAXSNDZ, RHOFRESH, DZMAX, & ! in
30913092
LANDICELT(k),ZONEAREA,TKGND,PRECIP(k),SNO(k),TA(k),DT, & ! in
30923093
EVAPI(k),DEVAPDT(k),SHF(k),SHD(k),ULW(k),BLW(k), & ! in

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp.F90‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2704,9 +2704,13 @@ subroutine CICECORE(NT,RC)
27042704
DQS = GEOS_QSAT(TS(:,N), PS, RAMP=0.0, PASCALS=.TRUE.) - QS(:,N)
27052705
QS(:,N) = QS(:,N) + DQS
27062706

2707-
LHF = LHF + EVD * MAPL_ALHS * DTS
2707+
EVP = EVP + EVD * DTS
27082708
SHF = SHF + SHD * DTS
2709+
LHF = EVP * MAPL_ALHS
2710+
27092711

2712+
if(associated(SUBLIM )) SUBLIM = SUBLIM + EVP *FR(:,N)
2713+
if(associated(EVAPOUT)) EVAPOUT = EVAPOUT + EVP *FR(:,N)
27102714
if(associated(DELTS )) DELTS = DELTS + DTS*CFT*FR(:,N)
27112715
if(associated(DELQS )) DELQS = DELQS + DQS*CFQ*FR(:,N)
27122716
if(associated(TST )) TST = TST + TS(:,N)*FR(:,N)
@@ -2724,6 +2728,8 @@ subroutine CICECORE(NT,RC)
27242728
if(associated(QST )) call Normalize(QST, FRCICE)
27252729
if(associated(HLATICE)) call Normalize(HLATICE,FRCICE)
27262730
if(associated(SHICE )) call Normalize(SHICE, FRCICE)
2731+
if(associated(SUBLIM )) call Normalize(SUBLIM, FRCICE)
2732+
if(associated(EVAPOUT)) call Normalize(EVAPOUT, FRCICE)
27272733

27282734
if(associated(LWNDICE)) call Normalize(LWNDICE, FRCICE, set_undef=.True.)
27292735

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
# - backfilled with global land average snow albedo where unavailable
121121
# - must use compatible bcs version that includes MODIS-based snow albedo (e.g., v06, v08, v09, ...)
122122
# - NOTE: bcs v06, v08, and v09 used approximate averaging of MODIS-based snow albedo to tile space;
123-
# later bcs versions employ more accurate, raster-based averaging
123+
# bcs v11 and v12 employ more accurate, raster-based averaging.
124124
#
125125
# GEOSagcm=>SNOW_ALBEDO_INFO: 0
126126
# GEOSldas=>SNOW_ALBEDO_INFO: 0

0 commit comments

Comments
 (0)