Commit 63c62f832ca9b884c3324c434987aaf5adfcceae

Authored by Philippe Klotz
1 parent c58569d0
Exists in master and in 1 other branch snow

Colimitation par hc et ldn pour bac2.

Showing 1 changed file with 20 additions and 15 deletions   Show diff stats
src/extras/bio/bio_gsj.F90
@@ -109,12 +109,14 @@ @@ -109,12 +109,14 @@
109 REALTYPE :: r22 = 0.30 109 REALTYPE :: r22 = 0.30
110 REALTYPE :: r23 = 0.05 110 REALTYPE :: r23 = 0.05
111 REALTYPE :: r24 = 0.15 111 REALTYPE :: r24 = 0.15
112 - REALTYPE :: vb = 1.2 112 + REALTYPE :: vb1 = 1.2
  113 + REALTYPE :: vb2 = 1.2
113 REALTYPE :: k4 = 0.5 114 REALTYPE :: k4 = 0.5
114 - REALTYPE :: k10 = 0.5 115 + REALTYPE :: k10 = 0.15
115 REALTYPE :: w_h = 0.0 116 REALTYPE :: w_h = 0.0
116 REALTYPE :: mu3 = 0.15 117 REALTYPE :: mu3 = 0.15
117 - REALTYPE :: eta = 0.0 118 + REALTYPE :: etaa = 0.0
  119 + REALTYPE :: etah = 0.0
118 REALTYPE :: mu4 = 0.02 120 REALTYPE :: mu4 = 0.02
119 REALTYPE :: mu5 = 0.00 121 REALTYPE :: mu5 = 0.00
120 REALTYPE :: w_d = -2.0 122 REALTYPE :: w_d = -2.0
@@ -159,7 +161,7 @@ @@ -159,7 +161,7 @@
159 kn1,ka1,kn2,ka2,mu11,mu12,k5,gamma,w_p1,w_p2, & 161 kn1,ka1,kn2,ka2,mu11,mu12,k5,gamma,w_p1,w_p2, &
160 g1max,g2max,k3,beta,mu21,mu22,k6,delta,epsi, & 162 g1max,g2max,k3,beta,mu21,mu22,k6,delta,epsi, &
161 r11,r12,r13,r14,r21,r22,r23,r24, & 163 r11,r12,r13,r14,r21,r22,r23,r24, &
162 - vb,k4,k10,w_h,mu3,eta,mu4,w_d,kc,mu5, & 164 + vb1,vb2,k4,k10,w_h,mu3,etaa,etah,mu4,w_d,kc,mu5, &
163 theta,w_p1max,w_p1min,w_p2min,w_p2max, & 165 theta,w_p1max,w_p1min,w_p2min,w_p2max, &
164 mte,ca1,ca2,ch1,ch2,amratio,hmratio 166 mte,ca1,ca2,ch1,ch2,amratio,hmratio
165 167
@@ -212,10 +214,12 @@ @@ -212,10 +214,12 @@
212 write(10,901) r22 214 write(10,901) r22
213 write(10,901) r23 215 write(10,901) r23
214 write(10,901) r24 216 write(10,901) r24
215 - write(10,901) vb 217 + write(10,901) vb1
  218 + write(10,901) vb2
216 write(10,901) k4 219 write(10,901) k4
217 write(10,901) mu3 220 write(10,901) mu3
218 - write(10,901) eta 221 + write(10,901) etaa
  222 + write(10,901) etah
219 write(10,901) mu4 223 write(10,901) mu4
220 write(10,901) mu5 224 write(10,901) mu5
221 write(10,901) w_d 225 write(10,901) w_d
@@ -236,7 +240,8 @@ @@ -236,7 +240,8 @@
236 ! Conversion from day to second 240 ! Conversion from day to second
237 vp1 = vp1 /secs_pr_day 241 vp1 = vp1 /secs_pr_day
238 vp2 = vp2 /secs_pr_day 242 vp2 = vp2 /secs_pr_day
239 - vb = vb /secs_pr_day 243 + vb1 = vb1 /secs_pr_day
  244 + vb2 = vb2 /secs_pr_day
