diff --git a/leafres/testarea/C4SetUpLeafGasFit.f b/leafres/testarea/C4SetUpLeafGasFit.f index 767969a..c644830 100644 --- a/leafres/testarea/C4SetUpLeafGasFit.f +++ b/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 diff --git a/leafres/testarea/LeafGasPISCAL_single.f b/leafres/testarea/LeafGasPISCAL_single.f index a182052..1551900 100644 --- a/leafres/testarea/LeafGasPISCAL_single.f +++ b/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 diff --git a/leafres/testarea/SetUpLeafGasFit.f b/leafres/testarea/SetUpLeafGasFit.f index 0ff23a7..1550105 100644 --- a/leafres/testarea/SetUpLeafGasFit.f +++ b/leafres/testarea/SetUpLeafGasFit.f @@ -316,21 +316,21 @@ do k=1,numACicurves if(j.eq.ACiID(k))then nACiPoints(k)=nACiPoints(k)+1 - ACianet_obs0(nACiPoints(k),k)=anet_obs0(i) - ACipco2i0(nACiPoints(k),k)=pco2i0(i) - ACitempleaf0(nACiPoints(k),k)=templeaf0(i) - ACiaPPFDlf0(nACiPoints(k),k)=aPPFDlf0(i) - ACipres_air0(nACiPoints(k),k)=pres_air0(i) - ACipo2i0(nACiPoints(k),k)=po2i0(i) - ACichlflphips20(nACiPoints(k),k)=chlflphips20(i) - ACipco2ambient0(nACiPoints(k),k)=pco2ambient0(i) - ACitrmmol0(nACiPoints(k),k)=trmmol0(i) - ACigswmeas0(nACiPoints(k),k)=gswmeas0(i) - ACivpdl0(nACiPoints(k),k)=vpdl0(i) - ACitempair0(nACiPoints(k),k)=tempair0(i) - ACieambient0(nACiPoints(k),k)=eambient0(i) + ACianet_obs0(nACiPoints(k),k)=anet_obs0(i) + ACipco2i0(nACiPoints(k),k)=pco2i0(i) + ACitempleaf0(nACiPoints(k),k)=templeaf0(i) + ACiaPPFDlf0(nACiPoints(k),k)=aPPFDlf0(i) + ACipres_air0(nACiPoints(k),k)=pres_air0(i) + ACipo2i0(nACiPoints(k),k)=po2i0(i) + ACichlflphips20(nACiPoints(k),k)=chlflphips20(i) + ACipco2ambient0(nACiPoints(k),k)=pco2ambient0(i) + ACitrmmol0(nACiPoints(k),k)=trmmol0(i) + ACigswmeas0(nACiPoints(k),k)=gswmeas0(i) + ACivpdl0(nACiPoints(k),k)=vpdl0(i) + ACitempair0(nACiPoints(k),k)=tempair0(i) + ACieambient0(nACiPoints(k),k)=eambient0(i) ! - ACifo_pam0(nACiPoints(k),k)=fo_pam0(i) + ACifo_pam0(nACiPoints(k),k)=fo_pam0(i) ACifm_pam0(nACiPoints(k),k)=fm_pam0(i) ACifs_pam0(nACiPoints(k),k)=fs_pam0(i) ACipam_measlight0(nACiPoints(k),k)=pam_measlight0(i) @@ -364,7 +364,7 @@ ACitempair0(1,numACicurves)=tempair0(i) ACieambient0(1,numACicurves)=eambient0(i) ! - ACifo_pam0(1,numACicurves)=fo_pam0(i) + ACifo_pam0(1,numACicurves)=fo_pam0(i) ACifm_pam0(1,numACicurves)=fm_pam0(i) ACifs_pam0(1,numACicurves)=fs_pam0(i) ACipam_measlight0(1,numACicurves)=pam_measlight0(i) @@ -384,21 +384,21 @@ do k=1,numALightcurves if(j.eq.ALightID(k))then nALightPoints(k)=nALightPoints(k)+1 - ALightanet_obs0(nALightPoints(k),k)=anet_obs0(i) - ALightpco2i0(nALightPoints(k),k)=pco2i0(i) - ALighttempleaf0(nALightPoints(k),k)=templeaf0(i) - ALightaPPFDlf0(nALightPoints(k),k)=aPPFDlf0(i) - ALightpres_air0(nALightPoints(k),k)=pres_air0(i) - ALightpo2i0(nALightPoints(k),k)=po2i0(i) - ALightchlflphips20(nALightPoints(k),k)=chlflphips20(i) - ALightpco2ambient0(nALightPoints(k),k)=pco2ambient0(i) - ALighttrmmol0(nALightPoints(k),k)=trmmol0(i) - ALightgswmeas0(nALightPoints(k),k)=gswmeas0(i) - ALightvpdl0(nALightPoints(k),k)=vpdl0(i) - ALighttempair0(nALightPoints(k),k)=tempair0(i) - ALighteambient0(nALightPoints(k),k)=eambient0(i) + ALightanet_obs0(nALightPoints(k),k)=anet_obs0(i) + ALightpco2i0(nALightPoints(k),k)=pco2i0(i) + ALighttempleaf0(nALightPoints(k),k)=templeaf0(i) + ALightaPPFDlf0(nALightPoints(k),k)=aPPFDlf0(i) + ALightpres_air0(nALightPoints(k),k)=pres_air0(i) + ALightpo2i0(nALightPoints(k),k)=po2i0(i) + ALightchlflphips20(nALightPoints(k),k)=chlflphips20(i) + ALightpco2ambient0(nALightPoints(k),k)=pco2ambient0(i) + ALighttrmmol0(nALightPoints(k),k)=trmmol0(i) + ALightgswmeas0(nALightPoints(k),k)=gswmeas0(i) + ALightvpdl0(nALightPoints(k),k)=vpdl0(i) + ALighttempair0(nALightPoints(k),k)=tempair0(i) + ALighteambient0(nALightPoints(k),k)=eambient0(i) ! - ALightfo_pam0(nALightPoints(k),k)=fo_pam0(i) + ALightfo_pam0(nALightPoints(k),k)=fo_pam0(i) ALightfm_pam0(nALightPoints(k),k)=fm_pam0(i) ALightfs_pam0(nALightPoints(k),k)=fs_pam0(i) ALightpam_measlight0(nALightPoints(k),k)= @@ -426,7 +426,7 @@ ALightaPPFDlf0(1,numALightcurves)=aPPFDlf0(i) ALightpres_air0(1,numALightcurves)=pres_air0(i) ALightpo2i0(1,numALightcurves)=po2i0(i) - ALightchlflphips20(1,numALightcurves)=chlflphips20(i) + ALightchlflphips20(1,numALightcurves)=chlflphips20(i) ALightpco2ambient0(1,numALightcurves)=pco2ambient0(i) ALighttrmmol0(1,numALightcurves)=trmmol0(i) ALightgswmeas0(1,numALightcurves)=gswmeas0(i) @@ -434,7 +434,7 @@ ALighttempair0(1,numALightcurves)=tempair0(i) ALighteambient0(1,numALightcurves)=eambient0(i) ! - ALightfo_pam0(1,numALightcurves)=fo_pam0(i) + ALightfo_pam0(1,numALightcurves)=fo_pam0(i) ALightfm_pam0(1,numALightcurves)=fm_pam0(i) ALightfs_pam0(1,numALightcurves)=fs_pam0(i) ALightpam_measlight0(1,numALightcurves)= @@ -559,7 +559,7 @@ ACieambient(j,i)=ACieambient0(ioriorder(j),i) ACichlflphips2(j,i)=ACichlflphips20(ioriorder(j),i) ! - ACifo_pam(j,i)=ACifo_pam0(ioriorder(j),i) + ACifo_pam(j,i)=ACifo_pam0(ioriorder(j),i) ACifm_pam(j,i)=ACifm_pam0(ioriorder(j),i) ACifs_pam(j,i)=ACifs_pam0(ioriorder(j),i) ACipam_measlight(j,i)=ACipam_measlight0(ioriorder(j),i) @@ -649,7 +649,7 @@ ALighteambient(j,i)=ALighteambient0(ioriorder(j),i) ALightchlflphips2(j,i)=ALightchlflphips20(ioriorder(j),i) ! - ALightfo_pam(j,i)=ALightfo_pam0(ioriorder(j),i) + ALightfo_pam(j,i)=ALightfo_pam0(ioriorder(j),i) ALightfm_pam(j,i)=ALightfm_pam0(ioriorder(j),i) ALightfs_pam(j,i)=ALightfs_pam0(ioriorder(j),i) ALightpam_measlight(j,i)=ALightpam_measlight0(ioriorder(j),i) @@ -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 diff --git a/leafres/testrun/Makefile b/leafres/testrun/Makefile index 5e05a07..888aa00 100644 --- a/leafres/testrun/Makefile +++ b/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 +