Browse Source

removed CVS specific Id and Log info

master
Karsten Bolding 12 years ago
parent
commit
427f4e98e5
  1. 2
      README
  2. 5
      src/2d/bottom_friction.F90
  3. 7
      src/2d/cfl_check.F90
  4. 7
      src/2d/depth_update.F90
  5. 7
      src/2d/have_bdy.F90
  6. 1
      src/2d/m2d.F90
  7. 13
      src/2d/momentum.F90
  8. 6
      src/2d/residual.F90
  9. 17
      src/2d/sealevel.F90
  10. 99
      src/2d/update_2d_bdy.F90
  11. 7
      src/2d/uv_advect.F90
  12. 6
      src/2d/uv_depths.F90
  13. 5
      src/2d/uv_diffusion.F90
  14. 14
      src/2d/variables_2d.F90
  15. 10
      src/3d/advection_3d.F90
  16. 11
      src/3d/bdy_3d.F90
  17. 7
      src/3d/bottom_friction_3d.F90
  18. 1
      src/3d/coordinates.F90
  19. 13
      src/3d/divergence.F90
  20. 15
      src/3d/eqstate.F90
  21. 4
      src/3d/fct_2dh_adv.F90
  22. 5
      src/3d/general_coordinates.F90
  23. 15
      src/3d/getm_bio.F90
  24. 8
      src/3d/gotm.F90
  25. 1
      src/3d/hcc_check.F90
  26. 1
      src/3d/hybrid_coordinates.F90
  27. 7
      src/3d/internal_pressure.F90
  28. 1
      src/3d/ip_blumberg_mellor.F90
  29. 1
      src/3d/ip_blumberg_mellor_lin.F90
  30. 1
      src/3d/ip_chu_fan.F90
  31. 1
      src/3d/ip_shchepetkin_mcwilliams.F90
  32. 2
      src/3d/ip_song_wright.F90
  33. 1
      src/3d/ip_stelling_vankester.F90
  34. 1
      src/3d/ip_z_interpol.F90
  35. 7
      src/3d/m3d.F90
  36. 1
      src/3d/physical_mixing.F90
  37. 26
      src/3d/rivers.F90
  38. 8
      src/3d/salinity.F90
  39. 1
      src/3d/sigma_coordinates.F90
  40. 7
      src/3d/slow_advection.F90
  41. 7
      src/3d/slow_bottom_friction.F90
  42. 7
      src/3d/slow_diffusion.F90
  43. 9
      src/3d/slow_terms.F90
  44. 1
      src/3d/spm.F90
  45. 7
      src/3d/ss_nn.F90
  46. 7
      src/3d/start_macro.F90
  47. 8
      src/3d/stop_macro.F90
  48. 7
      src/3d/stresses_3d.F90
  49. 8
      src/3d/structure_friction_3d.F90
  50. 10
      src/3d/temperature.F90
  51. 6
      src/3d/tke_eps_advect_3d.F90
  52. 3
      src/3d/u_split_adv.F90
  53. 4
      src/3d/upstream_2dh_adv.F90
  54. 3
      src/3d/upstream_adv.F90
  55. 5
      src/3d/uu_momentum_3d.F90
  56. 9
      src/3d/uv_advect_3d.F90
  57. 5
      src/3d/uv_diffusion_3d.F90
  58. 4
      src/3d/v_split_adv.F90
  59. 15
      src/3d/variables_3d.F90
  60. 5
      src/3d/vv_momentum_3d.F90
  61. 4
      src/3d/w_split_adv.F90
  62. 4
      src/3d/w_split_it_adv.F90
  63. 7
      src/3d/ww_momentum_3d.F90
  64. 40
      src/domain/bdy_spec.F90
  65. 181
      src/domain/domain.F90
  66. 20
      src/domain/mirror_bdy_2d.F90
  67. 25
      src/domain/mirror_bdy_3d.F90
  68. 1
      src/domain/part_domain.F90
  69. 22
      src/domain/print_bdy.F90
  70. 12
      src/futils/c2x.F90
  71. 14
      src/futils/check_3d_fields.F90
  72. 17
      src/futils/cnv_2d.F90
  73. 20
      src/futils/cnv_3d.F90
  74. 16
      src/futils/col_interpol.F90
  75. 19
      src/futils/eta_mask.F90
  76. 17
      src/futils/exceptions.F90
  77. 14
      src/futils/getm_error.F90
  78. 10
      src/futils/getm_timers.F90
  79. 55
      src/futils/grid_interpol.F90
  80. 128
      src/futils/halo_mpi.F90
  81. 44
      src/futils/halo_zones.F90
  82. 12
      src/futils/kbk_interpol.F90
  83. 48
      src/futils/parallel.F90
  84. 34
      src/futils/parameters.F90
  85. 15
      src/futils/pos.F90
  86. 1
      src/futils/read_par_setup.F90
  87. 69
      src/futils/time.F90
  88. 8
      src/futils/to_2d_u.F90
  89. 9
      src/futils/to_2d_v.F90
  90. 20
      src/futils/to_2d_vel.F90
  91. 16
      src/futils/to_3d_uu.F90
  92. 25
      src/futils/to_3d_vel.F90
  93. 16
      src/futils/to_3d_vv.F90
  94. 32
      src/futils/tow.F90
  95. 16
      src/futils/tridiagonal.F90
  96. 21
      src/futils/ver_interpol.F90
  97. 25
      src/getm/cleanup.F90
  98. 111
      src/getm/initialise.F90
  99. 80
      src/getm/integration.F90
  100. 66
      src/getm/main.F90
  101. Some files were not shown because too many files have changed in this diff Show More