240 mu11 = mu11 /secs_pr_day 245 mu11 = mu11 /secs_pr_day
241 mu12 = mu12 /secs_pr_day 246 mu12 = mu12 /secs_pr_day
242 mu21 = mu21 /secs_pr_day 247 mu21 = mu21 /secs_pr_day
@@ -581,7 +586,7 @@ @@ -581,7 +586,7 @@
581 REALTYPE :: amr1,amr2 586 REALTYPE :: amr1,amr2
582 REALTYPE :: hmr1,hmr2 587 REALTYPE :: hmr1,hmr2
583 REALTYPE :: fac1,fac2,fac3,fac4 588 REALTYPE :: fac1,fac2,fac3,fac4
584 - REALTYPE :: minal,minah,qn1,qa1,qn2,qa2 589 + REALTYPE :: minal,minhl,qn1,qa1,qn2,qa2
585 REALTYPE :: ps1,ps2,ff1,ff2 590 REALTYPE :: ps1,ps2,ff1,ff2
586 REALTYPE :: Ea,Eh,kBeV,T0 591 REALTYPE :: Ea,Eh,kBeV,T0
587 integer :: i,j,ci 592 integer :: i,j,ci
@@ -670,8 +675,8 @@ @@ -670,8 +675,8 @@
670 +r21*cc(p1,ci)**2+r22*cc(p2,ci)**2 & 675 +r21*cc(p1,ci)**2+r22*cc(p2,ci)**2 &
671 +r23*cc(d,ci)**2+r24*cc(z1,ci)**2) 676 +r23*cc(d,ci)**2+r24*cc(z1,ci)**2)
672 677
673 - minal=min(cc(a,ci),eta*cc(l,ci))  
674 - minah=min(cc(a,ci),eta*cc(hc,ci)) 678 + minal=min(cc(a,ci),etaa*cc(l,ci))
  679 + minhl=min(cc(hc,ci),etah*cc(l,ci))
675 680
676 ! Light and nutrient limitation factors 681 ! Light and nutrient limitation factors
677 lumlim1(ci) =amr1*ff1 682 lumlim1(ci) =amr1*ff1
@@ -722,11 +727,11 @@ @@ -722,11 +727,11 @@
722 dd(z2,a,ci) =hmr2*epsi*mu22*(cc(z2,ci)+z0)/(k6+cc(z2,ci)+z0)*cc(z2,ci) 727 dd(z2,a,ci) =hmr2*epsi*mu22*(cc(z2,ci)+z0)/(k6+cc(z2,ci)+z0)*cc(z2,ci)
723 dd(z2,l,ci) =hmr2*delta*mu22*(cc(z2,ci)+z0)/(k6+cc(z2,ci)+z0)*cc(z2,ci) 728 dd(z2,l,ci) =hmr2*delta*mu22*(cc(z2,ci)+z0)/(k6+cc(z2,ci)+z0)*cc(z2,ci)
724 729
725 - dd(a,b1,ci) =vb*minal/(k4+minal+cc(l,ci))*(cc(b1,ci)+b0)  
726 - dd(l,b1,ci) =vb*cc(l,ci)/(k4+minal+cc(l,ci))*(cc(b1,ci)+b0)  
727 - dd(hc,b2,ci)=vb*cc(hc,ci)/(k10+cc(hc,ci))*(cc(b2,ci)+b0)  
728 - !dd(a,b2,ci) =vb*minah/(k10+minah+cc(hc,ci))*(cc(b2,ci)+b0)  
729 - !dd(hc,b2,ci)=vb*cc(hc,ci)/(k10+minah+cc(hc,ci))*(cc(b2,ci)+b0) 730 + dd(a,b1,ci) =vb1*minal/(k4+minal+cc(l,ci))*(cc(b1,ci)+b0)
  731 + dd(l,b1,ci) =vb1*cc(l,ci)/(k4+minal+cc(l,ci))*(cc(b1,ci)+b0)
  732 + dd(hc,b2,ci)=vb2*minhl/(k10+minhl+cc(l,ci))*(cc(b2,ci)+b0)
  733 + dd(l,b2,ci) =vb2*cc(l,ci)/(k10+minhl+cc(l,ci))*(cc(b2,ci)+b0)
  734 + !dd(hc,b2,ci)=vb*cc(hc,ci)/(k10+cc(hc,ci))*(cc(b2,ci)+b0)
730 735
731 736
732 do i=1,numc 737 do i=1,numc