getm
/
code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

added remove_blanks_at_end_of_line.sh and removed trailing blanks

master
Karsten Bolding 12 years ago
parent
8761233c41
commit
260cd20b8b
26 changed files with 66 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/Makefile
  2. 12
      remove_blanks_at_end_of_line.sh
  3. 2
      src/2d/Makefile
  4. 2
      src/2d/dynamic_declarations_2d.h
  5. 4
      src/2d/m2d.F90
  6. 4
      src/2d/static_2d.h
  7. 4
      src/3d/Makefile
  8. 14
      src/3d/adaptive_coordinates.F90
  9. 8
      src/3d/dynamic_allocations_3d.h
  10. 2
      src/3d/dynamic_declarations_3d.h
  11. 10
      src/3d/getm_fabm.F90
  12. 2
      src/3d/hybrid_coordinates.F90
  13. 4
      src/3d/m3d.F90
  14. 8
      src/3d/salinity.F90
  15. 4
      src/3d/static_3d.h
  16. 2
      src/cutils/Makefile
  17. 8
      src/domain/Makefile
  18. 2
      src/domain/domain.F90
  19. 4
      src/futils/Makefile
  20. 2
      src/futils/getm_timers.F90
  21. 2
      src/getm/Makefile
  22. 2
      src/input/Makefile
  23. 2
      src/meteo/Makefile
  24. 6
      src/ncdf/Makefile
  25. 2
      src/ncdf/init_mean_ncdf.F90
  26. 6
      src/output/Makefile

2
doc/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# Makefile for the GETM source code documentation.
# Makefile for the GETM source code documentation.
#
SHELL = /bin/sh

12
remove_blanks_at_end_of_line.sh
Unescape View File

@ -0,0 +1,12 @@
#!/bin/sh
FF=`find . -name \*.F90 -print`
echo $FF
HF=`find . -name \*.h -print`
echo $HF
MF=`find . -name Makefile -print`
echo $MF
sed -i -e 's/[ \t]*$//' $FF $HF $MF

2
src/2d/Makefile
Unescape View File

@ -7,7 +7,7 @@ include ../Rules.make
INCS = static_2d.h dynamic_declarations_2d.h dynamic_allocations_2d.h
LIB = $(LIBDIR)/lib2d${buildtype}.a
MODSRC = m2d.F90 variables_2d.F90
MODSRC = m2d.F90 variables_2d.F90
LIBSRC = momentum.F90 uv_advect.F90 uv_diffusion.F90 bottom_friction.F90 sealevel.F90 depth_update.F90 uv_depths.F90 update_2d_bdy.F90 cfl_check.F90 have_bdy.F90 residual.F90

2
src/2d/dynamic_declarations_2d.h
Unescape View File

@ -25,7 +25,7 @@
REALTYPE,dimension(:,:),allocatable :: surfdiv
REALTYPE,dimension(:,:),allocatable :: fwf,fwf_int
REALTYPE,dimension(:), allocatable:: EWbdy,ENbdy,EEbdy,ESbdy
REALTYPE,dimension(:), allocatable:: EWbdy,ENbdy,EEbdy,ESbdy
! Remember to update this value if you add more 2D arrays.
integer, parameter :: n2d_fields=37

4
src/2d/m2d.F90
Unescape View File

@ -283,8 +283,8 @@
! !OUTPUT PARAMETERS:
!
! !DESCRIPTION:
! This routine provides possibility to reset/initialize 2D variables to
! ensure that velocities are correctly set on land cells after read
! This routine provides possibility to reset/initialize 2D variables to
! ensure that velocities are correctly set on land cells after read
! of a hotstart file.
!
! !LOCAL VARIABLES:

4
src/2d/static_2d.h
Unescape View File

@ -46,5 +46,5 @@
REALTYPE surfdiv(E2DFIELD)
REALTYPE fwf(E2DFIELD)
REALTYPE fwf_int(E2DFIELD)
REALTYPE EWbdy(jmax),ENbdy(imax),EEbdy(jmax),ESbdy(imax)
REALTYPE EWbdy(jmax),ENbdy(imax),EEbdy(jmax),ESbdy(imax)

4
src/3d/Makefile
Unescape View File

