Commit 427f4e98 authored by Karsten Bolding's avatar Karsten Bolding
Browse files

removed CVS specific Id and Log info

parent 86d85bf3
$Id: README,v 1.1 2002-05-02 14:00:28 gotm Exp $
!$Id: bottom_friction.F90,v 1.10 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -43,10 +42,6 @@ ...@@ -43,10 +42,6 @@
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
integer, intent(in) :: runtype integer, intent(in) :: runtype
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard ! Original author(s): Karsten Bolding & Hans Burchard
! !
......
!$Id: cfl_check.F90,v 1.7 2006-03-01 15:54:07 kbk Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -43,12 +42,6 @@ ...@@ -43,12 +42,6 @@
use m2d, only: dtm use m2d, only: dtm
IMPLICIT NONE IMPLICIT NONE
! !
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard ! Original author(s): Karsten Bolding & Hans Burchard
! !
......
!$Id: depth_update.F90,v 1.12 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -29,12 +28,6 @@ ...@@ -29,12 +28,6 @@
!$ use omp_lib !$ use omp_lib
IMPLICIT NONE IMPLICIT NONE
! !
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding ! Original author(s): Hans Burchard & Karsten Bolding
! !
......
!$Id: have_bdy.F90,v 1.9 2008-12-09 00:31:57 kb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -19,12 +18,6 @@ ...@@ -19,12 +18,6 @@
use m2d, only: have_boundaries use m2d, only: have_boundaries
IMPLICIT NONE IMPLICIT NONE
! !
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard ! Original author(s): Karsten Bolding & Hans Burchard
! !
......
!$Id: m2d.F90,v 1.35 2009-12-11 13:19:04 bjb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
......
!$Id: momentum.F90,v 1.16 2010-03-25 11:48:55 hb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -27,10 +26,6 @@ ...@@ -27,10 +26,6 @@
REALTYPE, intent(in) :: tausy(E2DFIELD) REALTYPE, intent(in) :: tausy(E2DFIELD)
REALTYPE, intent(in) :: airp(E2DFIELD) REALTYPE, intent(in) :: airp(E2DFIELD)
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding ! Original author(s): Hans Burchard & Karsten Bolding
! !
...@@ -139,10 +134,6 @@ ...@@ -139,10 +134,6 @@
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
REALTYPE, intent(in) :: tausx(E2DFIELD),airp(E2DFIELD) REALTYPE, intent(in) :: tausx(E2DFIELD),airp(E2DFIELD)
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES: ! !LOCAL VARIABLES:
integer :: i,j integer :: i,j
REALTYPE :: zx(E2DFIELD) REALTYPE :: zx(E2DFIELD)
...@@ -319,10 +310,6 @@ ...@@ -319,10 +310,6 @@
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
REALTYPE, intent(in) :: tausy(E2DFIELD),airp(E2DFIELD) REALTYPE, intent(in) :: tausy(E2DFIELD),airp(E2DFIELD)
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES: ! !LOCAL VARIABLES:
integer :: i,j integer :: i,j
REALTYPE :: zy(E2DFIELD) REALTYPE :: zy(E2DFIELD)
......
!$Id: residual.F90,v 1.7 2006-03-01 15:54:07 kbk Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -34,14 +33,9 @@ ...@@ -34,14 +33,9 @@
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
integer, intent(in) :: finish integer, intent(in) :: finish
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard ! Original author(s): Karsten Bolding & Hans Burchard
! !
! !LOCAL VARIABLES:
!EOP !EOP
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOC !BOC
......
!$Id: sealevel.F90,v 1.20 2009-10-02 11:29:11 bjb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -39,12 +38,6 @@ ...@@ -39,12 +38,6 @@
!$ use omp_lib !$ use omp_lib
IMPLICIT NONE IMPLICIT NONE
! !
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding ! Original author(s): Hans Burchard & Karsten Bolding
! !
...@@ -219,12 +212,6 @@ ...@@ -219,12 +212,6 @@
use exceptions, only: getm_error use exceptions, only: getm_error
IMPLICIT NONE IMPLICIT NONE
! !
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Bjarne B\"uchmann ! Original author(s): Bjarne B\"uchmann
! !
...@@ -235,7 +222,6 @@ ...@@ -235,7 +222,6 @@
integer :: num_nan integer :: num_nan
integer :: i,j,inan,jnan, idum integer :: i,j,inan,jnan, idum
REALTYPE :: ahuge,zdum REALTYPE :: ahuge,zdum
!
!EOP !EOP
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOC !BOC
...@@ -359,8 +345,6 @@ ...@@ -359,8 +345,6 @@
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
REALTYPE, intent(in) :: a,b REALTYPE, intent(in) :: a,b
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS: ! !OUTPUT PARAMETERS:
integer, intent(out) :: idum integer, intent(out) :: idum
! !
...@@ -373,7 +357,6 @@ ...@@ -373,7 +357,6 @@
! also if a is NaN. If b=HUGE(b), then this provides a means to detect ! also if a is NaN. If b=HUGE(b), then this provides a means to detect
! if a is a denormal number. ! if a is a denormal number.
! !
!
!EOP !EOP
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOC !BOC
......
!$Id: update_2d_bdy.F90,v 1.10 2009-01-30 15:33:03 kb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -31,16 +30,11 @@ ...@@ -31,16 +30,11 @@
#else #else
use domain, only: dx,dy use domain, only: dx,dy
#endif #endif
IMPLICIT NONE IMPLICIT NONE
! !
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
integer, intent(in) :: loop,bdyramp integer, intent(in) :: loop,bdyramp
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard ! Original author(s): Karsten Bolding & Hans Burchard
! !
...@@ -73,73 +67,8 @@ ...@@ -73,73 +67,8 @@
#ifdef COAST_TEST #ifdef COAST_TEST
amp = 1.5 amp = 1.5
bdy_data = amp*sin(OMEGA*t) bdy_data = amp*sin(OMEGA*t)
#endif
#ifdef WADDEN_SEA_TEST
amp = 1.5
bdy_data = amp*sin(OMEGA*t)
#endif
#ifdef FRESHWATER_LENSE_TEST
bdy_data=_ZERO_
#endif
#undef OMEGA
#ifdef CHANNEL_TEST
stop 'CHANNEL_TEST - update2dbdy'
z(1,:) = 0.01
z(51,:) = -0.01
#endif
#undef KBK_TESTING
#ifdef CURVI_TEST
k = 0
do n=1,NWB
i = wi(n)
if (n .eq. 1) then
a = 0.05
else
a = -0.05
end if
do j=wfj(1),wlj(1)
k = k+1
bdy_data(k) = a
end do
end do
do n=1,NEB
i = ei(n)
do j=efj(1),elj(1)
k = k+1
bdy_data(k) = -0.05
end do
end do
#endif #endif
case (ASCII) case (ASCII)
#ifdef SYLT_TEST
if (first) then
first = .false.
if (bdyfmt_2d .eq. 1) then
open(BDYDATA,file='bdy_data.dat')
t1 = 0.
do i=1,nsbv
read(BDYDATA,*) zbo(i)
end do
t2 = 44714./80
do i=1,nsbv
read(BDYDATA,*) zbn(i)
end do
end if
end if
! Read in new boundary values
if (t .ge. t2) then
t1 = t2
t2 = t2+44714./80
zbo = zbn
STDERR 'Reading new boundary values.... '
do i=1,nsbv
read(BDYDATA,*) zbn(i)
end do
end if
#endif
case (NETCDF) case (NETCDF)
! Read in get_2d_bdy() via get_2d_bdy_ncdf() ! Read in get_2d_bdy() via get_2d_bdy_ncdf()
case default case default
...@@ -153,13 +82,6 @@ ...@@ -153,13 +82,6 @@
fac = _ONE_ fac = _ONE_
if(bdyramp .gt. 1) fac=min( _ONE_ ,FOUR*loop/float(bdyramp)) if(bdyramp .gt. 1) fac=min( _ONE_ ,FOUR*loop/float(bdyramp))
! implicit Sommerfeldt
#if 0
eta = 1/(1+Cx)(eta_old + Cx*eta_new)
Cx=dtm/dx*srt(g*D)
z(i,j) = _ONE_/(_ONE_+Cx)*(z(i,j)+Cx*z(i,j-1))
#endif
l = 0 l = 0
do n = 1,NWB do n = 1,NWB
l = l+1 l = l+1
...@@ -253,27 +175,6 @@ eta = 1/(1+Cx)(eta_old + Cx*eta_new) ...@@ -253,27 +175,6 @@ eta = 1/(1+Cx)(eta_old + Cx*eta_new)
end do end do
end do end do
#ifdef WADDEN_SEA_TEST
i=imin
do j=1,90
if (az(i+2,j).eq.2) then
a=z(i+1,j)+z(i+1,j)-z(i+2,j)
else
a=z(i+1,j)
end if
if (az(i,j).eq.2) z(i,j)= max(a,-H(i,j)+min_depth)
end do
i=imax
do j=1,127
if (az(i-2,j).eq.2) then
a=z(i-1,j)+z(i-1,j)-z(i-2,j)
else
a=z(i-1,j)
end if
if (az(i,j).eq.2) z(i,j)= max(a,-H(i,j)+min_depth)
end do
#endif
#ifdef DEBUG #ifdef DEBUG
write(debug,*) 'Leaving update_2d_bdy()' write(debug,*) 'Leaving update_2d_bdy()'
write(debug,*) write(debug,*)
......
!$Id: uv_advect.F90,v 1.12 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -156,12 +155,6 @@ ...@@ -156,12 +155,6 @@
!$ use omp_lib !$ use omp_lib
IMPLICIT NONE IMPLICIT NONE
! !
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding ! Original author(s): Hans Burchard & Karsten Bolding
! !
......
!$Id: uv_depths.F90,v 1.13 2009-08-18 10:24:44 bjb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -53,17 +52,12 @@ ...@@ -53,17 +52,12 @@
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
integer, intent(in) :: vel_depth_method integer, intent(in) :: vel_depth_method
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding ! Original author(s): Hans Burchard & Karsten Bolding
! !
! !LOCAL VARIABLES: ! !LOCAL VARIABLES:
integer :: i,j integer :: i,j
REALTYPE :: d_crit=2.0 REALTYPE :: d_crit=2.0
!
!EOP !EOP
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOC !BOC
......
!$Id: uv_diffusion.F90,v 1.13 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -172,10 +171,6 @@ ...@@ -172,10 +171,6 @@
integer, intent(in) :: An_method integer, intent(in) :: An_method
REALTYPE, intent(in) :: An(E2DFIELD),AnX(E2DFIELD) REALTYPE, intent(in) :: An(E2DFIELD),AnX(E2DFIELD)
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Hans Burchard ! Original author(s): Hans Burchard
! !
......
!$Id: variables_2d.F90,v 1.10 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -35,7 +34,6 @@ ...@@ -35,7 +34,6 @@
! !
! !LOCAL VARIABLES: ! !LOCAL VARIABLES:
integer :: rc integer :: rc
!
!EOP !EOP
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
...@@ -96,12 +94,6 @@ ...@@ -96,12 +94,6 @@
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
integer, intent(in) :: runtype integer, intent(in) :: runtype
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
!
!EOP !EOP
!------------------------------------------------------------------------- !-------------------------------------------------------------------------
!BOC !BOC
...@@ -167,12 +159,6 @@ ...@@ -167,12 +159,6 @@
subroutine clean_variables_2d() subroutine clean_variables_2d()
IMPLICIT NONE IMPLICIT NONE
! !
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !DESCRIPTION: ! !DESCRIPTION:
! This routine is currently empty. ! This routine is currently empty.
! !
......
!$id: advection_3d.F90,v 1.18 2001/09/19 13:53:08 bbh Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -51,8 +50,6 @@ ...@@ -51,8 +50,6 @@
REALTYPE, public, parameter :: one6th=1./6. REALTYPE, public, parameter :: one6th=1./6.
REALTYPE, public, parameter :: ONE=_ONE_,TWO=2.*_ONE_ REALTYPE, public, parameter :: ONE=_ONE_,TWO=2.*_ONE_
! !
! !PRIVATE DATA MEMBERS:
!
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard ! Original author(s): Karsten Bolding & Hans Burchard
! !
...@@ -82,10 +79,6 @@ ...@@ -82,10 +79,6 @@
! !INPUT PARAMETERS: ! !INPUT PARAMETERS:
integer, intent(in) :: method integer, intent(in) :: method
! !
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES: ! !LOCAL VARIABLES:
integer :: rc integer :: rc
!EOP !EOP
...@@ -246,12 +239,9 @@ ...@@ -246,12 +239,9 @@
! !INPUT/OUTPUT PARAMETERS: ! !INPUT/OUTPUT PARAMETERS:
REALTYPE, intent(inout) :: f(I3DFIELD) REALTYPE, intent(inout) :: f(I3DFIELD)
! !
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES: ! !LOCAL VARIABLES:
REALTYPE, parameter :: a1=0.5*ONE,a2=ONE REALTYPE, parameter :: a1=0.5*ONE,a2=ONE
integer :: k