Commit 39d20165 authored by Markus Pahlow's avatar Markus Pahlow

make O_opem_pos work without O_opem

parent a584791e
......@@ -893,8 +893,6 @@
issdial = 0
idialflx = 0
# endif
#elif defined O_opem_pos
stop 'O_opem_pos requires O_opem'
#endif
#if defined O_npzzd
isszoo2p = 0
......@@ -1113,6 +1111,9 @@
# include "matrix.h"
integer ntile
# endif
# if defined O_opem_pos && !defined O_opem
# include "npzd.h"
# endif
!-----------------------------------------------------------------------
! Initialize ocean tracer names
......@@ -1300,6 +1301,14 @@
& idetc, idetr, idetp, izoop/)
# endif
# endif
# else
# if defined O_opem_pos
# if defined O_npzd_iron
ipos=(/iphyt, idiaz, idetr, izoop, idfe, idetrfe/)
# else
ipos=(/iphyt, idiaz, idetr, izoop/)
# endif
# endif
# endif
# endif
if ( m-1 .gt. nt) then
......
......@@ -33,10 +33,11 @@
# 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)/)
# endif
# if defined O_firfil
integer jtof(jmw)
real temp(imt,km,jsmw:jemw)
......
......@@ -147,6 +147,14 @@
#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
......
......@@ -50,6 +50,9 @@
# include "switch.h"
# if defined O_opem_pos
# if !defined O_opem
# include "npzd.h"
# endif
logical :: trmsk(imt,km,jmt)
real :: tmass(imtm2,km,jmt), tsum, tneg
# endif
......
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