Skip to content

Commit

Permalink
Merge pull request #536 from GEOS-ESM/feature/jkolassa/gndtmp_cn_cleanup
Browse files Browse the repository at this point in the history 
Feature/jkolassa/gndtmp cn cleanup
  • Loading branch information
@sdrabenh
sdrabenh authored Feb 13, 2022
2 parents 7bae5aa + 4075004 commit b37677a
Show file tree
Hide file tree
Showing 5 changed files with 202 additions and 270 deletions.
5 changes: 3 additions & 2 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ module GEOS_CatchCNCLM40GridCompMod
use MAPL_ConstantsMod,only: Tzero => MAPL_TICE, pi => MAPL_PI
use clm_time_manager, only: get_days_per_year, get_step_size
use pftvarcon, only: noveg
USE lsm_routines, ONLY : sibalb, catch_calc_soil_moist, irrigation_rate
USE lsm_routines, ONLY : sibalb, catch_calc_soil_moist, irrigation_rate, &
gndtmp

implicit none
private
Expand Down Expand Up @@ -6547,7 +6548,7 @@ subroutine Driver ( RC )
! -----------------
zbar = -sqrt(1.e-20+catdef(n)/bf1(n))+bf2(n)
HT(:)=GHTCNT(:,N)
CALL GNDTMP_CN(poros(n),zbar,ht,frice,tp,soilice)
CALL GNDTMP(poros(n),zbar,ht,frice,tp,soilice)

! At the CatchCNGridComp level, tp1, tp2, .., tp6 are export variables in units of Kelvin,
! - rreichle & borescan, 6 Nov 2020
Expand Down
5 changes: 3 additions & 2 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ module GEOS_CatchCNCLM45GridCompMod
use MAPL_ConstantsMod,only: Tzero => MAPL_TICE, pi => MAPL_PI
use clm_time_manager, only: get_days_per_year, get_step_size
use pftvarcon, only: noveg
USE lsm_routines, ONLY : sibalb, catch_calc_soil_moist, irrigation_rate
USE lsm_routines, ONLY : sibalb, catch_calc_soil_moist, irrigation_rate, &
gndtmp
use update_model_para4cn, only : upd_curr_date_time

implicit none
Expand Down Expand Up @@ -6622,7 +6623,7 @@ subroutine Driver ( RC )
! -----------------
zbar = -sqrt(1.e-20+catdef(n)/bf1(n))+bf2(n)
HT(:)=GHTCNT(:,N)
CALL GNDTMP_CN(poros(n),zbar,ht,frice,tp,soilice)
CALL GNDTMP(poros(n),zbar,ht,frice,tp,soilice)

! At the CatchCNGridComp level, tp1, tp2, .., tp6 are export variables in units of Kelvin,
! - rreichle & borescan, 6 Nov 2020
Expand Down
113 changes: 2 additions & 111 deletions ...idComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ MODULE CATCHMENT_CN_MODEL
TF => MAPL_TICE, & ! K
RGAS => MAPL_RGAS, & ! J/(kg K)
CPAIR => MAPL_CP, & ! J/(kg K)
SHW => MAPL_CAPWTR, & ! J/kg/K spec heat of wat
SHI => MAPL_CAPICE, & ! J/kg/K spec heat of ice
EPSILON => MAPL_EPSILON

USE CATCH_CONSTANTS, ONLY: &
Expand All @@ -87,7 +85,6 @@ MODULE CATCHMENT_CN_MODEL
SLOPE => CATCH_SNWALB_SLOPE, &
MAXSNDEPTH => CATCH_MAXSNDEPTH, &
DZ1MAX => CATCH_DZ1MAX, &
SHR => CATCH_SHR, &
SCONST => CATCH_SCONST, &
C_CANOP => CATCH_C_CANOP, &
N_sm => CATCH_N_ZONES, &
Expand Down Expand Up @@ -121,7 +118,6 @@ MODULE CATCHMENT_CN_MODEL
public :: catchcn_calc_tsurf
public :: catchcn_calc_tsurf_excl_snow
public :: catchcn_calc_etotl
public :: gndtmp_cn

! -----------------------------------------------------------------------------

Expand Down Expand Up @@ -1062,9 +1058,9 @@ SUBROUTINE CATCHCN ( &
FH21=-GHFLUX(N)

CALL GNDTMP( &
dtstep,phi,zbar,thetaf,fh21, &
phi,zbar, &
ht, &
xfice,tp, soilice)
xfice,tp, soilice,DTS=dtstep,THETAF=thetaf,FH21=fh21)

