Colimitation par hc et ldn pour bac2.

src/extras/bio/bio_gsj.F90

@@ -109,12 +109,14 @@
    REALTYPE                  ::  r22     = 0.30
    REALTYPE                  ::  r23     = 0.05
    REALTYPE                  ::  r24     = 0.15
-   REALTYPE                  ::  vb      = 1.2
+   REALTYPE                  ::  vb1     = 1.2
+   REALTYPE                  ::  vb2     = 1.2
    REALTYPE                  ::  k4      = 0.5
-   REALTYPE                  ::  k10     = 0.5
+   REALTYPE                  ::  k10     = 0.15
    REALTYPE                  ::  w_h     = 0.0
    REALTYPE                  ::  mu3     = 0.15
-   REALTYPE                  ::  eta     = 0.0
+   REALTYPE                  ::  etaa    = 0.0
+   REALTYPE                  ::  etah    = 0.0
    REALTYPE                  ::  mu4     = 0.02
    REALTYPE                  ::  mu5     = 0.00
    REALTYPE                  ::  w_d     = -2.0
@@ -159,7 +161,7 @@
                         kn1,ka1,kn2,ka2,mu11,mu12,k5,gamma,w_p1,w_p2,    &
                         g1max,g2max,k3,beta,mu21,mu22,k6,delta,epsi,     &
                         r11,r12,r13,r14,r21,r22,r23,r24,                 &
-                        vb,k4,k10,w_h,mu3,eta,mu4,w_d,kc,mu5,            &
+                        vb1,vb2,k4,k10,w_h,mu3,etaa,etah,mu4,w_d,kc,mu5, &
                         theta,w_p1max,w_p1min,w_p2min,w_p2max,           &
                         mte,ca1,ca2,ch1,ch2,amratio,hmratio
 
@@ -212,10 +214,12 @@
    write(10,901) r22
    write(10,901) r23
    write(10,901) r24
-   write(10,901) vb
+   write(10,901) vb1
+   write(10,901) vb2
    write(10,901) k4
    write(10,901) mu3
-   write(10,901) eta
+   write(10,901) etaa
+   write(10,901) etah
    write(10,901) mu4
    write(10,901) mu5
    write(10,901) w_d
@@ -236,7 +240,8 @@
 !  Conversion from day to second
    vp1     = vp1     /secs_pr_day
    vp2     = vp2     /secs_pr_day
-   vb      = vb      /secs_pr_day
+   vb1     = vb1     /secs_pr_day
+   vb2     = vb2     /secs_pr_day
    mu11    = mu11    /secs_pr_day
    mu12    = mu12    /secs_pr_day
    mu21    = mu21    /secs_pr_day
@@ -581,7 +586,7 @@
    REALTYPE                   :: amr1,amr2
    REALTYPE                   :: hmr1,hmr2
    REALTYPE                   :: fac1,fac2,fac3,fac4
-   REALTYPE                   :: minal,minah,qn1,qa1,qn2,qa2
+   REALTYPE                   :: minal,minhl,qn1,qa1,qn2,qa2
    REALTYPE                   :: ps1,ps2,ff1,ff2
    REALTYPE                   :: Ea,Eh,kBeV,T0
    integer                    :: i,j,ci
@@ -670,8 +675,8 @@
                      +r21*cc(p1,ci)**2+r22*cc(p2,ci)**2                   &
                      +r23*cc(d,ci)**2+r24*cc(z1,ci)**2)
 
-      minal=min(cc(a,ci),eta*cc(l,ci))
-      minah=min(cc(a,ci),eta*cc(hc,ci))
+      minal=min(cc(a,ci),etaa*cc(l,ci))
+      minhl=min(cc(hc,ci),etah*cc(l,ci))
 
       ! Light and nutrient limitation factors
       lumlim1(ci) =amr1*ff1
@@ -722,11 +727,11 @@
       dd(z2,a,ci) =hmr2*epsi*mu22*(cc(z2,ci)+z0)/(k6+cc(z2,ci)+z0)*cc(z2,ci)
       dd(z2,l,ci) =hmr2*delta*mu22*(cc(z2,ci)+z0)/(k6+cc(z2,ci)+z0)*cc(z2,ci)
 
-      dd(a,b1,ci) =vb*minal/(k4+minal+cc(l,ci))*(cc(b1,ci)+b0)
-      dd(l,b1,ci) =vb*cc(l,ci)/(k4+minal+cc(l,ci))*(cc(b1,ci)+b0)
-      dd(hc,b2,ci)=vb*cc(hc,ci)/(k10+cc(hc,ci))*(cc(b2,ci)+b0) 
-      !dd(a,b2,ci) =vb*minah/(k10+minah+cc(hc,ci))*(cc(b2,ci)+b0)
-      !dd(hc,b2,ci)=vb*cc(hc,ci)/(k10+minah+cc(hc,ci))*(cc(b2,ci)+b0) 
+      dd(a,b1,ci) =vb1*minal/(k4+minal+cc(l,ci))*(cc(b1,ci)+b0)
+      dd(l,b1,ci) =vb1*cc(l,ci)/(k4+minal+cc(l,ci))*(cc(b1,ci)+b0)
+      dd(hc,b2,ci)=vb2*minhl/(k10+minhl+cc(l,ci))*(cc(b2,ci)+b0) 
+      dd(l,b2,ci) =vb2*cc(l,ci)/(k10+minhl+cc(l,ci))*(cc(b2,ci)+b0)
+      !dd(hc,b2,ci)=vb*cc(hc,ci)/(k10+cc(hc,ci))*(cc(b2,ci)+b0) 
 
 
       do i=1,numc