New changes from l2g

w

leafres/testarea/SetUpLeafGasFit.f

@@ -685,7 +685,7 @@
         else
           betamin(1)=0.5d0*amaxave
         endif
-        betamax(1)=200.0d0
+        betamax(1)=1000.0d0
         beta(2)=1.5d0
         betamin(2)=1.0d-5
         betamax(2)=1000.0d0
@@ -696,8 +696,8 @@
         betamin(4)=0.0d0
         betamax(4)=5000.0d0
         beta(5)=-10.0d0
-        betamin(5)=-100.0d0
-        betamax(5)=100.0d0
+        betamin(5)=-1000.0d0
+        betamax(5)=1000.0d0
         k=0
         n=0
         do j=1,nACiPoints(i)
@@ -717,6 +717,7 @@
             wvector(n)=ACipco2ambient(j,i)
           endif
         enddo
+!
         call GenericRegres(nACiPoints(i),1,
      &ACianet_obs(1:nACiPoints(i),i:i),1,ACipco2i(1:nACiPoints(i),i:i),
      &weity,weitx,5,beta,betamin,betamax,xmin,xmax,iderivative,INFO,
@@ -726,13 +727,24 @@
      &ACipco2i(nACiPoints(i):nACiPoints(i),i:i),der_ACiend(i),term,
      &ACipco2i(1:1,i:i),ACipco2i(nACiPoints(i):nACiPoints(i),i:i),
      &ACimaxcurvature(i),ACimaxcurvpco2i(i))
-        call GenericRegres(n,1,zvector,1,wvector,weity,weitx,5,beta,
+        if(n.ge.5)then
+          call GenericRegres(n,1,zvector,1,wvector,weity,weitx,5,beta,
      &betamin,betamax,xmin,xmax,iderivative,INFO,fvector,gvector,
      &sumsquare)
-        call properties_surffunc(5,beta,starco2a(i),der_starco2a(i),
+          call properties_surffunc(5,beta,starco2a(i),der_starco2a(i),
      &Amax_ACa(i),ACainter(i),der_ACainter(i),40.0d0,der_ACa400ppm(i),
      &anet_ACa400ppm(i),wvector(1),wvector(n),ACamaxcurvature(i),
      &ACamaxcurvpco2a(i))
+        else
+          der_starco2a(i)=-9999.0d0
+          Amax_ACa(i)=-9999.0d0
+          ACainter(i)=-9999.0d0
+          der_ACainter(i)=-9999.0d0
+          der_ACa400ppm(i)=-9999.0d0
+          anet_ACa400ppm(i)=-9999.0d0
+          ACamaxcurvature(i)=-9999.0d0
+          ACamaxcurvpco2a(i)=-9999.0d0
+        endif
         if(Amax_ACi(i).lt.50.0d0)amaxave=Amax_ACi(i)
         j=min0(5,nACiPoints(i))
         call y_aPLUSbx(j,ACipco2i(1:j,i:i),ACianet_obs(1:j,i:i),ac,at)
@@ -1268,7 +1280,7 @@
         endif
       enddo
       idotempcoeff=0
-      if((term2-term1).gt.2.0d0)idotempcoeff=1
+      if((term2-term1).gt.5.0d0)idotempcoeff=1
 !If temperature variation in the dataset is larger enough, try to estimate parameters in temperature response functions
 !All variables are now in the right order. All ACi curves are ordered and All ALight curves are ordered.
 !-------------------------------------------------------------------------------------------------------
@@ -1283,7 +1295,7 @@
         pco2c_pco2i_flu(i)=-9999.0d0
       enddo
       if(ntotphips2.gt.5)then
-        do idorch=1,1
+        do idorch=0,0
 !we do a fluorescence only fit
           Prioriknowlimit=-1
           ifitmode=1
@@ -1291,7 +1303,7 @@
 !ifitmode: =-1, ordinary fitting with anet calculated as a function of pco2i
 !ifitmode: =1, orthogonal fitting with anet calculated as a function of pco2i
 !ifitmode: =2, orthogonal fitting with pco2i calculated as a function of anet
-          idorwp=1
+          idorwp=0
           resistwp25_ori=resistwp25_ini    
           if(idorch.eq.1)then
             resistch25_ori=resistch25_ini
@@ -1638,11 +1650,12 @@
               co2imany(3)=3.0d0
               co2imany(4)=4.0d0
               co2imany(5)=5.0d0
-              m=5
+              co2imany(6)=6.0d0
+              m=6
               term=ACipco2i(nACiPoints(i),i)+10.0d0
-              do ccc=6.0d0,term,2.5d0
+              do while (co2imany(m).le.term)
                 m=m+1
-                co2imany(m)=ccc
+                co2imany(m)=co2imany(m-1)+2.5d0
               enddo
               do j=1,m
                 ccc=co2imany(j)