@ -24,7 +24,7 @@ MOD += \
$(LIB)(temperature.o) \
$(LIB)(salinity.o) \
$(LIB)(eqstate.o) \
$(LIB)(internal_pressure.o)
$(LIB)(internal_pressure.o)
endif
ifeq ($(GETM_SPM),true)
MOD += \
@ -51,7 +51,7 @@ $(LIB)(hybrid_coordinates.o) \
$(LIB)(bottom_friction_3d.o) \
$(LIB)(uu_momentum_3d.o) \
$(LIB)(vv_momentum_3d.o) \
$(LIB)(ww_momentum_3d.o)
$(LIB)(ww_momentum_3d.o)
ifeq ($(GETM_STRUCTURE_FRICTION),true)
OBJ += \
$(LIB)(structure_friction_3d.o)

14
src/3d/adaptive_coordinates.F90
Unescape View File

@ -392,7 +392,7 @@ STDERR 'adaptive_coordinates()'
end do
end do
end do
call ztoh(zpos,hn,depthmin)
call hcheck(hn,ssen,H)
@ -415,13 +415,13 @@ STDERR 'adaptive_coordinates()'
do k=0,kmax
gaa(k) =( zpos(i,j,k)-ssen(i,j))/(ssen(i,j)+H(i,j))
gaaold(k)=(zposo(i,j,k)-ssen(i,j))/(ssen(i,j)+H(i,j))
end do
end do
do ii=1,split
#ifndef NO_BAROCLINIC
! Stratification
call col_interpol(kmax-1,1,gaaold,NN(i,j,:),kmax-1,gaa,NNloc)
NNloc(kmax)=NNloc(kmax-1)
NNloc(0)=NNloc(1)
NNloc(kmax)=NNloc(kmax-1)
NNloc(0)=NNloc(1)
do k=1,kmax
avn(k)=min(_ONE_,max(_ZERO_,_HALF_*(NNloc(k)+NNloc(k-1)))/g &
*rho_0/d_dens)
@ -429,8 +429,8 @@ STDERR 'adaptive_coordinates()'
#endif
! Shear
call col_interpol(kmax-1,1,gaaold,SS(i,j,:),kmax-1,gaa,SSloc)
SSloc(kmax)=SSloc(kmax-1)
SSloc(0)=SSloc(1)
SSloc(kmax)=SSloc(kmax-1)
SSloc(0)=SSloc(1)
do k=1,kmax
avs(k)=min(_ONE_,sqrt(max(_ZERO_,_HALF_* &
(SSloc(k)+SSloc(k-1))))/d_vel)
@ -467,7 +467,7 @@ STDERR 'adaptive_coordinates()'
du(kmax)=0.
call getm_tridiagonal(kmax,0,kmax,aau,bu,cu,du,gaa)
end do !split
zpos(i,j,:)=gaa*(ssen(i,j)+H(i,j))+ssen(i,j)
end if

8
src/3d/dynamic_allocations_3d.h
Unescape View File

@ -168,10 +168,10 @@
allocate(ssvn(I2DFIELD),stat=rc) ! Elevation after macro time step (v-column)
if (rc /= 0) stop 'init_3d: Error allocating memory (ssvn)'
allocate(rru(I2DFIELD),stat=rc) ! Bottom drag term in u-vel. points (3D)
allocate(rru(I2DFIELD),stat=rc) ! Bottom drag term in u-vel. points (3D)
if (rc /= 0) stop 'init_3d: Error allocating memory (rru)'
allocate(rrv(I2DFIELD),stat=rc) ! Bottom drag term in v-vel. points (3D)
allocate(rrv(I2DFIELD),stat=rc) ! Bottom drag term in v-vel. points (3D)
if (rc /= 0) stop 'init_3d: Error allocating memory (rrv)'
allocate(taus(I2DFIELD),stat=rc) ! Absolute Value of surface stress
@ -186,10 +186,10 @@
allocate(taub(I2DFIELD),stat=rc) ! Absolute Value of bottom stress
if (rc /= 0) stop 'init_3d: Error allocating memory (taub)'
allocate(kmin(I2DFIELD),stat=rc) ! Bottom index for vertical z-columns
allocate(kmin(I2DFIELD),stat=rc) ! Bottom index for vertical z-columns
if (rc /= 0) stop 'init_3d: Error allocating memory (kmin)'
allocate(kumin(I2DFIELD),stat=rc) ! Bottom index for vertical u-columns
allocate(kumin(I2DFIELD),stat=rc) ! Bottom index for vertical u-columns
if (rc /= 0) stop 'init_3d: Error allocating memory (kumin)'
allocate(kvmin(I2DFIELD),stat=rc) ! Bottom index for vertical v-columns

2
src/3d/dynamic_declarations_3d.h
Unescape View File

