Commit eb110057 authored by Markus Pahlow's avatar Markus Pahlow

correct spelling and simplify and reindent preprocessor options

parent 903cd6f6
......@@ -463,9 +463,6 @@
stop
end
#endif ! not O_TMM
#ifndef O_TMM
subroutine chkcpl
implicit none
......@@ -476,21 +473,21 @@
real critv, tmp, t1, r1, r2, r3, r4, r5, r6
#include "size.h"
#include "param.h"
#include "pconst.h"
#include "stdunits.h"
#include "csbc.h"
#include "cembm.h"
#include "calendar.h"
#include "switch.h"
#include "tmngr.h"
# include "size.h"
# include "param.h"
# include "pconst.h"
# include "stdunits.h"
# include "csbc.h"
# include "cembm.h"
# include "calendar.h"
# include "switch.h"
# include "tmngr.h"
# if defined O_sealev_salinity && defined O_mom
#include "mw.h"
#include "iounit.h"
#include "levind.h"
#include "grdvar.h"
# include "mw.h"
# include "iounit.h"
# include "levind.h"
# include "grdvar.h"
!-----------------------------------------------------------------------
! adjust salinity for changes in sea level
......@@ -766,7 +763,7 @@
return
end
#endif ! not O_TMM
#endif ! not O_TMM (1)
subroutine set (index, num, name, text, inc)
......@@ -795,13 +792,13 @@
integer i, jrow, ntabc
#include "size.h"
#include "param.h"
#include "pconst.h"
#include "stdunits.h"
#include "iounit.h"
#include "mw.h"
#include "tmngr.h"
# include "size.h"
# include "param.h"
# include "pconst.h"
# include "stdunits.h"
# include "iounit.h"
# include "mw.h"
# include "tmngr.h"
real, intent(out) :: ocnout(imt,jmt)
......@@ -899,10 +896,10 @@
#elif defined O_opem_pos
stop 'O_opem_pos requires O_opem'
#endif
# if defined O_npzzd
#if defined O_npzzd
isszoo2p = 0
izoopflx2 = 0
# endif
#endif
issc14 = 0
ic14flx = 0
isscfc11 = 0
......@@ -1111,10 +1108,9 @@
#include "stdunits.h"
#include "atm.h"
#if defined O_mom
#include "mw.h"
# include "mw.h"
# if defined O_matrix
#include "matrix.h"
# include "matrix.h"
integer ntile
# endif
......@@ -1311,7 +1307,7 @@
stop '=>UVic_ESCM'
endif
#endif
#endif ! O_mom (1108)
#if defined O_embm
!-----------------------------------------------------------------------
! Initialize atmosphere tracer names
......@@ -1689,7 +1685,7 @@
abio = 0.18 ! a; Maximum growth rate parameter [1/day]
bbio = 1.066 ! b
cbio = 1.0 ! c [1/deg_C]
gbio = 0.18 ! Maximum grazing rate at 0 deg C [1/day]
gbio = 0.18 ! Maximum grazing rate at 0 deg C [1/day]
k1n = 0.7 ! Half saturation constant for N uptake [mmol/m^3]
nup = 0.025 ! Specific mortality rate (Phytoplankton) [1/day]
nupt0 = 0.02 ! Specific mortality rate (Phytoplankton) [1/day]
......@@ -1761,7 +1757,7 @@
pmax = 0.15 ! Phytoplankton biomass above which kfe increases [mmol N m-3]
kfe_D = 0.1e-3 ! Half saturation constant for Diaz Fe limitation [mmol Fe m-3]
# endif
alpha = 4.0 ! Chlorophyll specific initial slope P-I curve [(gC/gChl)^(-1) (W/m^2)^(-1) /day]
alpha = 4.0 ! Chlorophyll specific initial slope P-I curve [(gC/gChl)^(-1) (W/m^2)^(-1) /day]
kfeleq = 10.**5.5 ! Fe-ligand stability constant [m^3/(mmol ligand)]
lig = 1.0e-3 ! Ligand concentration [mmol/m^3]
thetamaxhi = 0.04 ! Maximum Chl:C ratio, abundant iron [gChl/(gC)]
......@@ -2224,7 +2220,7 @@
dtts = dtatm
dtocn = dtatm
nots = namix
#endif
#endif ! O_mom (2205)
#if defined O_carbon_14_coupled
! calculate c14ccn from dc14ccn and co2ccn
......
......@@ -76,7 +76,7 @@
real u,t
common /mw_r/ u(imt,km,jmw,2,-1:1), t(imt,km,jmw,nt,-1:1)
! indicies for ocean tracer array
! indices for ocean tracer array
! itemp = index for temperature
! isalt = index for salinity
! idic = index for dissolved inorganic carbon
......@@ -98,18 +98,18 @@
! io2 = index for oxygen
! ino3 = index for nitrate
! idiaz = index for diazotrophs
# if defined O_opem
#if defined O_opem
! iphyc = index for phytoplankton C
! iphyp = index for phytoplankton delta P
! idiac = index for diazotroph C
! idiap = index for diazotroph delta P
! idetc = index for detritus C
! idetp = index for detritus P
# if defined O_opem_chl
# if defined O_opem_chl
! iphyl = index for phytoplankton chlorophyll
! idial = index for diazotroph chlorophyll
# endif
# endif
#endif
! mapt = map for ocean tracer names
character(10) :: mapt
......@@ -127,7 +127,7 @@
common /mw_i/ idfe, idetrfe
#endif
! indicies for ocean tracer source array
! indices for ocean tracer source array
! istemp = index for temperature
! issalt = index for salinity
! isdic = index for carbon
......@@ -147,18 +147,18 @@
! isdfe = index for iron
! isdetrfe= index for particulate iron
#endif
# if defined O_opem
#if defined O_opem
! isphyc = index for phytoplankton C
! isphyp = index for phytoplankton delta P
! isdiac = index for diazotroph C
! isdiap = index for diazotroph delta P
! isdetc = index for detritus C
! isdetp = index for detritus P
# if defined O_opem_chl
# if defined O_opem_chl
! isphyl = index for phytoplankton chlorophyll
! isdial = index for diazotroph chlorophyll
# endif
# endif
#endif
! itrc = index of tracer sources for all tracers (0 = no source)
! mapst = map for ocean tracer source names
......@@ -181,20 +181,20 @@
common /mw_i/ isdfe, isdetrfe
#endif
# if defined O_opem
#if defined O_opem
integer isphyc, isphyp, isdiac, isdiap
integer isdetc, isdetp
common /mw_i/ isphyc, isphyp, isdiac, isdiap
common /mw_i/ isdetc, isdetp
# if defined O_opem_chl
# if defined O_opem_chl
integer isphyl, isdial
common /mw_i/ isphyl, isdial
# endif
# if defined O_opem_pos
# endif
#endif
#if defined O_opem_pos
logical itmsk
common /mw_l/ itmsk(imt,km,1:jmw)
# endif
# endif
#endif
!-----------------------------------------------------------------------
! MW arrays for diagnostic equations and workspace:
......
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