2
README

@ -1,2 +0,0 @@
$Id: README,v 1.1 2002-05-02 14:00:28 gotm Exp $

5
src/2d/bottom_friction.F90

@ -1,4 +1,3 @@
!$Id: bottom_friction.F90,v 1.10 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -43,10 +42,6 @@
! !INPUT PARAMETERS:
integer, intent(in) :: runtype
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!

7
src/2d/cfl_check.F90

@ -1,4 +1,3 @@
!$Id: cfl_check.F90,v 1.7 2006-03-01 15:54:07 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -43,12 +42,6 @@
use m2d, only: dtm
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!

7
src/2d/depth_update.F90

@ -1,4 +1,3 @@
!$Id: depth_update.F90,v 1.12 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -29,12 +28,6 @@
!$ use omp_lib
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!

7
src/2d/have_bdy.F90

@ -1,4 +1,3 @@
!$Id: have_bdy.F90,v 1.9 2008-12-09 00:31:57 kb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -19,12 +18,6 @@
use m2d, only: have_boundaries
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!

1
src/2d/m2d.F90

@ -1,4 +1,3 @@
!$Id: m2d.F90,v 1.35 2009-12-11 13:19:04 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

13
src/2d/momentum.F90

@ -1,4 +1,3 @@
!$Id: momentum.F90,v 1.16 2010-03-25 11:48:55 hb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -27,10 +26,6 @@
REALTYPE, intent(in) :: tausy(E2DFIELD)
REALTYPE, intent(in) :: airp(E2DFIELD)
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!
@ -139,10 +134,6 @@
! !INPUT PARAMETERS:
REALTYPE, intent(in) :: tausx(E2DFIELD),airp(E2DFIELD)
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j
REALTYPE :: zx(E2DFIELD)
@ -319,10 +310,6 @@
! !INPUT PARAMETERS:
REALTYPE, intent(in) :: tausy(E2DFIELD),airp(E2DFIELD)
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j
REALTYPE :: zy(E2DFIELD)

6
src/2d/residual.F90

