Skip to content

fix inconsistent types related with noahmp and log functions #755

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

Merged
climbfuji merged 2 commits into from
Nov 3, 2021
Merged

fix inconsistent types related with noahmp and log functions #755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e520f9
fix inconsistent types and log functions
uturuncoglu Oct 6, 2021
35fc189
fix spacing issue
uturuncoglu Oct 28, 2021
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
10 changes: 5 additions & 5 deletions physics/module_sf_noahmplsm.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1769,9 +1769,9 @@ subroutine energy (parameters,ice ,vegtyp ,ist ,nsnow ,nsoil , & !in
real (kind=kind_phys) , intent(inout) :: cm !momentum drag coefficient
real (kind=kind_phys) , intent(inout) :: ch !sensible heat exchange coefficient
real (kind=kind_phys) , intent(inout) :: q1
real , intent(inout) :: rb !leaf boundary layer resistance (s/m)
real , intent(inout) :: laisun !sunlit leaf area index (m2/m2)
real , intent(inout) :: laisha !shaded leaf area index (m2/m2)
real (kind=kind_phys) , intent(inout) :: rb !leaf boundary layer resistance (s/m)
real (kind=kind_phys) , intent(inout) :: laisun !sunlit leaf area index (m2/m2)
real (kind=kind_phys) , intent(inout) :: laisha !shaded leaf area index (m2/m2)
#ifdef CCPP
character(len=*) , intent(inout) :: errmsg
integer , intent(inout) :: errflg
Expand Down Expand Up @@ -5868,8 +5868,8 @@ subroutine frh2o (parameters,isoil,free,tkelv,smc,sh2o,&
1001 continue
if (.not.( (nlog < 10) .and. (kcount == 0))) goto 1002
nlog = nlog +1
df = alog ( ( parameters%psisat(isoil) * grav / hfus ) * ( ( 1. + ck * swl )**2.) * &
( parameters%smcmax(isoil) / (smc - swl) )** bx) - alog ( - ( &
df = log ( ( parameters%psisat(isoil) * grav / hfus ) * ( ( 1. + ck * swl )**2.) * &
( parameters%smcmax(isoil) / (smc - swl) )** bx) - log ( - ( &
tkelv - tfrz)/ tkelv)
denom = 2. * ck / ( 1. + ck * swl ) + bx / ( smc - swl )
swlk = swl - df / denom
Expand Down
19 changes: 10 additions & 9 deletions physics/sfc_noahmp_drv.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,19 +1467,20 @@ subroutine penman (sfctmp,sfcprs,ch,t2v,th2,prcp,fdown,ssoil, &
! ----------------------------------------------------------------------
! subroutine penman
! ----------------------------------------------------------------------
use machine, only: kind_phys
implicit none
logical, intent(in) :: snowng, frzgra
real, intent(in) :: ch, dqsdt2,fdown,prcp,ffrozp, &
real(kind=kind_phys), intent(in) :: ch, dqsdt2,fdown,prcp,ffrozp, &
& q2, q2sat,ssoil, sfcprs, sfctmp, &
& t2v, th2,emissi_in,sncovr
real, intent(out) :: etp
real :: epsca,flx2,rch,rr,t24
real :: a, delta, fnet,rad,rho,emissi,elcp1,lvs

real, parameter :: elcp = 2.4888e+3, lsubc = 2.501000e+6,cp = 1004.6
real, parameter :: lsubs = 2.83e+6, rd = 287.05, cph2o = 4.1855e+3
real, parameter :: cpice = 2.106e+3, lsubf = 3.335e5
real, parameter :: sigma = 5.6704e-8
real(kind=kind_phys), intent(out) :: etp
real(kind=kind_phys) :: epsca,flx2,rch,rr,t24
real(kind=kind_phys) :: a, delta, fnet,rad,rho,emissi,elcp1,lvs

real(kind=kind_phys), parameter :: elcp = 2.4888e+3, lsubc = 2.501000e+6,cp = 1004.6
real(kind=kind_phys), parameter :: lsubs = 2.83e+6, rd = 287.05, cph2o = 4.1855e+3
real(kind=kind_phys), parameter :: cpice = 2.106e+3, lsubf = 3.335e5
real(kind=kind_phys), parameter :: sigma = 5.6704e-8

! ----------------------------------------------------------------------
! executable code begins here:
Expand Down
4 changes: 2 additions & 2 deletions physics/sflx.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3994,8 +3994,8 @@ subroutine frh2o &
do while ( (nlog < 10) .and. (kcount == 0) )
nlog = nlog + 1

df = alog( (psis*gs2/lsubf) * ( (1.0 + ck*swl)**2.0 ) &
& * (smcmax/(smc-swl))**bx ) - alog(-(tkelv-tfreez)/tkelv)
df = log( (psis*gs2/lsubf) * ( (1.0 + ck*swl)**2.0 ) &
& * (smcmax/(smc-swl))**bx ) - log(-(tkelv-tfreez)/tkelv)

denom = 2.0*ck/(1.0 + ck*swl) + bx/(smc - swl)
swlk = swl - df/denom
Expand Down