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

src/gotm/gotm.F90

@@ -365,7 +365,9 @@
 ! (see \sect{sec:extra}).
 !
 ! !USES:
+#ifdef BIO
    use bio_var, only: numcc,cc                        !CHG3
+#endif
 
    IMPLICIT NONE
 !
@@ -431,12 +433,20 @@
 
 !     update nitrate							!CHG3
       if (n_prof_method .ne. 0) then
+#ifdef BIO
          call nitrate(nlev,dt,cnpar,nus,gams,cc)
+#else
+         call nitrate(nlev,dt,cnpar,nus,gams)
+#endif
       endif
 
 !     update ammonium							!CHG5
       if (a_prof_method .ne. 0) then
+#ifdef BIO
          call ammonium(nlev,dt,cnpar,nus,gams,cc)
+#else
+         call ammonium(nlev,dt,cnpar,nus,gams)
+#endif
       endif
 
 !     update shear and stratification

src/meanflow/ammonium.F90

@@ -94,7 +94,7 @@
    REALTYPE, intent(in)                :: gams(0:nlev)
 
 !  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:
 !  Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca)
@@ -154,9 +154,11 @@
    end if
 
 ! redefinir amm apres un cyle bio
+#ifdef BIO
    do i=1,nlev                                                    !CHG5
       amm(i) = cc(6,i)
    end do
+#endif
 
 !  do advection step
    if (w_adv_method .ne. 0) then

src/meanflow/nitrate.F90

@@ -94,7 +94,7 @@
    REALTYPE, intent(in)                :: gams(0:nlev)
 
 !  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:
 !  Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca)
@@ -154,9 +154,11 @@
    end if
 
 ! redefinir nit apres un cyle bio
+#ifdef BIO
    do i=1,nlev                                                    !CHG3
       nit(i) = cc(5,i)
    end do
+#endif
 
 !  do advection step
    if (w_adv_method .ne. 0) then

src/observations/observations.F90

@@ -648,6 +648,15 @@
                nprof = n_1
             case (TWO_LAYERS)
                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
          end select
       case (FROMFILE)