New changes from l2g

w

leafres/testrun/Makefile

@@ -1,12 +1,11 @@
 # This is the makefile for piscal
 # name of executable
 ALL   = piscal
-#mpipiscal
 
 # compiler options
 FF    = mpif90
 #FOPTS = -g -C
-FOPTS = -g -fallow-argument-mismatch
+FOPTS = -g
 
 #Base directory
 BASEDIR = ../..
@@ -27,7 +26,8 @@ OBJS =	LeafGasPISCAL_single.o adsor.o clustering.o cppowell.o GenericRegres.o lf
 	LeafGasFit_Stom.o nonsyssolver.o time_resolution.o CharToNumeric.o cpfixedpoint.o funkmin_cica5.o NumberToChar.o\
         stdmaxmeanmin.o ToLeafGasOptimization.o cica5.o cpnongradopt.o funkmin_stom.o LeafGasPrintToFiles.o odr_leastsquare.o StomatalConductance.o\
 	UnivParamsAlloc.o cica_Regression5.o cpnonsyssolver.o funkmin_UnivPhotoFit.o leafunivphotosyn.o odrpack.o stomlfitbasis.o UnivPhotoFit.o\
-        fluorescencejmax.o funkmin_flujmax.o pam_parameters.o
+        fluorescencejmax.o funkmin_flujmax.o pam_parameters.o C4SetUpLeafGasFit.o C4PhotoFit.o funkmin_C4Fit.o c4leafanetmodel.o d1mach.o dnqsol.o\
+        ierm1.o derv1.o dnrm2.o ierv1.o ermsg.o erfin.o
 
 $(ALL):	        $(OBJS) 
 	        $(FF) $(FOPTS) $(OBJS) -o $@