Commit 4bbaec20 authored by dumoda01's avatar dumoda01

Correction d''un bogue qui empechait de rouler sans la biologie

parent 9538a482
...@@ -365,7 +365,9 @@ ...@@ -365,7 +365,9 @@
! (see \sect{sec:extra}). ! (see \sect{sec:extra}).
! !
! !USES: ! !USES:
#ifdef BIO
use bio_var, only: numcc,cc !CHG3 use bio_var, only: numcc,cc !CHG3
#endif
IMPLICIT NONE IMPLICIT NONE
! !
...@@ -431,12 +433,20 @@ ...@@ -431,12 +433,20 @@
! update nitrate !CHG3 ! update nitrate !CHG3
if (n_prof_method .ne. 0) then if (n_prof_method .ne. 0) then
#ifdef BIO
call nitrate(nlev,dt,cnpar,nus,gams,cc) call nitrate(nlev,dt,cnpar,nus,gams,cc)
#else
call nitrate(nlev,dt,cnpar,nus,gams)
#endif
endif endif
! update ammonium !CHG5 ! update ammonium !CHG5
if (a_prof_method .ne. 0) then if (a_prof_method .ne. 0) then
#ifdef BIO
call ammonium(nlev,dt,cnpar,nus,gams,cc) call ammonium(nlev,dt,cnpar,nus,gams,cc)
#else
call ammonium(nlev,dt,cnpar,nus,gams)
#endif
endif endif
! update shear and stratification ! update shear and stratification
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
REALTYPE, intent(in) :: gams(0:nlev) REALTYPE, intent(in) :: gams(0:nlev)
! nitrate concentration after bio loop ! nitrate concentration after bio loop
REALTYPE, intent(in) :: cc(1:7,0:nlev) !CHG3 REALTYPE, intent(in), optional :: cc(1:7,0:nlev) !CHG3
! !
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca) ! Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca)
...@@ -154,9 +154,11 @@ ...@@ -154,9 +154,11 @@
end if end if
! redefinir amm apres un cyle bio ! redefinir amm apres un cyle bio
#ifdef BIO
do i=1,nlev !CHG5 do i=1,nlev !CHG5
amm(i) = cc(6,i) amm(i) = cc(6,i)
end do end do
#endif
! do advection step ! do advection step
if (w_adv_method .ne. 0) then if (w_adv_method .ne. 0) then
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
REALTYPE, intent(in) :: gams(0:nlev) REALTYPE, intent(in) :: gams(0:nlev)
! nitrate concentration after bio loop ! nitrate concentration after bio loop
REALTYPE, intent(in) :: cc(1:7,0:nlev) !CHG3 REALTYPE, intent(in), optional :: cc(1:7,0:nlev) !CHG3
! !
! !REVISION HISTORY: ! !REVISION HISTORY:
! Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca) ! Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca)
...@@ -154,9 +154,11 @@ ...@@ -154,9 +154,11 @@
end if end if
! redefinir nit apres un cyle bio ! redefinir nit apres un cyle bio
#ifdef BIO
do i=1,nlev !CHG3 do i=1,nlev !CHG3
nit(i) = cc(5,i) nit(i) = cc(5,i)
end do end do
#endif
! do advection step ! do advection step
if (w_adv_method .ne. 0) then if (w_adv_method .ne. 0) then
......
...@@ -648,6 +648,15 @@ ...@@ -648,6 +648,15 @@
nprof = n_1 nprof = n_1
case (TWO_LAYERS) case (TWO_LAYERS)
call analytical_profile(nlev,z,z_n1,n_1,z_n2,n_2,nprof) call analytical_profile(nlev,z,z_n1,n_1,z_n2,n_2,nprof)
LEVEL2 'Nitrate two-layer profile'
write(*,900) ' n_1 = ',n_1
write(*,900) ' z_n1 = ',z_n1
write(*,900) ' n_2 = ',n_2
write(*,900) ' z_n2 = ',z_n2
900 format (A,F8.5)
case default case default
end select end select
case (FROMFILE) case (FROMFILE)
......
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