Skip to content
Snippets Groups Projects
Commit 3431692b authored by holger's avatar holger
Browse files

modified: mom5.f90

	modified:   momentum.f90
	modified:   pre.f90
parent 504c97b7
Branches
Tags
No related merge requests found
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
call weno(fluxplu,u(i,j,l+3),u(i,j,l+2),u(i,j,l+1),u(i,j,l),u(i,j,l-1)) call weno(fluxplu,u(i,j,l+3),u(i,j,l+2),u(i,j,l+1),u(i,j,l),u(i,j,l-1))
call weno(fluxmin,u(i,j,l+2),u(i,j,l+1),u(i,j,l),u(i,j,l-1),u(i,j,l-2)) call weno(fluxmin,u(i,j,l+2),u(i,j,l+1),u(i,j,l),u(i,j,l-1),u(i,j,l-2))
endif endif
! print*,myid,l,dzcdl(l)
wuz= wa*(fluxplu-fluxmin)/dzcdl(l) wuz= wa*(fluxplu-fluxmin)/dzcdl(l)
! pressure gradient (4th order) ! pressure gradient (4th order)
......
...@@ -93,10 +93,6 @@ ...@@ -93,10 +93,6 @@
tu,tv,tw,qu,qv,qw,ra,raHO,tuHO,tvHO,twHO,quHO,qvHO,qwHO tu,tv,tw,qu,qv,qw,ra,raHO,tuHO,tvHO,twHO,quHO,qvHO,qwHO
integer :: i,j,l integer :: i,j,l
! velocity components are defined on ranges:
! u(imin:imax, jmin:jmax, lmin:lmax)
! v(imin:imax, jmin:jmax-1, lmin:lmax)
! w(imin:imax, jmin:jmax, lmin:lmax-1)
do i=imin,imax; do j=jmin,jmax; do l=lmin,lmax do i=imin,imax; do j=jmin,jmax; do l=lmin,lmax
......
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
! compute derivatives of grid spacing for mapping ! compute derivatives of grid spacing for mapping
do 8 i=imin,imax do 8 i=imin,imax
if ((celltype(i+3,jmin,lmin).ne.wall).and.(celltype(i-2,jmin,lmin).ne.wall)) then if ((celltype(i+2,jmin,lmin).ne.wall).and.(celltype(i-2,jmin,lmin).ne.wall)) then
if (xc(i).gt.0._pr) then if (xc(i).gt.0._pr) then
call weno(fluxplu,xc(i-2),xc(i-1),xc(i),xc(i+1),xc(i+2)) call weno(fluxplu,xc(i-2),xc(i-1),xc(i),xc(i+1),xc(i+2))
call weno(fluxmin,xc(i-3),xc(i-2),xc(i-1),xc(i),xc(i+1)) call weno(fluxmin,xc(i-3),xc(i-2),xc(i-1),xc(i),xc(i+1))
...@@ -369,11 +369,13 @@ ...@@ -369,11 +369,13 @@
dxfdi(i)=fluxplu-fluxmin dxfdi(i)=fluxplu-fluxmin
else else
dxcdi(i)=xf(i)-xf(i-1) dxcdi(i)=xf(i)-xf(i-1)
dxfdi(i)=xc(i+1)-xc(i) dxcdi(i)=xf(i)-xf(i-1)
dxfdi(i)=0._pr
dxfdi(i)=0._pr
endif endif
8 enddo 8 enddo
do 9 j=jmin,jmax do 9 j=jmin,jmax
if ((celltype(imin,j+3,lmin).ne.wall).and.(celltype(imin,j-2,lmin).ne.wall)) then if ((celltype(imin,j+2,lmin).ne.wall).and.(celltype(imin,j-2,lmin).ne.wall)) then
if (yc(j).gt.0._pr) then if (yc(j).gt.0._pr) then
call weno(fluxplu,yc(j-2),yc(j-1),yc(j),yc(j+1),yc(j+2)) call weno(fluxplu,yc(j-2),yc(j-1),yc(j),yc(j+1),yc(j+2))
call weno(fluxmin,yc(j-3),yc(j-2),yc(j-1),yc(j),yc(j+1)) call weno(fluxmin,yc(j-3),yc(j-2),yc(j-1),yc(j),yc(j+1))
...@@ -392,11 +394,13 @@ ...@@ -392,11 +394,13 @@
dyfdj(j)=fluxplu-fluxmin dyfdj(j)=fluxplu-fluxmin
else else
dycdj(j)=yf(j)-yf(j-1) dycdj(j)=yf(j)-yf(j-1)
dyfdj(j)=yc(j+1)-yc(j) dycdj(j)=yf(j)-yf(j-1)
dyfdj(j)=0._pr
dyfdj(j)=0._pr
endif endif
9 enddo 9 enddo
do 10 l=lmin,lmax do 10 l=lmin,lmax
if ((celltype(imin,jmin,l+3).ne.wall).and.(celltype(imin,jmin,l-2).ne.wall)) then if ((celltype(imin,jmin,l+2).ne.wall).and.(celltype(imin,jmin,l-2).ne.wall)) then
if (zc(l).gt.0._pr) then if (zc(l).gt.0._pr) then
call weno(fluxplu,zc(l-2),zc(l-1),zc(l),zc(l+1),zc(l+2)) call weno(fluxplu,zc(l-2),zc(l-1),zc(l),zc(l+1),zc(l+2))
call weno(fluxmin,zc(l-3),zc(l-2),zc(l-1),zc(l),zc(l+1)) call weno(fluxmin,zc(l-3),zc(l-2),zc(l-1),zc(l),zc(l+1))
...@@ -416,6 +420,8 @@ ...@@ -416,6 +420,8 @@
else else
dzcdl(l)=zf(l)-zf(l-1) dzcdl(l)=zf(l)-zf(l-1)
dzfdl(l)=zc(l+1)-zc(l) dzfdl(l)=zc(l+1)-zc(l)
dzcdl(l)=0._pr
dzfdl(l)=0._pr
endif endif
10 enddo 10 enddo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment