Commit dca69fd9 authored by kbk's avatar kbk
Browse files

NOMADS -> FRESHWATER_LENSE

parent b63132be
!$Id: sealevel.F90,v 1.7 2005-10-06 09:54:00 hb Exp $
!$Id: sealevel.F90,v 1.8 2006-01-29 12:25:20 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -32,7 +32,10 @@
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: sealevel.F90,v $
! Revision 1.7 2005-10-06 09:54:00 hb
! Revision 1.8 2006-01-29 12:25:20 kbk
! NOMADS -> FRESHWATER_LENSE
!
! Revision 1.7 2005/10/06 09:54:00 hb
! added support for vertical slice model - via -DSLICE_MODEL
!
! Revision 1.6 2004/07/29 19:46:32 hb
......@@ -102,7 +105,7 @@
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
#ifdef FRESHWATER_LENSE_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))) &
......
!$Id: update_2d_bdy.F90,v 1.4 2003-12-16 16:50:40 kbk Exp $
!$Id: update_2d_bdy.F90,v 1.5 2006-01-29 12:25:20 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -29,7 +29,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: update_2d_bdy.F90,v $
! Revision 1.4 2003-12-16 16:50:40 kbk
! Revision 1.5 2006-01-29 12:25:20 kbk
! NOMADS -> FRESHWATER_LENSE
!
! Revision 1.4 2003/12/16 16:50:40 kbk
! added support for Intel/IFORT compiler - expanded TABS, same types in subroutine calls
!
! Revision 1.3 2003/04/23 12:09:44 kbk
......@@ -102,8 +105,8 @@
amp = 1.5
bdy_data = amp*sin(OMEGA*t)
#endif
#ifdef NOMADS_TEST
bdy_data=0.
#ifdef FRESHWATER_LENSE_TEST
bdy_data=_ZERO_
#endif
#undef OMEGA
#ifdef CHANNEL_TEST
......
!$Id: salinity.F90,v 1.16 2006-01-27 21:13:31 hb Exp $
!$Id: salinity.F90,v 1.17 2006-01-29 12:25:21 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -41,6 +41,9 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: salinity.F90,v $
! Revision 1.17 2006-01-29 12:25:21 kbk
! NOMADS -> FRESHWATER_LENSE
!
! Revision 1.16 2006-01-27 21:13:31 hb
! Boundary conditions for compiler option NOMADS_TEST set to constant for complete sponge region
!
......@@ -144,7 +147,7 @@
! Description still missing
!
! !USES:
#ifdef NOMADS_TEST
#ifdef FRESHWATER_LENSE_TEST
use domain, only: dx
#endif
IMPLICIT NONE
......@@ -164,7 +167,7 @@
#ifdef PECS_TEST
integer :: cc(1:30)
#endif
#ifdef NOMADS_TEST
#ifdef FRESHWATER_LENSE_TEST
INTEGER :: ic,jc
REALTYPE :: dist
#endif
......@@ -184,7 +187,7 @@
write(debug,*) 'init_salinity() # ',Ncall
#endif
#ifdef NS_NOMADS_TEST
#ifdef NS_FRESHWATER_LENSE_TEST
salt_field_no=1
#endif
#ifdef MED_15X15MINS_TEST
......@@ -286,7 +289,7 @@ salt_field_no=1
case default
end select
#ifdef NOMADS_TEST
#ifdef FRESHWATER_LENSE_TEST
S=34.85
ic=nint(iimax/2.)
jc=nint(jjmax/2.)
......@@ -415,7 +418,7 @@ salt_field_no=1
REALTYPE :: auxn(1:kmax-1),auxo(1:kmax-1)
REALTYPE :: a1(0:kmax),a2(0:kmax)
REALTYPE :: a3(0:kmax),a4(0:kmax)
#ifdef NOMADS_TEST
#ifdef FRESHWATER_LENSE_TEST
REALTYPE :: SRelax
#endif
#ifdef SALTWEDGE_TEST
......@@ -455,7 +458,7 @@ salt_field_no=1
S(iimax:iimax,jjmin:jjmax,1:kmax)=10.
#endif
#ifdef NOMADS_TEST
#ifdef FRESHWATER_LENSE_TEST
SRelax=34.85
S(iimin:iimin+3,jjmin:jjmax,1:kmax)=SRelax
S(iimax-3:iimax,jjmin:jjmax,1:kmax)=SRelax
......
!$Id: temperature.F90,v 1.13 2006-01-27 21:13:31 hb Exp $
!$Id: temperature.F90,v 1.14 2006-01-29 12:25:21 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -37,6 +37,9 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: temperature.F90,v $
! Revision 1.14 2006-01-29 12:25:21 kbk
! NOMADS -> FRESHWATER_LENSE
!
! Revision 1.13 2006-01-27 21:13:31 hb
! Boundary conditions for compiler option NOMADS_TEST set to constant for complete sponge region
!
......@@ -167,7 +170,7 @@
write(debug,*) 'init_temperature() # ',Ncall
#endif
#ifdef NS_NOMADS_TEST
#ifdef NS_FRESHWATER_LENSE_TEST
temp_field_no=1
#endif
#ifdef MED_15X15MINS_TEST
......@@ -341,7 +344,7 @@ temp_field_no=1
call do_advection_3d(dt,T,uu,vv,ww,hun,hvn,ho,hn, &
delxu,delxv,delyu,delyv,area_inv,az,au,av, &
temp_hor_adv,temp_ver_adv,temp_adv_split,temp_AH)
#ifdef NOMADS_TEST
#ifdef FRESHWATER_LENSE_TEST
T(iimin:iimin+3,jjmin:jjmax,1:kmax)=10.
T(iimax-3:iimax,jjmin:jjmax,1:kmax)=10.
T(iimin:iimax,jjmin:jjmin+3,1:kmax)=10.
......
......@@ -43,6 +43,9 @@
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: diagnose.F90,v $
! Revision 1.6 2006-01-29 12:25:21 kbk
! NOMADS -> FRESHWATER_LENSE
!
! Revision 1.5 2006-01-27 19:55:56 hb
! tab removed
!
......@@ -83,7 +86,7 @@
integer :: DVMINI,DVMINJ,DVMAXI,DVMAXJ
REALTYPE:: pi=3.141592654
REALTYPE:: Flux1,Flux2,Flux3
#ifdef NOMADS_TEST
#ifdef FRESHWATER_LENSE_TEST
REALTYPE:: MKE,APE,densi,zzz,zs,salmin,salmax,area
INTEGER :: salimax,saljmax
#endif
......@@ -340,7 +343,7 @@
end if
#endif
#ifdef NOMADS_TEST
#ifdef FRESHWATER_LENSE_TEST
! Mean kinetic energy:
if (abs(loop/M-loop/float(M)).lt.1e-10) then
......
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