Commit 89c310cd authored by Markus Pahlow's avatar Markus Pahlow

declare ipos in mw.h if not O_opem

parent 39d20165
......@@ -256,10 +256,8 @@
# endif
# endif
# if defined O_cfcs_data || defined O_cfcs_data_transient
if (isscfc11 .ne. 0) sbc(:,:,isscfc11) =
& t(:,1,:,icfc11,taup1)
if (isscfc12 .ne. 0) sbc(:,:,isscfc12) =
& t(:,1,:,icfc12,taup1)
if (isscfc11 .ne. 0) sbc(:,:,isscfc11) = t(:,1,:,icfc11,taup1)
if (isscfc12 .ne. 0) sbc(:,:,isscfc12) = t(:,1,:,icfc12,taup1)
# endif
else
do j=1,jmt
......@@ -1111,9 +1109,6 @@
# include "matrix.h"
integer ntile
# endif
# if defined O_opem_pos && !defined O_opem
# include "npzd.h"
# endif
!-----------------------------------------------------------------------
! Initialize ocean tracer names
......@@ -1876,7 +1871,7 @@
vcsfac = 0.
vcsyri = 0.
aggfor_os = 0.
adiff = 0.03 ! anomolous diffusion factor (percent/100/C)
adiff = 0.03 ! anomalous diffusion factor (percent/100/C)
cropf = 1.
pastf = 0.5
......
......@@ -33,9 +33,6 @@
# if defined O_opem_pos
& , dtr(imtm2), mtr, fract, tmin(imtm2)
logical msk(imtm2), msk1(imtm2)
# if !defined O_opem
# include "npzd.h"
# endif
# endif
integer, parameter :: tindx(*)=(/(n, n=1,imtm1), (n, n=2,imtm1)/)
integer jtof(jmw)
......
......@@ -147,14 +147,6 @@
#endif
common /npzd_i/ nbio(km), mxfntsb
#if defined O_opem_pos && !defined O_opem
integer :: ipos
common /npzd_i/ ipos(4
# if defined O_npzd_iron
& + 2
# endif
& )
#endif
real, parameter :: trcmin=5e-12
......
......@@ -89,7 +89,7 @@
! izoop = index for zooplankton
! idetr = index for detritus
#if defined O_npzzd
! izoo2p = index for mesozooplankton
! izoo2p = index for mesozooplankton
#endif
#if defined O_npzd_iron
! idfe = index for iron
......@@ -110,7 +110,10 @@
! idial = index for diazotroph chlorophyll
# endif
#endif
! mapt = map for ocean tracer names
#if defined O_opem_pos
! ipos = indices of tracers to be kept non-negative
#endif
! mapt = map for ocean tracer names
character(10) :: mapt
common /mw_c/ mapt(nt)
......@@ -126,6 +129,14 @@
integer idfe, idetrfe
common /mw_i/ idfe, idetrfe
#endif
#if defined O_opem_pos && !defined O_opem
integer :: ipos
common /mw_i/ ipos(4
# if defined O_npzd_iron
& + 2
# endif
& )
#endif
! indices for ocean tracer source array
! istemp = index for temperature
......
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