@ -1,4 +1,3 @@
!$Id: residual.F90,v 1.7 2006-03-01 15:54:07 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -34,14 +33,9 @@
! !INPUT PARAMETERS:
integer, intent(in) :: finish
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!
! !LOCAL VARIABLES:
!EOP
!-----------------------------------------------------------------------
!BOC

17
src/2d/sealevel.F90

@ -1,4 +1,3 @@
!$Id: sealevel.F90,v 1.20 2009-10-02 11:29:11 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -39,12 +38,6 @@
!$ use omp_lib
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!
@ -219,12 +212,6 @@
use exceptions, only: getm_error
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Bjarne B\"uchmann
!
@ -235,7 +222,6 @@
integer :: num_nan
integer :: i,j,inan,jnan, idum
REALTYPE :: ahuge,zdum
!
!EOP
!-----------------------------------------------------------------------
!BOC
@ -359,8 +345,6 @@
! !INPUT PARAMETERS:
REALTYPE, intent(in) :: a,b
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
integer, intent(out) :: idum
!
@ -373,7 +357,6 @@
! also if a is NaN. If b=HUGE(b), then this provides a means to detect
! if a is a denormal number.
!
!
!EOP
!-----------------------------------------------------------------------
!BOC

99
src/2d/update_2d_bdy.F90

@ -1,4 +1,3 @@
!$Id: update_2d_bdy.F90,v 1.10 2009-01-30 15:33:03 kb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -31,16 +30,11 @@
#else
use domain, only: dx,dy
#endif
IMPLICIT NONE
!
! !INPUT PARAMETERS:
integer, intent(in) :: loop,bdyramp
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!
@ -73,73 +67,8 @@
#ifdef COAST_TEST
amp = 1.5
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
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)
! Read in get_2d_bdy() via get_2d_bdy_ncdf()
case default
@ -153,13 +82,6 @@
fac = _ONE_
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
do n = 1,NWB
l = l+1
@ -253,27 +175,6 @@ eta = 1/(1+Cx)(eta_old + Cx*eta_new)
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
write(debug,*) 'Leaving update_2d_bdy()'
write(debug,*)

7
src/2d/uv_advect.F90

@ -1,4 +1,3 @@
!$Id: uv_advect.F90,v 1.12 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -156,12 +155,6 @@
!$ use omp_lib
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!

6
src/2d/uv_depths.F90

@ -1,4 +1,3 @@
!$Id: uv_depths.F90,v 1.13 2009-08-18 10:24:44 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -53,17 +52,12 @@
! !INPUT PARAMETERS:
integer, intent(in) :: vel_depth_method
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!
! !LOCAL VARIABLES:
integer :: i,j
REALTYPE :: d_crit=2.0
!
!EOP
!-----------------------------------------------------------------------
!BOC

5
src/2d/uv_diffusion.F90

@ -1,4 +1,3 @@
!$Id: uv_diffusion.F90,v 1.13 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -172,10 +171,6 @@
integer, intent(in) :: An_method
REALTYPE, intent(in) :: An(E2DFIELD),AnX(E2DFIELD)
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard
!

14
src/2d/variables_2d.F90

@ -1,4 +1,3 @@
!$Id: variables_2d.F90,v 1.10 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -35,7 +34,6 @@
!
! !LOCAL VARIABLES:
integer :: rc
!
!EOP
!-----------------------------------------------------------------------
@ -96,12 +94,6 @@
! !INPUT PARAMETERS:
integer, intent(in) :: runtype
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
!
!EOP
!-------------------------------------------------------------------------
!BOC
@ -167,12 +159,6 @@
subroutine clean_variables_2d()
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !DESCRIPTION:
! This routine is currently empty.
!

10
src/3d/advection_3d.F90

