Updates for gfortran 11

leafres/testarea/C4SetUpLeafGasFit.f

@@ -723,7 +723,8 @@
      &fvector,gvector,sumsquare)
         call properties_surffunc(5,beta,starco2i(i),der_starco2i(i),
      &Amax_ACi(i),ACiinter(i),der_ACiinter(i),
-     &ACipco2i(nACiPoints(i):nACiPoints(i),i:i),der_ACiend(i),term,
+     &ACipco2i(nACiPoints(i),i),der_ACiend(i),term,
+!     &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))
         if(n.ge.5)then

leafres/testarea/LeafGasPISCAL_single.f

@@ -23,8 +23,8 @@
       
 ! Set input / output directory      
       parameter(datapath=
-!     &'../input/',
-     &'/home/l2g/jimei/',
+     &'../input/',
+!     &'/home/l2g/jimei/',
 !     &'/home/l2g/ngeetropics/gamboa/curves/',
 !     &'/home/l2g/ngeetropics/metropolitano/curves/',
 !     &'/home/l2g/ngeetropics/fortsherman/curves/',
@@ -62,8 +62,8 @@
 !     &   '/home/l2g/dataassim/leaf/data/dweston/inputs/',
 !     &   '/home/l2g/GEMSiS/curves/',
      &   outpath=
-!     &'../output/fitresult/touser/',
-     &'/home/l2g/jimei/',
+     &'../output/fitresult/touser/',
+!     &'/home/l2g/jimei/',
 !     &'/home/l2g/ngeetropics/gamboa/results/',
 !     &'/home/l2g/ngeetropics/metropolitano/results/',
 !     &'/home/l2g/ngeetropics/fortsherman/results/',
@@ -106,16 +106,16 @@
 !     &storein='/home/l2g/leafweb/users/curves/',
 !     &storeout='/home/l2g/leafweb/users/results/',
 
-!     &storein='../output/clninput/',
-!     &storeout='../output/fitresult/nottouser/',
+     &storein='../output/clninput/',
+     &storeout='../output/fitresult/nottouser/',
 
-     &storein='/home/l2g/jimei/',
-     &storeout='/home/l2g/jimei/',
+!     &storein='/home/l2g/jimei/',
+!     &storeout='/home/l2g/jimei/',
 !     &storein='/home/l2g/dataassim/leaf/data/ellsworth/outputs/',
 !     &storeout='/home/l2g/dataassim/leaf/data/ellsworth/outputs/',
 
-!     &   AllACiFiles='../piscal.cfg')
-     &AllACiFiles='/home/l2g/jimei/piscal.cfg')
+     &AllACiFiles='../piscal.cfg')
+!     &AllACiFiles='/home/l2g/jimei/piscal.cfg')
 !---------------End of variable declaration----------------
       ierr(1)=-1
       ierr(2)=-1

leafres/testarea/SetUpLeafGasFit.f

@@ -724,7 +724,8 @@
      &fvector,gvector,sumsquare)
         call properties_surffunc(5,beta,starco2i(i),der_starco2i(i),
      &Amax_ACi(i),ACiinter(i),der_ACiinter(i),
-     &ACipco2i(nACiPoints(i):nACiPoints(i),i:i),der_ACiend(i),term,
+     &ACipco2i(nACiPoints(i),i),der_ACiend(i),term,
+!     &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))
         if(n.ge.5)then

leafres/testrun/Makefile

@@ -3,19 +3,17 @@
 ALL   = piscal
 
 # compiler options
-FF    = mpif90
+#FF    = mpif90
+FF = gfortran
 #FOPTS = -g -C
 FOPTS = -g
 
-#Base directory
-BASEDIR = ../..
-
-VPATH =$(BASEDIR)/leafres/testarea:\
-	$(BASEDIR)/dataassim/math/optimization:\
-	$(BASEDIR)/dataassim/math/othersupmath:\
-	$(BASEDIR)/dataassim/math/algebra:\
-	$(BASEDIR)/dataassim/math/specialfuncs:\
-	$(BASEDIR)/dataassim/math/nonlinsystems/
+VPATH =/home/l2g/leafres/testarea:\
+	/home/l2g/dataassim/math/optimization:\
+	/home/l2g/dataassim/math/othersupmath:\
+	/home/l2g/dataassim/math/algebra:\
+	/home/l2g/dataassim/math/specialfuncs:\
+	/home/l2g/dataassim/math/nonlinsystems/
 
 # Define objects
 
@@ -37,3 +35,7 @@ $(ALL):	        $(OBJS)
 
 depend:
 	/usr/bin/X11/makedepend -- $(CFLAGS) -- $(SRCS)
+
+clean:
+	rm -f *.o
+