Commit bfb26f7f authored by hb's avatar hb
Browse files

For compiler option NOMADS_TEST: some lines shortened

parent 50d80604
!$Id: sealevel.F90,v 1.5 2003-12-16 12:32:42 kbk Exp $
!$Id: sealevel.F90,v 1.6 2004-07-29 19:46:32 hb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -32,7 +32,10 @@
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: sealevel.F90,v $
! Revision 1.5 2003-12-16 12:32:42 kbk
! Revision 1.6 2004-07-29 19:46:32 hb
! For compiler option NOMADS_TEST: some lines shortened
!
! Revision 1.5 2003/12/16 12:32:42 kbk
! removed #ifdef SALTWEDGE_TEST (manuel)
!
! Revision 1.4 2003/04/23 12:09:44 kbk
......@@ -92,24 +95,27 @@
zo = z
do j=jmin,jmax
do i=imin,imax
!KBK zo(i,j) = z(i,j)
if (az(i,j) .eq. 1) then
z(i,j)=z(i,j)-dtm*((U(i,j)*DYU-U(i-1,j )*DYUIM1) &
+(V(i,j)*DXV-V(i ,j-1)*DXVJM1))*ARCD1
#ifdef NOMADS_TEST
kk=1.0
if ((((i.eq.1).or.(i.eq.imax)).and.(j.ge.1).and.(j.le.jmax)).or.(((j.eq.1).or.(j.eq.jmax)).and.(i.ge.1).and.(i.le.imax))) &
z(i,j)=(1.-kk)*z(i,j)
kk=0.5625
if ((((i.eq.2).or.(i.eq.imax-1)).and.(j.ge.2).and.(j.le.jmax-1)).or.(((j.eq.2).or.(j.eq.jmax-1)).and.(i.ge.2).and.(i.le.imax-1))) &
z(i,j)=(1.-kk)*z(i,j)
kk=0.25
if ((((i.eq.3).or.(i.eq.imax-2)).and.(j.ge.3).and.(j.le.jmax-2)).or.(((j.eq.3).or.(j.eq.jmax-2)).and.(i.ge.3).and.(i.le.imax-2))) &
z(i,j)=(1.-kk)*z(i,j)
kk=0.0625
if ((((i.eq.4).or.(i.eq.imax-3)).and.(j.ge.4).and.(j.le.jmax-3)).or.(((j.eq.4).or.(j.eq.jmax-3)).and.(i.ge.4).and.(i.le.imax-3))) &
z(i,j)=(1.-kk)*z(i,j)
kk=1.0
if ((((i.eq.1).or.(i.eq.imax)).and.(j.ge.1).and.(j.le.jmax)).or. &
(((j.eq.1).or.(j.eq.jmax)).and.(i.ge.1).and.(i.le.imax))) &
z(i,j)=(1.-kk)*z(i,j)
kk=0.5625
if ((((i.eq.2).or.(i.eq.imax-1)).and.(j.ge.2).and.(j.le.jmax-1)).or. &
(((j.eq.2).or.(j.eq.jmax-1)).and.(i.ge.2).and.(i.le.imax-1))) &
z(i,j)=(1.-kk)*z(i,j)
kk=0.25
if ((((i.eq.3).or.(i.eq.imax-2)).and.(j.ge.3).and.(j.le.jmax-2)).or. &
(((j.eq.3).or.(j.eq.jmax-2)).and.(i.ge.3).and.(i.le.imax-2))) &
z(i,j)=(1.-kk)*z(i,j)
kk=0.0625
if ((((i.eq.4).or.(i.eq.imax-3)).and.(j.ge.4).and.(j.le.jmax-3)).or. &
(((j.eq.4).or.(j.eq.jmax-3)).and.(i.ge.4).and.(i.le.imax-3))) &
z(i,j)=(1.-kk)*z(i,j)
#endif
end if
end do
......
!$Id: salinity.F90,v 1.11 2004-04-21 09:14:03 lars Exp $
!$Id: salinity.F90,v 1.12 2004-07-29 19:46:32 hb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -40,7 +40,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: salinity.F90,v $
! Revision 1.11 2004-04-21 09:14:03 lars
! Revision 1.12 2004-07-29 19:46:32 hb
! For compiler option NOMADS_TEST: some lines shortened
!
! Revision 1.11 2004/04/21 09:14:03 lars
! added ifdef for baltic_slice
!
! Revision 1.10 2004/01/06 15:04:00 kbk
......@@ -128,6 +131,9 @@
! Description still missing
!
! !USES:
#ifdef NOMADS_TEST
use domain, only: dx
#endif
IMPLICIT NONE
!
! !INPUT PARAMETERS:
......@@ -274,8 +280,7 @@ salt_field_no=1
do i=1,iimax
do j=1,jjmax
do k=kmax/2,kmax
stop 'salinity - dx is not known'
!KBK dist=sqrt((float(i)-float(ic))**2+(float(j)-float(jc))**2)*dx
dist=sqrt((float(i)-float(ic))**2+(float(j)-float(jc))**2)*dx
if (dist.le.3000.) then
S(i,j,k)=1.1*(dist/(3000.))**8+33.75
else
......@@ -287,7 +292,7 @@ stop 'salinity - dx is not known'
#endif
#ifdef SLOPE_TEST
do i=81,82
do j=22,23
do j=42,43
S(i,j,0:kmax) = 25.
end do
end do
......@@ -432,14 +437,20 @@ stop 'salinity - dx is not known'
do k=1,kmax
if (az(i,j).eq.2) S(i,j,k)=SRelax
kk=0.5625
if ((((i.eq.2).or.(i.eq.iimax-1)).and.(j.ge.2).and.(j.le.jjmax-1)).or.(((j.eq.2).or.(j.eq.jjmax-1)).and.(i.ge.2).and.(i.le.iimax-1))) &
S(i,j,k)=(1.-kk)*S(i,j,k)+kk*SRelax
if ((((i.eq.2).or.(i.eq.iimax-1)).and.(j.ge.2).and. &
(j.le.jjmax-1)).or.(((j.eq.2).or.(j.eq.jjmax-1)) &
.and.(i.ge.2).and.(i.le.iimax-1))) &
S(i,j,k)=(1.-kk)*S(i,j,k)+kk*SRelax
kk=0.25
if ((((i.eq.3).or.(i.eq.iimax-2)).and.(j.ge.3).and.(j.le.jjmax-2)).or.(((j.eq.3).or.(j.eq.jjmax-2)).and.(i.ge.3).and.(i.le.iimax-2))) &
S(i,j,k)=(1.-kk)*S(i,j,k)+kk*SRelax
if ((((i.eq.3).or.(i.eq.iimax-2)).and.(j.ge.3).and. &
(j.le.jjmax-2)).or.(((j.eq.3).or.(j.eq.jjmax-2)) &
.and.(i.ge.3).and.(i.le.iimax-2))) &
S(i,j,k)=(1.-kk)*S(i,j,k)+kk*SRelax
kk=0.0625
if ((((i.eq.4).or.(i.eq.iimax-3)).and.(j.ge.4).and.(j.le.jjmax-3)).or.(((j.eq.4).or.(j.eq.jjmax-3)).and.(i.ge.4).and.(i.le.iimax-3))) &
S(i,j,k)=(1.-kk)*S(i,j,k)+kk*SRelax
if ((((i.eq.4).or.(i.eq.iimax-3)).and.(j.ge.4).and. &
(j.le.jjmax-3)).or.(((j.eq.4).or.(j.eq.jjmax-3)) &
.and.(i.ge.4).and.(i.le.iimax-3))) &
S(i,j,k)=(1.-kk)*S(i,j,k)+kk*SRelax
end do
end do
end do
......@@ -507,7 +518,7 @@ stop 'salinity - dx is not known'
#ifdef SLOPE_TEST
do i=81,82
do j=22,23
do j=42,43
S(i,j,0:kmax) = 25.
end do
end do
......
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