Commit 25079dc1 authored by hb's avatar hb
Browse files

call to coordinates moved for better consistency (see JMB)

parent d295c1ee
!$Id: m3d.F90,v 1.14 2004-04-06 12:42:50 kbk Exp $
!$Id: m3d.F90,v 1.15 2004-04-20 16:49:37 hb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -52,7 +52,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: m3d.F90,v $
! Revision 1.14 2004-04-06 12:42:50 kbk
! Revision 1.15 2004-04-20 16:49:37 hb
! call to coordinates moved for better consistency (see JMB)
!
! Revision 1.14 2004/04/06 12:42:50 kbk
! internal pressure calculations now uses wrapper
!
! Revision 1.13 2004/01/08 10:23:20 kbk
......@@ -384,8 +387,6 @@
#ifndef NO_BAROCLINIC
if (bdy3d) call do_bdy_3d(0,T)
#endif
call coordinates(vert_cord,cord_relax,maxdepth)
#ifndef NO_BOTTFRIC
if (kmax .gt. 1) then
call bottom_friction_3d()
......@@ -396,6 +397,8 @@
NN = _ZERO_
if (runtype .eq. 4) call do_internal_pressure()
#endif
huo=hun
hvo=hvn
if (ufirst) then
call uu_momentum_3d(bdy3d)
call vv_momentum_3d(bdy3d)
......@@ -405,6 +408,7 @@
call uu_momentum_3d(bdy3d)
ufirst=.true.
end if
call coordinates(vert_cord,cord_relax,maxdepth)
if (kmax .gt. 1) then
call ww_momentum_3d()
end if
......
!$Id: uu_momentum_3d.F90,v 1.3 2003-04-23 12:16:34 kbk Exp $
!$Id: uu_momentum_3d.F90,v 1.4 2004-04-20 16:49:37 hb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -23,6 +23,7 @@
use bdy_3d, only: do_bdy_3d
use variables_3d, only: dt,cnpar,kumin,uu,vv,huo,hun,hvo,uuEx,ww,hvn
use variables_3d, only: num,nuh,sseo,ssun,rru
use variables_3d, only: ssuo
#ifndef NO_BAROCLINIC
use variables_3d, only: idpdx
#endif
......@@ -44,7 +45,10 @@
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: uu_momentum_3d.F90,v $
! Revision 1.3 2003-04-23 12:16:34 kbk
! Revision 1.4 2004-04-20 16:49:37 hb
! call to coordinates moved for better consistency (see JMB)
!
! Revision 1.3 2003/04/23 12:16:34 kbk
! cleaned code + TABS to spaces
!
! Revision 1.2 2003/04/07 13:36:38 kbk
......@@ -127,6 +131,7 @@
Ncall = Ncall+1
write(debug,*) 'uu_momentum_3d() # ',Ncall
#endif
do j=jjmin,jjmax
do i=iimin,iimax
......@@ -215,7 +220,7 @@
ResInt=ResInt+Res(k)
end do
Diff=(Uint(i,j)-ResInt)/(ssun(i,j)+HU(i,j))
Diff=(Uint(i,j)-ResInt)/(ssuo(i,j)+HU(i,j))
do k=kumin(i,j),kmax
uu(i,j,k)=Res(k) +hun(i,j,k)*Diff
......
!$Id: vv_momentum_3d.F90,v 1.4 2003-06-29 17:06:23 kbk Exp $
!$Id: vv_momentum_3d.F90,v 1.5 2004-04-20 16:49:37 hb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -23,6 +23,7 @@
use bdy_3d, only: do_bdy_3d
use variables_3d, only: dt,cnpar,kvmin,uu,vv,huo,hvo,hvn,vvEx,ww,hun
use variables_3d, only: num,nuh,sseo,ssvn,rrv
use variables_3d, only: ssvo
#ifndef NO_BAROCLINIC
use variables_3d, only: idpdy
#endif
......@@ -44,7 +45,10 @@
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: vv_momentum_3d.F90,v $
! Revision 1.4 2003-06-29 17:06:23 kbk
! Revision 1.5 2004-04-20 16:49:37 hb
! call to coordinates moved for better consistency (see JMB)
!
! Revision 1.4 2003/06/29 17:06:23 kbk
! Corv --> corv
!
! Revision 1.3 2003/04/23 12:16:34 kbk
......@@ -217,7 +221,8 @@
ResInt=ResInt+Res(k)
end do
Diff=(Vint(i,j)-ResInt)/(ssvn(i,j)+HV(i,j))
Diff=(Vint(i,j)-ResInt)/(ssvo(i,j)+HV(i,j))
do k=kvmin(i,j),kmax
vv(i,j,k)=Res(k)+hvn(i,j,k)*Diff
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment