Skip to content

Commit

Permalink
Fixed an indexing bug in blending/remap_dwinds that was causing NaNs. (…
Browse files Browse the repository at this point in the history 
…#63)

* Fixed an indexing bug in blending/remap_dwinds that was causing NaNs.

* additional index error

* cleaned up some debug statements.

---------

Co-authored-by: donald lippi <[email protected]>
Co-authored-by: donald lippi <[email protected]>
  • Loading branch information
@delippi
3 people authored Feb 8, 2024
1 parent 74edce4 commit 40a9f72
Showing 1 changed file with 38 additions and 28 deletions.
66 changes: 38 additions & 28 deletions blending.fd/remap_dwinds/remap_dwinds.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,27 @@ subroutine main(km, npz, ak0, bk0, Atm_ak, Atm_bk, psc, ud, vd, is, ie, js, je,
!use, intrinsic :: ieee_arithmetic
implicit none
integer, parameter :: r8_kind = selected_real_kind(15) ! 15 decimal digits
integer, intent(IN) :: is, ie, js, je
integer, intent(IN) :: km ! 128
integer, intent(IN) :: npz ! 127
real(kind=8), dimension(:), intent(IN) :: ak0 ! (129,)
real(kind=8), dimension(:), intent(IN) :: bk0 ! (129,)
real(kind=8), dimension(:,:), intent(IN) :: psc ! (768, 768)
real(kind=8), dimension(:,:), intent(IN) :: Atm_ps !
real(kind=8), dimension(:,:,:), intent(IN) :: ud
real(kind=8), dimension(:,:,:), intent(IN) :: vd
real(kind=8), dimension(:), intent(IN) :: Atm_ak ! (128,)
real(kind=8), dimension(:), intent(IN) :: Atm_bk ! (128,)
real(kind=8), dimension(:,:,:), intent(INOUT) :: Atm_u !
real(kind=8), dimension(:,:,:), intent(INOUT) :: Atm_v !
real(kind=8) :: Atm_ptop
real(kind=8), dimension(is:ie,js:je) :: psd
real(kind=8), dimension(is:ie+1,1:npz) :: qn1
real(kind=8), dimension(is:ie+1,1:km+1) :: pe0
real(kind=8), dimension(is:ie+1,1:npz+1) :: pe1
integer, intent(IN) :: is ! 1
integer, intent(IN) :: ie ! 3950
integer, intent(IN) :: js ! 1
integer, intent(IN) :: je ! 2700
integer, intent(IN) :: km ! 66
integer, intent(IN) :: npz ! 65
real(kind=8), dimension(:), intent(IN) :: ak0 !(67)
real(kind=8), dimension(:), intent(IN) :: bk0 !(67)
real(kind=8), dimension(:,:), intent(IN) :: psc !(3950, 2700)
real(kind=8), dimension(:,:), intent(IN) :: Atm_ps !(3950, 2700)
real(kind=8), dimension(:,:,:), intent(IN) :: ud !(3950, 2701, 66)
real(kind=8), dimension(:,:,:), intent(IN) :: vd !(3951, 2700, 66)
real(kind=8), dimension(:), intent(IN) :: Atm_ak !(66)
real(kind=8), dimension(:), intent(IN) :: Atm_bk !(66)
real(kind=8), dimension(:,:,:), intent(INOUT) :: Atm_u !(3950, 2701, 65)
real(kind=8), dimension(:,:,:), intent(INOUT) :: Atm_v !(3951, 2700, 65)
real(kind=8) :: Atm_ptop !
real(kind=8), dimension(is:ie,js:je) :: psd !(3950, 2700)
real(kind=8), dimension(is:ie+1,1:npz) :: qn1 !(3951, 65)
real(kind=8), dimension(is:ie+1,1:km+1) :: pe0 !(3951, 67)
real(kind=8), dimension(is:ie+1,1:npz+1) :: pe1 !(3951, 66)

integer :: i,j,k,itoa
logical :: no_boundary
Expand All @@ -44,20 +47,24 @@ subroutine main(km, npz, ak0, bk0, Atm_ak, Atm_bk, psc, ud, vd, is, ie, js, je,
!pressure at layer edges (from model top to bottom surface) in the original vertical coordinate
do k=1,km+1
do i=is,ie
if(j==1) then
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i,j)+psd(i,j))
if(j==js) then
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i,j )+psd(i,j ))
elseif(j<je+1) then
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i,j-1)+psd(i,j ))
else
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i,j-1)+psd(i,j))
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i,j-1)+psd(i,j-1))
endif
enddo
enddo
!pressure at layer edges (from model top to bottom surface) in the new vertical coordinate
do k=1,npz+1
do i=is,ie
if(j==1) then
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i,j)+Atm_ps(i,j))
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i,j )+Atm_ps(i,j ))
elseif(j<je+1) then
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i,j-1)+Atm_ps(i,j ))
else
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i,j-1)+Atm_ps(i,j))
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i,j-1)+Atm_ps(i,j-1))
endif
enddo
enddo
Expand All @@ -77,18 +84,22 @@ subroutine main(km, npz, ak0, bk0, Atm_ak, Atm_bk, psc, ud, vd, is, ie, js, je,
do k=1,km+1
do i=is,ie+1
if(i==1) then
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i,j)+psd(i,j))
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i ,j)+psd(i ,j))
elseif(i<ie+1) then
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i-1,j)+psd(i ,j))
else
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i-1,j)+psd(i,j))
pe0(i,k) = ak0(k) + bk0(k)*0.5*(psd(i-1,j)+psd(i-1,j))
endif
enddo
enddo
do k=1,npz+1
do i=is,ie+1
if(i==1) then
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i,j)+Atm_ps(i,j))
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i ,j)+Atm_ps(i ,j))
elseif(i<ie+1) then
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i-1,j)+Atm_ps(i ,j))
else
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i-1,j)+Atm_ps(i,j))
pe1(i,k) = Atm_ak(k) + Atm_bk(k)*0.5*(Atm_ps(i-1,j)+Atm_ps(i-1,j))
endif
enddo
enddo
Expand All @@ -102,7 +113,6 @@ subroutine main(km, npz, ak0, bk0, Atm_ak, Atm_bk, psc, ud, vd, is, ie, js, je,

endif


5000 continue

end subroutine main
Expand Down

0 comments on commit 40a9f72

Please sign in to comment.