@ -1,4 +1,3 @@
!$id: advection_3d.F90,v 1.18 2001/09/19 13:53:08 bbh Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -51,8 +50,6 @@
REALTYPE, public, parameter :: one6th=1./6.
REALTYPE, public, parameter :: ONE=_ONE_,TWO=2.*_ONE_
!
! !PRIVATE DATA MEMBERS:
!
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!
@ -82,10 +79,6 @@
! !INPUT PARAMETERS:
integer, intent(in) :: method
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: rc
!EOP
@ -246,12 +239,9 @@
! !INPUT/OUTPUT PARAMETERS:
REALTYPE, intent(inout) :: f(I3DFIELD)
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
REALTYPE, parameter :: a1=0.5*ONE,a2=ONE
integer :: k
!
!EOP
!-----------------------------------------------------------------------
!BOC

11
src/3d/bdy_3d.F90

@ -1,4 +1,3 @@
!$Id: bdy_3d.F90,v 1.14 2009-09-04 11:50:34 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -38,7 +37,6 @@
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!
! !LOCAL VARIABLES:
!EOP
!-----------------------------------------------------------------------
@ -61,12 +59,6 @@
! !USES:
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: rc,i,j,k,n
!EOP
@ -135,8 +127,6 @@
! !INPUT/OUTPUT PARAMETERS:
REALTYPE, intent(inout) :: field(I3DFIELD)
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j,k,l,n,ii,jj,kk
REALTYPE :: sp(1:4),rat
@ -449,7 +439,6 @@
end if
#endif
#endif
#ifdef DEBUG

7
src/3d/bottom_friction_3d.F90

@ -1,4 +1,3 @@
!$Id: bottom_friction_3d.F90,v 1.13 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -53,12 +52,6 @@
!$ use omp_lib
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!

1
src/3d/coordinates.F90

@ -1,4 +1,3 @@
!$Id: coordinates.F90,v 1.18 2010-03-30 11:48:37 kb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

13
src/3d/divergence.F90

@ -1,4 +1,3 @@
!$Id: divergence.F90,v 1.1 2010-03-24 14:58:15 kb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -21,23 +20,11 @@
use variables_3d, only: hun,hvn,uu,vv
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: divergence.F90,v $
! Revision 1.1 2010-03-24 14:58:15 kb
! cleaned divergence calculations
!
!
! !LOCAL VARIABLES:
integer :: i,j
!
!EOP
!-----------------------------------------------------------------------
!BOC

15
src/3d/eqstate.F90

@ -1,4 +1,3 @@
!$Id: eqstate.F90,v 1.13 2009-09-30 11:28:44 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -28,7 +27,6 @@
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!
! !LOCAL VARIABLES:
!EOP
!-----------------------------------------------------------------------
@ -43,19 +41,12 @@
subroutine init_eqstate()
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !DESCRIPTION:
! Reads the namelist and makes calls to the init functions of the
! various model components.
!
! !LOCAL VARIABLES:
namelist /eqstate/ eqstate_method,T0,S0,p0,dtr0,dsr0
!
!EOP
!-------------------------------------------------------------------------
!BOC
@ -109,12 +100,6 @@
!$ use omp_lib
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j,k
REALTYPE :: x

4
src/3d/fct_2dh_adv.F90

@ -1,4 +1,3 @@
!$Id: fct_2dh_adv.F90,v 1.8 2009-09-30 11:28:45 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -50,8 +49,6 @@
! !INPUT/OUTPUT PARAMETERS:
REALTYPE, intent(inout) :: f(I3DFIELD)
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!
@ -72,7 +69,6 @@
#endif
REALTYPE :: CNW,CW,CSW,CSSW,CWW,CSWW,CC,CS
REALTYPE :: uuu,vvv,x,CExx,Cl,Cu,fac
!
!EOP
!-----------------------------------------------------------------------
!BOC

5
src/3d/general_coordinates.F90

@ -1,4 +1,3 @@
!$Id: general_coordinates.F90,v 1.4 2009-10-01 07:13:54 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -81,10 +80,6 @@
REALTYPE, intent(in) :: cord_relax
REALTYPE, intent(in) :: maxdepth
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!

