Fix remnants of conflict resolution

[jesusff]

see #4

There were conflict markers remaining:
https://github.com/CORDEX-WRF-community/WRF/pull/4/files#diff-4cf900c383221426961400b9c706d4a7f551833ccff64af20fef15ef6bdc0f1b

Solved in favour of "HEAD", which included the fixes in a03eaf8

[LluisFB]

Hi, is a little mess....
It conflicts with 2 A. Martilli developments:

• Commit fixing bug a03eaf8 related to HEAD
• Commit development of new urban diagnostics 10b1b0c
  

Regarding into the code the intriguing conflict is this one:

!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

Seems to me that the version HEAD with the correction of the computation of t2veg_urb2d is related to the transformation of tsk_rural to potential temperature (ptg_rur) to be later used to compute t2veg_urb2d as average with th_phy which is potential temperature.

Therefore, if I am not wrong in my analysis, the correct one would be the one in HEAD (which in the smaller conflict lines above defines zhalf and ptg_rur as real variables

[jesusff]

Yes, this was the solution proposed in this PR. The conflict came from applying some bug fixes from Alberto (a03eaf8) to a branch that didn't have his base modifications (10b1b0c). Should be fine after merging this PR. Thanks!