Adaptation pour que le code fonctionne avec le modele bio_ismer (bio_model=6)....

Adaptation pour que le code fonctionne avec le modele bio_ismer (bio_model=6). Verifier la declaration de la variable cc(1:9,1:nlev), 9 etant le nombre compartiments qui peut varier d'un modele a l'autre.

src/meanflow/ammonium.F90

@@ -64,13 +64,14 @@
 ! !USES:
 
    use meanflow,     only: avmola                       !CHG5
-   use meanflow,     only: h,u,v,w,AMM,avh              !CHG5
+   use meanflow,     only: h,u,v,w,amm,avh              !CHG5
    use observations, only: dadx,dady,a_adv              !CHG5
    use observations, only: w_adv_discr,w_adv_method
    use observations, only: aprof,ARelaxTau              !CHG5
    use airsea,       only: p_e
    use util,         only: Dirichlet,Neumann
    use util,         only: oneSided,zeroDivergence
+!   use bio_var,      only : bio_model
 
    IMPLICIT NONE
 !
@@ -94,7 +95,7 @@
    REALTYPE, intent(in)                :: gams(0:nlev)
 
 !  nitrate concentration after bio loop
-   REALTYPE, intent(in), optional      :: cc(1:7,0:nlev)   !CHG3
+   REALTYPE, intent(in), optional      :: cc(1:9,0:nlev)   !CHG3
 !
 ! !REVISION HISTORY:
 !  Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca)
@@ -155,9 +156,23 @@
 
 ! redefinir amm apres un cyle bio
 #ifdef BIO
-   do i=1,nlev                                                    !CHG5
-      amm(i) = cc(6,i)
-   end do
+do i=1,nlev
+   !amm(i) = cc(6,i)     ! bio_model=2,4
+   amm(i) = cc(9,i)     ! bio_model=6
+end do
+!   if (bio_model.eq.2) then
+!      do i=1,nlev
+!         amm(i) = cc(6,i)
+!      end do
+!   else if (bio_model.eq.4) then
+!      do i=1,nlev
+!         amm(i) = cc(6,i)
+!      end do
+!   else if (bio_model.eq.6) then
+!      do i=1,nlev
+!         amm(i) = cc(9,i)
+!      end do
+!   end if
 #endif
 
 !  do advection step

src/meanflow/meanflow.F90

@@ -36,10 +36,10 @@
    REALTYPE, public, dimension(:), allocatable  :: T,S,rho
 
 !  nitrate
-   REALTYPE, public, dimension(:), allocatable  :: NIT           !CHG3
+   REALTYPE, public, dimension(:), allocatable  :: nit           !CHG3
 
 !  ammonium
-   REALTYPE, public, dimension(:), allocatable  :: AMM           !CHG5
+   REALTYPE, public, dimension(:), allocatable  :: amm           !CHG5
 
 !  bouyancy frequency squared
 !  (total, from temperature only, from salinity only)
@@ -280,12 +280,12 @@
    S = _ZERO_
 
    allocate(nit(0:nlev),stat=rc)                            !CHG3
-   if (rc /= 0) STOP 'init_meanflow: Error allocating (NIT)'
-   NIT = _ZERO_
+   if (rc /= 0) STOP 'init_meanflow: Error allocating (nit)'
+   nit = _ZERO_
 
    allocate(amm(0:nlev),stat=rc)                            !CHG5
-   if (rc /= 0) STOP 'init_meanflow: Error allocating (AMM)'
-   AMM = _ZERO_
+   if (rc /= 0) STOP 'init_meanflow: Error allocating (amm)'
+   amm = _ZERO_
 
    allocate(rho(0:nlev),stat=rc)
    if (rc /= 0) STOP 'init_meanflow: Error allocating (rho)'

src/meanflow/nitrate.F90

@@ -64,13 +64,14 @@
 ! !USES:
 
    use meanflow,     only: avmoln                       !CHG3
-   use meanflow,     only: h,u,v,w,NIT,avh              !CHG3
+   use meanflow,     only: h,u,v,w,nit,avh              !CHG3
    use observations, only: dndx,dndy,n_adv              !CHG3
    use observations, only: w_adv_discr,w_adv_method
    use observations, only: nprof,NRelaxTau              !CHG3
    use airsea,       only: p_e
    use util,         only: Dirichlet,Neumann
    use util,         only: oneSided,zeroDivergence
+!   use bio_var,      only: bio_model
 
    IMPLICIT NONE
 !
@@ -94,7 +95,9 @@
    REALTYPE, intent(in)                :: gams(0:nlev)
 
 !  nitrate concentration after bio loop
-   REALTYPE, intent(in), optional      :: cc(1:7,0:nlev)   !CHG3
+!DD Not independent of the bio model, only works with 7 compartments model (Fasham)
+!   REALTYPE, intent(in), optional      :: cc(1:10,0:nlev)   !CHG3
+   REALTYPE, intent(in), optional      :: cc(1:9,0:nlev)   !CHG3
 !
 ! !REVISION HISTORY:
 !  Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca)
@@ -155,20 +158,38 @@
 
 ! redefinir nit apres un cyle bio
 #ifdef BIO
-   do i=1,nlev                                                    !CHG3
-      nit(i) = cc(5,i)
-   end do
+do i=1,nlev
+   !nit(i) = cc(7,i)    ! bio_model=2,4
+   nit(i) =  cc(1,i)   ! bio_model=1,6
+end do
+!   if (bio_model.eq.1) then
+!      do i=1,nlev
+!         nit(i) = cc(1,i)
+!      end do
+!   else if (bio_model.eq.2) then
+!      do i=1,nlev
+!         nit(i) = cc(7,i)
+!      end do
+!   else if (bio_model.eq.4) then
+!      do i=1,nlev
+!         nit(i) = cc(7,i)
+!      end do
+!  else if (bio_model.eq.6) then
+!      do i=1,nlev
+!         nit(i) = cc(1,i)
+!      end do
+!   end if
 #endif
 
 !  do advection step
    if (w_adv_method .ne. 0) then
       call adv_center(nlev,dt,h,h,w,AdvBcup,AdvBcdw,                    &
-                          AdvSup,AdvSdw,w_adv_discr,adv_mode,NIT)            !CHG3
+                          AdvSup,AdvSdw,w_adv_discr,adv_mode,nit) !CHG3
    end if
 
 !  do diffusion step
    call diff_center(nlev,dt,cnpar,posconc,h,DiffBcup,DiffBcdw,          &
-                    DiffSup,DiffSdw,avh,LSour,Qsour,NRelaxTau,nprof,NIT)     !CHG3
+                    DiffSup,DiffSdw,avh,LSour,Qsour,NRelaxTau,nprof,nit)     !CHG3
 
    return
    end subroutine nitrate