Commit 23451a6e authored by kbk's avatar kbk

cleaned code + TABS to spaces

parent 9e8f68a7
This diff is collapsed.
!$Id: bdy_3d.F90,v 1.3 2003-04-07 16:32:31 kbk Exp $
!$Id: bdy_3d.F90,v 1.4 2003-04-23 12:16:34 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -24,7 +24,7 @@
!
! !PUBLIC DATA MEMBERS:
public init_bdy_3d, do_bdy_3d
REALTYPE, public, allocatable :: S_bdy(:,:),T_bdy(:,:)
REALTYPE, public, allocatable :: S_bdy(:,:),T_bdy(:,:)
!
! !PRIVATE DATA MEMBERS:
!
......@@ -32,7 +32,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: bdy_3d.F90,v $
! Revision 1.3 2003-04-07 16:32:31 kbk
! Revision 1.4 2003-04-23 12:16:34 kbk
! cleaned code + TABS to spaces
!
! Revision 1.3 2003/04/07 16:32:31 kbk
! preliminary support for mirror_bdy_3d
!
! Revision 1.2 2002/06/19 14:32:08 gotm
......@@ -74,7 +77,7 @@
! See the log for the module
!
! !LOCAL VARIABLES:
integer :: rc,i,j,k,n
integer :: rc,i,j,k,n
!EOP
!-------------------------------------------------------------------------
!BOC
......@@ -114,19 +117,19 @@
IMPLICIT NONE
!
! !INPUT PARAMETERS:
integer, intent(in) :: tag
integer, intent(in) :: tag
!
! !INPUT/OUTPUT PARAMETERS:
REALTYPE, intent(inout) :: field(I3DFIELD)
!
! !OUTPUT PARAMETERS:
REALTYPE, intent(out) :: field(I3DFIELD)
!
! !REVISION HISTORY:
! See the log for the module
!
! !LOCAL VARIABLES:
integer :: i,j,k,n,ii,jj
REALTYPE :: sp(1:4),rat
integer :: i,j,k,n,ii,jj
REALTYPE :: sp(1:4),rat
!EOP
!-----------------------------------------------------------------------
!BOC
......@@ -156,7 +159,7 @@
end do
case default
FATAL 'Non valid tag'
stop 'do_bdy_3d'
stop 'do_bdy_3d'
end select
#endif
......@@ -173,10 +176,10 @@
do j=wfj(n),wlj(n)
k = k+1
do ii=1,4
if (az(i-1+ii,j).gt.0) then
if (az(i-1+ii,j).gt.0) then
S(i-1+ii,j,:) = sp(ii)*S_bdy(k,:)+(1.-sp(ii))*S(i-1+ii,j,:)
T(i-1+ii,j,:) = sp(ii)*T_bdy(k,:)+(1.-sp(ii))*T(i-1+ii,j,:)
end if
end if
end do
end do
end do
......@@ -185,10 +188,10 @@
do i = nfi(n),nli(n)
k = k+1
do jj=1,4
if (az(i,j+1-jj).gt.0) then
if (az(i,j+1-jj).gt.0) then
S(i,j+1-jj,:) = sp(jj)*S_bdy(k,:)+(1.-sp(jj))*S(i,j+1-jj,:)
T(i,j+1-jj,:) = sp(jj)*T_bdy(k,:)+(1.-sp(jj))*T(i,j+1-jj,:)
end if
end if
end do
end do
end do
......@@ -197,10 +200,10 @@
do j=efj(n),elj(n)
k = k+1
do ii=1,4
if (az(i+1-ii,j).gt.0) then
if (az(i+1-ii,j).gt.0) then
S(i+1-ii,j,:) = sp(ii)*S_bdy(k,:)+(1.-sp(ii))*S(i+1-ii,j,:)
T(i+1-ii,j,:) = sp(ii)*T_bdy(k,:)+(1.-sp(ii))*T(i+1-ii,j,:)
end if
end if
end do
end do
end do
......@@ -209,10 +212,10 @@
do i = sfi(n),sli(n)
k = k+1
do jj=1,4
if (az(i,j-1+jj).gt.0) then
if (az(i,j-1+jj).gt.0) then
S(i,j-1+jj,:) = sp(jj)*S_bdy(k,:)+(1.-sp(jj))*S(i,j-1+jj,:)
T(i,j-1+jj,:) = sp(jj)*T_bdy(k,:)+(1.-sp(jj))*T(i,j-1+jj,:)
end if
end if
end do
end do
end do
......
!$Id: bottom_friction_3d.F90,v 1.3 2003-04-07 16:29:48 kbk Exp $
!$Id: bottom_friction_3d.F90,v 1.4 2003-04-23 12:16:34 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -27,7 +27,10 @@
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: bottom_friction_3d.F90,v $
! Revision 1.3 2003-04-07 16:29:48 kbk
! Revision 1.4 2003-04-23 12:16:34 kbk
! cleaned code + TABS to spaces
!
! Revision 1.3 2003/04/07 16:29:48 kbk
! parallel support
!
! Revision 1.1.1.1 2002/05/02 14:00:53 gotm
......@@ -62,8 +65,8 @@
! initial import into CVS
!
! !LOCAL VARIABLES:
integer :: i,j,kk
REALTYPE :: r,hh,fricvel
integer :: i,j,kk
REALTYPE :: r,hh,fricvel
logical, save :: first=.true.
REALTYPE, save :: uuloc(I2DFIELD)
REALTYPE, save :: uvloc(I2DFIELD)
......@@ -128,7 +131,7 @@
else
vuloc(i,j) = _ZERO_
vvloc(i,j) = _ZERO_
end if
end if
end do
end do
......
!$Id: bottomstress_3d.F90,v 1.2 2003-04-07 13:15:43 kbk Exp $
!$Id: bottomstress_3d.F90,v 1.3 2003-04-23 12:16:34 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -25,7 +25,10 @@
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: bottomstress_3d.F90,v $
! Revision 1.2 2003-04-07 13:15:43 kbk
! Revision 1.3 2003-04-23 12:16:34 kbk
! cleaned code + TABS to spaces
!
! Revision 1.2 2003/04/07 13:15:43 kbk
! cleaned code
!
! Revision 1.1.1.1 2002/05/02 14:00:53 gotm
......@@ -45,7 +48,7 @@
! initial import into CVS
!
! !LOCAL VARIABLES:
integer :: i,j,k1,k2,k3,k4
integer :: i,j,k1,k2,k3,k4
!EOP
!-----------------------------------------------------------------------
!BOC
......
!$Id: eqstate.F90,v 1.2 2003-04-07 13:19:48 kbk Exp $
!$Id: eqstate.F90,v 1.3 2003-04-23 12:16:34 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -22,7 +22,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: eqstate.F90,v $
! Revision 1.2 2003-04-07 13:19:48 kbk
! Revision 1.3 2003-04-23 12:16:34 kbk
! cleaned code + TABS to spaces
!
! Revision 1.2 2003/04/07 13:19:48 kbk
! parallel support
!
! Revision 1.1.1.1 2002/05/02 14:00:59 gotm
......@@ -72,7 +75,7 @@
IMPLICIT NONE
!
! !INPUT PARAMETERS:
integer, intent(in) :: method
integer, intent(in) :: method
!
! !INPUT/OUTPUT PARAMETERS:
!
......@@ -141,32 +144,32 @@
! See the log for the module
!
! !LOCAL VARIABLES:
integer :: i,j,k
REALTYPE :: x
integer :: i,j,k
REALTYPE :: x
! something needs to be done - where to get these variables - namelist
integer :: method=1
REALTYPE :: T0 = 10., S0 = 33.75
REALTYPE :: dtr0 = -0.17, dsr0 = 0.78
REALTYPE :: rho_0 = 1025.
REALTYPE :: g=9.82
integer :: method=1
REALTYPE :: T0 = 10., S0 = 33.75
REALTYPE :: dtr0 = -0.17, dsr0 = 0.78
REALTYPE :: rho_0 = 1025.
REALTYPE :: g=9.82
!
#if 0
! Brydon et. al. - Table 2 - narrow
REALTYPE, parameter :: a1=-1.36471e-1,b1= 5.06423e-1,g1=-5.52640e-4
REALTYPE, parameter :: a2=-4.68181e-2,b2=-3.57109e-3,g2= 4.88584e-6
REALTYPE, parameter :: a3= 8.07004e-1,b3=-8.76148e-4,g3= 9.96027e-7
REALTYPE, parameter :: a4=-7.45353e-3,b4= 5.25243e-5,g4=-7.25139e-8
REALTYPE, parameter :: a5=-2.94418e-3,b5= 1.57976e-5,g5=-3.98736e-9
REALTYPE, parameter :: a6= 3.43570e-5,b6=-3.46686e-7,g6= 4.00631e-10
REALTYPE, parameter :: a7= 3.48658e-5,b7=-1.68764e-7,g7= 8.26368e-11
!
REALTYPE :: p=50.,p2
REALTYPE :: c1,c2,c3,c4,c5,c6,c7
!
REALTYPE :: s1,t1,t2,t3
REALTYPE, parameter :: a1=-1.36471e-1,b1= 5.06423e-1,g1=-5.52640e-4
REALTYPE, parameter :: a2=-4.68181e-2,b2=-3.57109e-3,g2= 4.88584e-6
REALTYPE, parameter :: a3= 8.07004e-1,b3=-8.76148e-4,g3= 9.96027e-7
REALTYPE, parameter :: a4=-7.45353e-3,b4= 5.25243e-5,g4=-7.25139e-8
REALTYPE, parameter :: a5=-2.94418e-3,b5= 1.57976e-5,g5=-3.98736e-9
REALTYPE, parameter :: a6= 3.43570e-5,b6=-3.46686e-7,g6= 4.00631e-10
REALTYPE, parameter :: a7= 3.48658e-5,b7=-1.68764e-7,g7= 8.26368e-11
!
REALTYPE :: p=50.,p2
REALTYPE :: c1,c2,c3,c4,c5,c6,c7
!
REALTYPE :: s1,t1,t2,t3
#endif
REALTYPE :: KK
REALTYPE :: T1,T2,T3,T4,T5,S1,S15,S2,S3,p2
REALTYPE :: KK
REALTYPE :: T1,T2,T3,T4,T5,S1,S15,S2,S3,p2
!EOP
!-----------------------------------------------------------------------
!BOC
......@@ -180,47 +183,47 @@
select case (method)
case (1)
#ifdef DENSITY
forall(i=iimin-1:iimax+1,j=jjmin-1:jjmax+1,az(i,j) .gt. 0) &
rho(i,j,1:kmax) = rho_0 + &
forall(i=iimin-1:iimax+1,j=jjmin-1:jjmax+1,az(i,j) .gt. 0) &
rho(i,j,1:kmax) = rho_0 + &
dtr0*(T(i,j,1:kmax)-T0) + dsr0*(S(i,j,1:kmax)-S0)
#endif
#undef DENSITY
#ifdef BUOYANCY
x = -g/rho_0
forall(i=iimin-1:iimax+1,j=jjmin-1:jjmax+1,az(i,j) .gt. 0) &
rho(i,j,1:kmax) = &
x*(dtr0*(T(i,j,1:kmax)-T0) + dsr0*(S(i,j,1:kmax)-S0))
forall(i=iimin-1:iimax+1,j=jjmin-1:jjmax+1,az(i,j) .gt. 0) &
rho(i,j,1:kmax) = &
x*(dtr0*(T(i,j,1:kmax)-T0) + dsr0*(S(i,j,1:kmax)-S0))
#endif
#ifdef HAIDVOGEL_TEST
forall(i=iimin-1:iimax+1,j=jjmin-1:jjmax+1,az(i,j) .gt. 0) &
forall(i=iimin-1:iimax+1,j=jjmin-1:jjmax+1,az(i,j) .gt. 0) &
rho(i,j,1:kmax) = -g/rho_0*(S(i,j,1:kmax)+1000.-rho_0)
#endif
#ifdef CONSTANCE_TEST
x = -g/rho_0
forall(i=iimin-1:iimax+1,j=jjmin-1:jjmax+1,az(i,j) .gt. 0) &
forall(i=iimin-1:iimax+1,j=jjmin-1:jjmax+1,az(i,j) .gt. 0) &
rho(i,j,1:kmax) = x*dtr0*(T(i,j,1:kmax)-T0)
#endif
case (2)
do k = 1,kmax
do j = jjmin-1,jjmax+1
do i = iimin-1,iimax+1
if (az(i,j) .gt. 0) then
T1 = T(i,j,k)
if (az(i,j) .gt. 0) then
T1 = T(i,j,k)
T2 = T1*T1
T3 = T1*T2
T4 = T2*T2
T5 = T1*T4
S1 = S(i,j,k)
S1 = S(i,j,k)
S15= S1**1.5
S2 = S1*S1
S3 = S1*S2
if (S1 .lt. _ZERO_) then
if (S1 .lt. _ZERO_) then
STDERR 'Salinity at point ',i,',',j,',',k,' < 0.'
STDERR 'Value is S = ',S(i,j,k)
STDERR 'Programm continued, value set to zero ...'
S(i,j,k)= _ZERO_
end if
STDERR 'Value is S = ',S(i,j,k)
STDERR 'Programm continued, value set to zero ...'
S(i,j,k)= _ZERO_
end if
x=999.842594+6.793952e-02*T1-9.09529e-03*T2+1.001685e-04*T3
x=x-1.120083e-06*T4+6.536332e-09*T5
......@@ -249,7 +252,7 @@
x=x/(1.-p/KK)
end if
#endif
rho(i,j,k)=-g*(x-rho_0)/rho_0
rho(i,j,k)=-g*(x-rho_0)/rho_0
end if
end do
end do
......@@ -259,8 +262,8 @@
do k = 1,kmax
do j = jjmin-1:jjmax+1
do i = iimin-1:iimax+1
if (az(i,j) .gt. 0) then
p = 50.
if (az(i,j) .gt. 0) then
p = 50.
p2 = p*p
c1 = a1 + b1*p + g1*p2
c2 = a2 + b2*p + g2*p2
......@@ -269,12 +272,12 @@
c5 = a5 + b5*p + g5*p2
c6 = a6 + b6*p + g6*p2
c7 = a7 + b7*p + g7*p2
s1 = S(i,j,k)
t1 = T(i,j,k)
t2 = t1*t1
t3 = t1*t2
s1 = S(i,j,k)
t1 = T(i,j,k)
t2 = t1*t1
t3 = t1*t2
rho(i,j,k)=c1+c2*t1+c3*s1+c4*t2+c5*s1*t1+c6*t3+c7*s1*t2
rho(i,j,k)=-g/rho_0*(rho(i,j,k)-rho_0)
rho(i,j,k)=-g/rho_0*(rho(i,j,k)-rho_0)
end if
end do
end do
......
!$Id: gotm.F90,v 1.3 2003-04-07 13:36:38 kbk Exp $
!$Id: gotm.F90,v 1.4 2003-04-23 12:16:34 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -12,7 +12,6 @@
!
! !USES:
use domain, only: iimin,iimax,jjmin,jjmax,kmax,az,min_depth,crit_depth
use domain, only: egon => H
use variables_2d, only: D,zub,zvb,z
use variables_3d, only: dt,kmin,ho,hn,tke,eps,SS,NN,num,nuh,taus,taub
use turbulence, only: do_turbulence,cde
......@@ -30,7 +29,10 @@
! Original author(s): Karsten Bolding & Hans Burchard
!
! $Log: gotm.F90,v $
! Revision 1.3 2003-04-07 13:36:38 kbk
! Revision 1.4 2003-04-23 12:16:34 kbk
! cleaned code + TABS to spaces
!
! Revision 1.3 2003/04/07 13:36:38 kbk
! parallel support, cleaned code + NO_3D, NO_BAROCLINIC
!
! Revision 1.1.1.1 2002/05/02 14:00:54 gotm
......@@ -72,13 +74,14 @@
!
!
! !LOCAL VARIABLES:
integer :: i,j,k
REALTYPE :: u_taus,u_taub,z0s,z0b
REALTYPE :: h(0:kmax),dry,zz
REALTYPE :: NN1d(0:kmax),SS1d(0:kmax),P(0:kmax),B(0:kmax)
logical, save:: first=.true.
integer :: kk
integer, save :: n = 0
integer :: i,j,k
REALTYPE :: u_taus,u_taub,z0s,z0b
REALTYPE :: h(0:kmax),dry,zz
REALTYPE :: P(0:kmax),B(0:kmax)
REALTYPE :: NN1d(0:kmax),SS1d(0:kmax)
logical, save :: first=.true.
integer, save :: n = 0
integer :: kk
!
!EOP
!-----------------------------------------------------------------------
......@@ -111,22 +114,22 @@
nuh1d=nuh(i,j,:)
z0s = 0.1
z0b=0.5*(max(zub(i-1,j),zub(i,j))+max(zvb(i,j-1),zvb(i,j)))
z0b=0.5*(max(zub(i-1,j),zub(i,j))+max(zvb(i,j-1),zvb(i,j)))
if (z0s .gt. D(i,j)/10.) z0s=D(i,j)/10.
#ifdef PARABOLIC_VISCOSITY
zz = _ZERO_
do k=1,kmax-1
zz=zz+hn(i,j,k)
tke1d(k)=max(1.e-10,3.333333*u_taub**2*(1.-zz/D(i,j)))
L1d(k)=0.4*(zz+z0b)*sqrt(1.-zz/D(i,j))
eps1d(k)=0.16431677*tke1d(k)**1.5/L1d(k)
num1d(k)=0.09*tke1d(k)**2/eps1d(k)
nuh1d(k)=num1d(k)
end do
tke1d(k)=max(1.e-10,3.333333*u_taub**2*(1.-zz/D(i,j)))
L1d(k)=0.4*(zz+z0b)*sqrt(1.-zz/D(i,j))
eps1d(k)=0.16431677*tke1d(k)**1.5/L1d(k)
num1d(k)=0.09*tke1d(k)**2/eps1d(k)
nuh1d(k)=num1d(k)
end do
#else
call do_turbulence(kmax,dt,D(i,j),u_taus,u_taub,z0s,z0b,h, &
NN1d,SS1d,P,B)
call do_turbulence(kmax,dt,D(i,j),u_taus,u_taub,z0s,z0b,h, &
NN1d,SS1d,P,B)
#endif
tke(i,j,:) = tke1d
......
!$Id: internal_pressure.F90,v 1.2 2003-04-01 15:50:13 gotm Exp $
!$Id: internal_pressure.F90,v 1.3 2003-04-23 12:16:34 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -11,11 +11,11 @@
! !DESCRIPTION:
!
! !USES:
use domain, only: iimin,iimax,jjmin,jjmax,kmax,az,au,av,H,HU,HV
use domain, only: iimin,iimax,jjmin,jjmax,kmax,az,au,av,H,HU,HV
#if defined(SPHERICAL) || defined(CURVILINEAR)
use domain, only: dxu,dyv
use domain, only: dxu,dyv
#else
use domain, only: dx,dy
use domain, only: dx,dy
#endif
use variables_3d, only: kmin,hn,hun,hvn,idpdx,idpdy,rho
IMPLICIT NONE
......@@ -30,7 +30,10 @@
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: internal_pressure.F90,v $
! Revision 1.2 2003-04-01 15:50:13 gotm
! Revision 1.3 2003-04-23 12:16:34 kbk
! cleaned code + TABS to spaces
!
! Revision 1.2 2003/04/01 15:50:13 gotm
! removed dead print statement
!
! Revision 1.1.1.1 2002/05/02 14:00:59 gotm
......@@ -80,17 +83,18 @@
! Added further support for baroclinicity
!
! !LOCAL VARIABLES:
integer :: i,j,k,rc
REALTYPE :: dxm1,dym1,x,y,x1,y1,grdl,grdu,rhol,rhou,prgr,dxz,dyz
REALTYPE,dimension(:,:,:), allocatable :: zz
REALTYPE,save,dimension(:,:,:), allocatable :: idpdx0
REALTYPE,save,dimension(:,:,:), allocatable :: idpdy0
LOGICAL,save :: first=.true.
integer :: i,j,k,rc
REALTYPE :: dxm1,dym1,x,y,x1,y1
REALTYPE :: grdl,grdu,rhol,rhou,prgr,dxz,dyz
LOGICAL,save :: first=.true.
#ifdef PRESS_GRAD_Z
REALTYPE :: zx(kmax)
REALTYPE :: rhoplus,rhominus
integer :: kplus,kminus
integer :: kplus,kminus
REALTYPE :: zx(kmax)
REALTYPE :: rhoplus,rhominus
#endif
REALTYPE,dimension(:,:,:), allocatable :: zz
REALTYPE,save,dimension(:,:,:), allocatable :: idpdx0
REALTYPE,save,dimension(:,:,:), allocatable :: idpdy0
!EOP
!-----------------------------------------------------------------------
!BOC
......@@ -155,7 +159,7 @@
do i=iimin,iimax
if (au(i,j) .ge. 1) then
#if defined(SPHERICAL) || defined(CURVILINEAR)
dxm1=_ONE_/DXU
dxm1=_ONE_/DXU
#endif
#ifdef PRESS_GRAD_Z
zx(1)=-HU(i,j)+0.5*hun(i,j,1) ! zx defined on u-points
......@@ -188,13 +192,13 @@
if (kplus .lt. kmax .and. kplus .gt. 1) then
rhoplus=((zx(k)-zz(i+1,j,kplus))*rho(i+1,j,kplus+1)+ &
(zz(i+1,j,kplus+1)-zx(k))*rho(i+1,j,kplus))/ &
(0.5*(hn(i+1,j,kplus+1)+hn(i+1,j,kplus)))
(0.5*(hn(i+1,j,kplus+1)+hn(i+1,j,kplus)))
end if
if (kminus .eq. kmax) rhominus=rho(i,j,kminus)
if ((kminus .lt. kmax) .and. (kminus .gt. 1)) then
rhominus=((zx(k)-zz(i,j,kminus))*rho(i,j,kminus+1)+ &
(zz(i,j,kminus+1)-zx(k))*rho(i,j,kminus))/ &
(0.5*(hn(i,j,kminus+1)+hn(i,j,kminus)))
(0.5*(hn(i,j,kminus+1)+hn(i,j,kminus)))
end if
if (zx(k) .gt. max(-H(i+1,j),-H(i,j))) then
grdl=0.5*hun(i,j,k)*(rhoplus-rhominus)*dxm1
......@@ -220,7 +224,7 @@
#endif
#endif
idpdx(i,j,k)=hun(i,j,k)*prgr
end do
end do
end if
end do
end do
......@@ -264,7 +268,7 @@
if ((kplus .lt. kmax) .and. (kplus .gt. 1)) then
rhoplus=((zx(k)-zz(i,j+1,kplus))*rho(i,j+1,kplus+1)+ &
(zz(i,j+1,kplus+1)-zx(k))*rho(i,j+1,kplus))/ &
(0.5*(hn(i,j+1,kplus+1)+hn(i,j+1,kplus)))
(0.5*(hn(i,j+1,kplus+1)+hn(i,j+1,kplus)))
end if
if (kminus .eq. kmax) rhominus=rho(i,j,kminus)
if ((kminus .lt. kmax) .and. (kminus .gt. 1)) then
......
!$Id: m3d.F90,v 1.4 2003-04-07 16:28:34 kbk Exp $
!$Id: m3d.F90,v 1.5 2003-04-23 12:16:34 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
......@@ -19,8 +19,8 @@
!
! !USES:
use parameters, only: avmmol
use domain, only: vert_cord
use m2d, only: Am
use domain, only: vert_cord
use m2d, only: Am
use variables_2d, only: D,z
#ifndef NO_BAROCLINIC
use temperature,only: init_temperature, do_temperature
......@@ -28,10 +28,10 @@
use eqstate, only: init_eqstate, do_eqstate
#endif
#ifndef NO_BAROCLINIC
use suspended_matter, only: init_spm, do_spm
use suspended_matter, only: init_spm, do_spm
#endif
use advection_3d, only: init_advection_3d
use bdy_3d, only: init_bdy_3d, do_bdy_3d
use bdy_3d, only: init_bdy_3d, do_bdy_3d
use variables_3d
#ifdef PARALLEL
use halo_mpi
......@@ -40,18 +40,23 @@ use halo_mpi
IMPLICIT NONE
!
! !PUBLIC DATA MEMBERS:
integer :: M=1
REALTYPE :: cord_relax=_ZERO_
logical :: calc_temp=.true.,calc_salt=.true.,calc_spm=.false.
logical :: bdy3d=.false.
integer :: bdyfmt_3d,bdyramp_3d
character(len=PATH_MAX) :: bdyfile_3d
integer :: M=1