DO LAYER=1,6
GHTCNT(LAYER,N)=HT(LAYER)
Expand Down Expand Up @@ -2304,111 +2300,6 @@ END SUBROUTINE RSURFP2
!**** -----------------------------------------------------------------
!**** /////////////////////////////////////////////////////////////////
!**** -----------------------------------------------------------------

subroutine gndtmp_cn(poros, zbar, ht, xfice, tp, FICE)

REAL, INTENT(IN) :: POROS, ZBAR

REAL, INTENT(IN), DIMENSION(*) :: HT

REAL, INTENT(OUT) :: XFICE
REAL, INTENT(OUT), DIMENSION(*) :: TP, FICE

INTEGER L, LSTART, K
REAL, DIMENSION(N_GT) :: SHC

REAL, DIMENSION(N_GT+1) :: FH, ZB
REAL SHW0, SHI0, SHR0, WS, XW, PHI

!data dz/0.0988,0.1952,0.3859,0.7626,1.5071,10.0/
!DATA PHI/0.45/, FSN/3.34e+8/, SHR/2.4E6/

! initialize parameters

shw0=SHW*1000. ! PER M RATHER THAN PER KG
shi0=SHI*1000. ! PER M RATHER THAN PER KG
shr0=SHR*1000. ! PER M RATHER THAN PER KG [kg of water equivalent density]

if (PHIGT<0.) then ! if statement for bkwd compatibility w/ off-line MERRA replay
phi=poros
else
phi=PHIGT
end if

!----------------------------------
! initialize fice in ALL components
! reichle, July 8, 2002

do l=1,N_GT
fice(l)=0.0
enddo
!----------------------------------

! calculate the boundaries, based on the layer thicknesses(DZGT)

zb(1)=-0.05 ! Bottom of surface layer, which is handled outside
! this routine.
do l=1,N_GT
zb(l+1)=zb(l)-DZGT(l)
shc(l)=SHR0*(1-phi)*DZGT(l)
enddo


! evaluates the temperatures in the soil layers based on the heat values.
! ***********************************
! input:
! xw - water in soil layers, m
! ht - heat in soil layers
! fsn - heat of fusion of water J/m
! shc - specific heat capacity of soil
! shi - specific heat capacity of ice
! shw - specific heat capcity of water
! snowd - snow depth, equivalent water m
! output:
! tp - temperature of layers, c
! fice - fraction of ice of layers
! pre - extra precipitation, i.e. snowmelt, m s-1
! snowd - snow depth after melting, equivalent water m.
! ***********************************
! determine fraction of ice and temp of soil layers based on layer
! heat and water content

do 10 k=1,N_GT
ws=phi*DZGT(k) ! PORE SPACE IN LAYER
xw=0.5*ws ! ASSUME FOR THESE CALCULATIONS THAT THE PORE SPACE
! IS ALWAYS HALF FILLED WITH WATER. XW IS THE
! AMOUNT OF WATER IN THE LAYER.
tp(k)=0.
fice(k)= AMAX1( 0., AMIN1( 1., -ht(k)/(fsn*xw) ) )

IF(FICE(K) .EQ. 1.) THEN
tp(k)=(ht(k)+xw*fsn)/(shc(k)+xw*shi0)
ELSEIF(FICE(K) .EQ. 0.) THEN
tp(k)=ht(k)/(shc(k)+xw*shw0)
ELSE
TP(K)=0.
ENDIF
10 continue

! determine the value of xfice
xfice=0.0

lstart=N_GT
DO L=N_GT,1,-1
IF(ZBAR .GE. ZB(L+1))THEN
LSTART=L
ENDIF
ENDDO

do l=lstart,N_GT
xfice=xfice+fice(l)
enddo
xfice=xfice/((N_GT+1)-lstart)

Return
end subroutine gndtmp_cn


! *******************************************************************

subroutine catchcn_calc_tsurf( NTILES, tc1, tc2, tc4, wesnn, htsnn, &
Expand Down
4 changes: 2 additions & 2 deletions ...Sphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1060,9 +1060,9 @@ SUBROUTINE CATCHMENT ( &
FH21=-GHFLUX(N)

CALL GNDTMP( &
dtstep,phi,zbar,thetaf,fh21, &
phi,zbar, &
ht, &
xfice,tp, soilice)
xfice,tp, soilice,DTS=dtstep,THETAF=thetaf,FH21=fh21)

DO LAYER=1,6
GHTCNT(LAYER,N)=HT(LAYER)
Expand Down
Loading

0 comments on commit b37677a

Please sign in to comment.