15
src/3d/getm_bio.F90

@ -1,4 +1,3 @@
!$Id: getm_bio.F90,v 1.4 2009-11-20 09:17:13 kb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -58,16 +57,6 @@
! !REVISION HISTORY:
! Original author(s): Hans Burchard & Karsten Bolding
!
! $Log: getm_bio.F90,v $
! Revision 1.4 2009-11-20 09:17:13 kb
! updated GOTM/BIO interface
!
! Revision 1.3 2007-06-07 10:25:19 kbk
! iimin,iimax,jjmin,jjmax -> imin,imax,jmin,jmax
!
! Revision 1.2 2007-05-14 12:16:22 kbk
! added support for biology - via GOTM
!
!EOP
!-----------------------------------------------------------------------
@ -212,10 +201,6 @@
! !INPUT PARAMETERS:
REALTYPE, intent(in) :: dt
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! See the log for the module
!

8
src/3d/gotm.F90

@ -1,4 +1,3 @@
!$Id: gotm.F90,v 1.22 2010-03-02 13:06:56 hb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -63,12 +62,6 @@
use getm_timers, only: tic, toc, TIM_GOTM, TIM_GOTMTURB, TIM_GOTMH
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!
@ -78,7 +71,6 @@
REALTYPE :: h(0:kmax),dry,zz
REALTYPE :: NN1d(0:kmax),SS1d(0:kmax)
REALTYPE :: xP(0:kmax)
!
!EOP
!-----------------------------------------------------------------------
!BOC

1
src/3d/hcc_check.F90

@ -1,4 +1,3 @@
!$Id: hcc_check.F90,v 1.5 2007-06-07 10:25:19 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

1
src/3d/hybrid_coordinates.F90

@ -1,4 +1,3 @@
!$Id: hybrid_coordinates.F90,v 1.2 2007-06-07 10:25:19 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

7
src/3d/internal_pressure.F90

@ -1,4 +1,3 @@
!$Id: internal_pressure.F90,v 1.23 2009-09-30 11:28:45 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -191,12 +190,6 @@
use getm_timers, only: tic, toc, TIM_INTPRESS
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j,k
logical, save :: first=.true.

1
src/3d/ip_blumberg_mellor.F90

@ -1,4 +1,3 @@
!$Id: ip_blumberg_mellor.F90,v 1.11 2009-09-30 11:28:45 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

1
src/3d/ip_blumberg_mellor_lin.F90

@ -1,4 +1,3 @@
!$Id: ip_blumberg_mellor_lin.F90,v 1.8 2009-09-30 11:28:45 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

1
src/3d/ip_chu_fan.F90

@ -1,4 +1,3 @@
!$Id: ip_chu_fan.F90,v 1.8 2009-10-01 12:23:13 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

1
src/3d/ip_shchepetkin_mcwilliams.F90

@ -292,4 +292,3 @@
!-----------------------------------------------------------------------
! Copyright (C) 2007 - Richard Hofmeister !
!-----------------------------------------------------------------------

2
src/3d/ip_song_wright.F90

@ -1,4 +1,3 @@
!$Id: ip_song_wright.F90,v 1.7 2009-09-30 11:28:45 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -41,7 +40,6 @@
! The discretisation of $(\partial_y^* b)_k$ for the $v$-equation is
! done accordingly.
!
!
! !USES:
use internal_pressure
!$ use omp_lib

1
src/3d/ip_stelling_vankester.F90

@ -1,4 +1,3 @@
!$Id: ip_stelling_vankester.F90,v 1.5 2009-12-18 08:11:10 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

1
src/3d/ip_z_interpol.F90

@ -1,4 +1,3 @@
!$Id: ip_z_interpol.F90,v 1.7 2009-09-30 11:28:45 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

7
src/3d/m3d.F90

