Skip to content

Fix remnants of conflict resolution #7

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
jesusff merged 1 commit into from
Jun 11, 2025
Merged

Fix remnants of conflict resolution #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 0 additions & 20 deletions phys/module_sf_noahdrv.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,11 +702,7 @@ SUBROUTINE lsm(DZ8W,QV3D,P8W3D,T3D,TSK, &
REAL :: frc_urb,lb_urb
REAL :: check
!CORDEX
<<<<<<< HEAD
real aa_veg,a2_veg,ptg_rur,zhalf
=======
real aa_veg,a2_veg
>>>>>>> v4.5.1.7-devel
!CORDEX
! ----------------------------------------------------------------------
! DECLARATIONS END - urban
Expand Down Expand Up @@ -1780,28 +1776,12 @@ SUBROUTINE lsm(DZ8W,QV3D,P8W3D,T3D,TSK, &
! endif
!CORDEX here I do a simple log interpolation between the surface temperature of the vegetated frction, tsk_rural, and the lowest
!model level value of temperature
<<<<<<< HEAD
zhalf=dz8w(i,1,j)/2.
aa_veg=0.4/alog(zhalf/znt(i,j))
a2_veg=0.4/alog(2./znt(i,j))
ptg_rur=tsk_rural(i,j)*(1.e5/p_phy(i,1,j))**0.286
t2veg_urb2d(i,j)=(1.-aa_veg/a2_veg)*ptg_rur+aa_veg/a2_veg*th_phy(i,1,j)
t2veg_urb2d(i,j)=t2veg_urb2d(i,j)*(p_phy(i,1,j)/1.e5)**0.286


=======
aa_veg=alog(dz8w(i,1,j)/2./znt(i,j))
a2_veg=alog(2/znt(i,j))
t2veg_urb2d(i,j)=(1.-aa_veg/a2_veg)*tsk_rural(i,j)+aa_veg/a2_veg*th_phy(i,1,j)
! write(*,*)'znt=',znt(i,j)
! write(*,*)'aa_veg=',aa_veg
! write(*,*)'a2_veg=',a2_veg
! write(*,*)'tsk_rural=',tsk_rural(i,j)
! write(*,*)'th_phy=',th_phy(i,1,j)
! write(*,*)'p_phy=',p_phy(i,1,j)

t2veg_urb2d(i,j)=t2veg_urb2d(i,j)*(p_phy(i,1,j)/1.e5)**0.286
>>>>>>> v4.5.1.7-devel
!CORDEX
else
SH_URB2D(I,J) = 0.
Expand Down