@ -62,4 +62,4 @@
! attenuation
REALTYPE, dimension(:,:), allocatable :: A,g1,g2

10
src/3d/getm_fabm.F90
Unescape View File

@ -128,7 +128,7 @@
allocate(cc_diag_hz(ubound(model%info%diagnostic_variables_hz,1),I2DFIELD),stat=rc)
if (rc /= 0) stop 'init_getm_fabm: Error allocating memory (cc_diag_hz)'
cc_diag_hz = _ZERO_
! Read settings specific to GETM-FABM interaction.
open(NAMLST2,status='unknown',file=trim(nml_file))
read(NAMLST2,NML=getm_fabm_nml)
@ -255,7 +255,7 @@
else
wind_speed = _ZERO_
end if
! Get surface short-wave radiation.
if (allocated(swr)) then
I_0 = swr(i,j)
@ -268,13 +268,13 @@
do k=kmax-1,1,-1
z(k) = z(k+1) - _HALF_*(hn(i,j,k+1)+hn(i,j,k))
end do
! Copy current values of biogeochemical variables from full 3D field to columns.
cc_col(1:ubound(model%info%state_variables,1) ,:) = cc_pel(:,i,j,:)
cc_col(ubound(model%info%state_variables,1)+1:,1) = cc_ben(:,i,j)
cc_diag_col = cc_diag(:,i,j,:)
cc_diag_hz_col = cc_diag_hz(:,i,j)
! Transfer pointers to physcial environment variables to FABM.
call set_env_gotm_fabm(dt,0,0,T(i,j,1:),S(i,j,1:), &
rho(i,j,1:),nuh(i,j,0:),hn(i,j,0:),ww(i,j,0:), &
@ -288,7 +288,7 @@
cc_ben (:,i,j) = cc_col(ubound(model%info%state_variables,1)+1:,1)
cc_diag (:,i,j,:) = cc_diag_col
cc_diag_hz(:,i,j) = cc_diag_hz_col
end if
end do
end do

2
src/3d/hybrid_coordinates.F90
Unescape View File

@ -44,7 +44,7 @@
STDERR 'hybrid_coordinates()'
if (first) then
! do the initialisation
! do the initialisation
end if ! first
! and here do the updates

4
src/3d/m3d.F90
Unescape View File

@ -314,8 +314,8 @@
! !OUTPUT PARAMETERS:
!
! !DESCRIPTION:
! This routine provides possibility to reset/initialize 3D variables to
! ensure that velocities are correctly set on land cells after read
! This routine provides possibility to reset/initialize 3D variables to
! ensure that velocities are correctly set on land cells after read
! of a hotstart file.
!
! !LOCAL VARIABLES:

8
src/3d/salinity.F90
Unescape View File

@ -104,7 +104,7 @@
read(NAMLST,salt)
call init_salinity_field()
! Sanity checks for advection specifications
LEVEL3 'salt_hor_adv= ',salt_hor_adv
LEVEL3 'salt_ver_adv= ',salt_ver_adv
@ -267,8 +267,8 @@ salt_field_no=1
do k=1,kmax
! S(i,2,k)=30.*(1.- tanh(float(i-1)*0.05))
S(i,2,k)=(30*_ONE_)*(_ONE_- tanh((i-1)*_ONE_/20))
end do
end do
end do
end do
#endif
case default
FATAL 'Not valid salt_method specified'
@ -412,7 +412,7 @@ salt_field_no=1
do j=jmin-HALO,jmax+HALO
do i=imin-HALO,imax+HALO
if (az(i,j) .eq. 1) then
! Developers note:
! Developers note:
! The parentheses are set to minimize truncation errors for fwf_int=0
S(i,j,kmax) = S(i,j,kmax)* &
( hn(i,j,kmax) / (hn(i,j,kmax)+fwf_int(i,j)) )

4
src/3d/static_3d.h
Unescape View File

@ -3,8 +3,8 @@
#ifdef SPM
integer, parameter :: n3d_fields=36
#else
integer, parameter :: n3d_fields=33
#endif
integer, parameter :: n3d_fields=33
#endif
#else
#ifdef SPM
integer, parameter :: n3d_fields=29

2
src/cutils/Makefile
Unescape View File

@ -1,4 +1,4 @@
#
#
# Makefile to build utilities written in C - libmcutils.a
#

8
src/domain/Makefile
Unescape View File

@ -1,4 +1,4 @@
#
#
# Makefile to build the domain library - libdomain.a
#
@ -8,7 +8,7 @@ INCS = static_domain.h dynamic_declarations_domain.h \
dynamic_allocations_domain_1.h dynamic_allocations_domain_2.h
LIB = $(LIBDIR)/libdomain${buildtype}.a
MODSRC = domain.F90
MODSRC = domain.F90
LIBSRC = part_domain.F90 bdy_spec.F90 print_bdy.F90 \
mirror_bdy_2d.F90 mirror_bdy_3d.F90
@ -16,7 +16,7 @@ LIBSRC = part_domain.F90 bdy_spec.F90 print_bdy.F90 \
SRC = $(MODSRC) $(LIBSRC)
MOD = \
${LIB}(domain.o)
${LIB}(domain.o)
OBJ = \
@ -44,7 +44,7 @@ clean:
$(RM) $(LIB) $(MODDIR)/domain.{m.mod} $(MODDIR)/topo_interface.{m.mod}
realclean: clean
$(RM) *.o doc
$(RM) *.o doc
distclean: realclean

2
src/domain/domain.F90
Unescape View File

@ -186,7 +186,7 @@
il=imin ; ih=imax ; jl=jmin ; jh=jmax
! check grid and dimensions
! dynamic_allocations_domain_1.h will be included when reading
! dynamic_allocations_domain_1.h will be included when reading
! the topo file
call read_topo_file(bathy_format,bathymetry)
#ifndef STATIC

4
src/futils/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# Makefile to build utilities written in Fortran90 - libfutils.a
#
# Makefile to build utilities written in Fortran90 - libfutils.a
#
include ../Rules.make

2
src/futils/getm_timers.F90
Unescape View File

@ -425,7 +425,7 @@
!
! !DESCRIPTION:
! Write IDs of active timers.
! This is mostly useful for debugging and location of where certain
! This is mostly useful for debugging and location of where certain
! timers are set or should be set.
!
! !REVISION HISTORY:

2
src/getm/Makefile
Unescape View File

@ -33,7 +33,7 @@ realclean: clean
$(RM) *.o doc
distclean: realclean
$(RM) work.pc *.d
$(RM) work.pc *.d
#-----------------------------------------------------------------------
# Copyright (C) 2001 - Hans Burchard and Karsten Bolding (BBH) !

2
src/input/Makefile
Unescape View File

@ -1,4 +1,4 @@
#
#
# Makefile to build the ncdf module - ncdfio.o
#

2
src/meteo/Makefile
Unescape View File

@ -1,4 +1,4 @@
#
#
# Makefile to build the meteo module - meteo.mod
#

6
src/ncdf/Makefile
Unescape View File

@ -36,7 +36,7 @@ MOD += \
${LIB}(ncdf_meteo.o) \
${LIB}(ncdf_topo.o) \
${LIB}(ncdf_restart.o) \
${LIB}(ncdf_mean.o)
${LIB}(ncdf_mean.o)
OBJ = \
${LIB}(set_attributes.o) \
@ -61,7 +61,7 @@ ${LIB}(open_restart_ncdf.o) \
${LIB}(read_restart_ncdf.o) \
${LIB}(ncdf_close.o)
all: modules objects
all: modules objects
modules: $(MOD)
@ -72,7 +72,7 @@ doc: $(SRC)
touch doc
clean:
$(RM) $(LIB)
$(RM) $(LIB)
realclean: clean
$(RM) *.o doc

2
src/ncdf/init_mean_ncdf.F90
Unescape View File

@ -102,7 +102,7 @@
select case (vert_cord)
case (_SIGMA_COORDS_)
case (_Z_COORDS_)
case (_Z_COORDS_)
call getm_error("init_3d_ncdf()","saving of z-levels disabled")
case default
fv = hh_missing

6
src/output/Makefile
Unescape View File

@ -1,4 +1,4 @@
#
#
# Makefile to build the output module
#
@ -8,7 +8,7 @@ LIB = $(LIBDIR)/liboutput${buildtype}.a
MODSRC = output.F90 parser.F90 variable_info.F90 \
ncdf_out.F90 ascii_out.F90 \
diagnostic_variables.F90 nesting.F90
diagnostic_variables.F90 nesting.F90
LIBSRC = diagnose.F90
@ -23,7 +23,7 @@ endif
MOD += \
${LIB}(ncdf_out.o) \
${LIB}(ascii_out.o) \
${LIB}(output.o)
${LIB}(output.o)
#$(LIB)(variable_info.o) \
#$(LIB)(parser.o) \

Write Preview
Loading…
Cancel
Save