@ -1,4 +1,3 @@
!$Id: m3d.F90,v 1.49 2010-03-30 11:48:37 kb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -86,9 +85,6 @@
REALTYPE, intent(in) :: timestep
logical, intent(in) :: hotstart
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !DESCRIPTION:
! Here, the {\tt m3d} namelist is read from {\tt getm.inp}, and the
@ -115,13 +111,12 @@
NAMELIST /m3d/ &
M,cnpar,cord_relax, &
bdy3d,bdyfmt_3d,bdyramp_3d,bdyfile_3d, &
bdy3d_tmrlx,bdy3d_tmrlx_ucut, &
bdy3d_tmrlx,bdy3d_tmrlx_ucut, &
bdy3d_tmrlx_max,bdy3d_tmrlx_min, &
vel_hor_adv,vel_ver_adv,vel_adv_split, &
calc_temp,calc_salt, &
avmback,avhback,ip_method,ip_ramp, &
vel_check,min_vel,max_vel
!
!EOP
!-------------------------------------------------------------------------
!BOC

1
src/3d/physical_mixing.F90

@ -56,4 +56,3 @@
!-----------------------------------------------------------------------
! Copyright (C) 2010 - Hannes Rennau, Richard Hofmeister !
!-----------------------------------------------------------------------

26
src/3d/rivers.F90

@ -1,4 +1,3 @@
!$Id: rivers.F90,v 1.15 2008-02-21 12:04:42 kb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -84,7 +83,6 @@
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!
! !LOCAL VARIABLES:
!EOP
!-----------------------------------------------------------------------
@ -112,12 +110,6 @@
! !USES:
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j,n,nn,ni,rc,m,iriver,jriver,numcells
integer :: unit = 25 ! kbk
@ -307,12 +299,6 @@
! !USES:
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: rc
!EOP
@ -364,17 +350,12 @@
! !INPUT PARAMETERS:
logical, intent(in) :: do_3d
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j,k,m,n
integer, save :: nn=0
REALTYPE :: ramp=_ONE_
REALTYPE :: rvol,height
REALTYPE :: svol,tvol,vol
!
!EOP
!-----------------------------------------------------------------------
!BOC
@ -468,17 +449,10 @@
!
! This routine closes the river handling by writing the integrated
! river run-off for each river to standard output.
!
!
! !USES:
IMPLICIT NONE
!
! !INPUT PARAMETERS:
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j,n
REALTYPE :: tot=_ZERO_

8
src/3d/salinity.F90

@ -1,4 +1,3 @@
!$Id: salinity.F90,v 1.30 2010-03-15 13:04:51 kb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
@ -43,7 +42,6 @@
! !REVISION HISTORY:
! Original author(s): Karsten Bolding & Hans Burchard
!
! !LOCAL VARIABLES:
!EOP
!-----------------------------------------------------------------------
@ -294,7 +292,6 @@ salt_field_no=1
end if
#ifdef DEBUG
write(debug,*) 'Leaving init_salinity()'
write(debug,*)
@ -348,10 +345,6 @@ salt_field_no=1
! !INPUT PARAMETERS:
integer, intent(in) :: n
!
! !INPUT/OUTPUT PARAMETERS:
!
! !OUTPUT PARAMETERS:
!
! !LOCAL VARIABLES:
integer :: i,j,k,rc
REALTYPE, POINTER :: Res(:)
@ -551,7 +544,6 @@ salt_field_no=1
end do
#endif
#ifdef SLOPE_TEST
do i=81,82
do j=42,43

1
src/3d/sigma_coordinates.F90

@ -1,4 +1,3 @@
!$Id: sigma_coordinates.F90,v 1.3 2009-09-30 11:28:45 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP

7
src/3d/slow_advection.F90

@ -1,4 +1,3 @@
!$Id: slow_advection.F90,v 1.13 2009-09-30 11:28:45 bjb Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP