Merge branch 'master' of kolab:pfm

Conflicts:
  docs/reference/PELMO_runs.html
  docs/reference/pesticide.txt

2 files changed, 1 insertions, 3 deletions

diff --git a/docs/reference/PELMO_runs.html b/docs/reference/PELMO_runs.html
index 02341c6..3d70c32 100644
--- a/docs/reference/PELMO_runs.html
+++ b/docs/reference/PELMO_runs.html
@@ -190,7 +190,7 @@ the period.plm file generated by the FOCUS PELMO GUI.</p>
 #&gt; 
 #&gt; </div><div class='input'><span class='co'># We get exactly the same PECgw values (on Linux, calling PELMO using Wine).</span>
 <span class='fu'>print</span>(<span class='no'>time_1</span>)</div><div class='output co'>#&gt;        User      System verstrichen 
-#&gt;     219.116       1.020      55.436 </div><div class='input'>
+#&gt;     218.536       1.056      55.555 </div><div class='input'>
 <span class='co'># Demonstrate some results with metabolites.</span>
 <span class='no'>runs_2</span> <span class='kw'>&lt;-</span> <span class='fu'>list</span>(<span class='fu'>list</span>(<span class='kw'>psm</span> <span class='kw'>=</span> <span class='st'>'Pesticide_D_1_May_every_other_year_mets'</span>,
                     <span class='kw'>win</span> <span class='kw'>=</span> <span class='fu'>c</span>(<span class='st'>"Cha"</span>, <span class='st'>"Ham"</span>, <span class='st'>"Kre"</span>)))
diff --git a/docs/reference/pesticide.txt b/docs/reference/pesticide.txt
index 104db91..e8743b0 100644
--- a/docs/reference/pesticide.txt
+++ b/docs/reference/pesticide.txt
@@ -17,5 +17,3 @@ Dummy 1 cereals, spring n NA	Dummy 1 cereals, winter s of	Dummy 1 citrus n mm	Du
 M1 cereals, winter n NA	M1 cereals, winter s of	M1 cereals, winter n mm	M1 cereals, winter s js	M1 cereals, winter n NA	M1 cereals, winter s of	M1 cereals, winter n mm	M1 cereals, winter s js		  250.00	  100.00	  100.00	   50.00	  100.00	  100.00	0.00E+00	   50.00	 1000.00	    1.00	0.00E+00	    1.00	  -99.00	  -99.00	  -99.00	  -99.00	0.00E+00	    1.00
 Dummy 1 cereals, spring n NA	Dummy 1 cereals, winter s of	Dummy 1 citrus n mm	Dummy 1 cotton s js	Dummy 1 field beans n NA	Dummy 1 grass / alfalfa s of	Dummy 1 hops n mm	Dummy 1 legumes s js	Dummy 1 maize n NA	Dummy 1 oil seed rape, spring s of	Dummy 1 oil seed rape, winter n mm	Dummy 1 olives s js	Dummy 1 pome / stone fruit, early applns n NA	Dummy 1 pome / stone fruit, late applns s of	Dummy 1 potatoes n mm	Dummy 1 soybeans s js	Dummy 1 sugar beets n NA	Dummy 1 sunflowers s of	Dummy 1 tobacco n mm	Dummy 1 vegetables, bulb s js	Dummy 1 vegetables, fruiting n NA	Dummy 1 vegetables, leafy s of	Dummy 1 vegetables, root n mm	Dummy 1 vines, early applns s js	Dummy 1 vines, late applns n NA	Dummy 1 appln, aerial s of	Dummy 1 appln, hand (crop < 50 cm) n mm	Dummy 1 appln, hand (crop > 50 cm) s js	Dummy 1 no drift (incorp or seed trtmt) n NA	Dummy 1 cereals, spring n NA	Dummy 1 cereals, winter s of	Dummy 1 citrus n mm	Dummy 1 cotton s js	Dummy 1 field beans n NA	Dummy 1 grass / alfalfa s of	Dummy 1 hops n mm	Dummy 1 legumes s js	Dummy 1 maize n NA	Dummy 1 oil seed rape, spring s of	Dummy 1 oil seed rape, winter n mm	Dummy 1 olives s js	Dummy 1 pome / stone fruit, early applns n NA	Dummy 1 pome / stone fruit, late applns s of	Dummy 1 potatoes n mm	Dummy 1 soybeans s js	Dummy 1 sugar beets n NA	Dummy 1 sunflowers s of	Dummy 1 tobacco n mm	Dummy 1 vegetables, bulb s js	Dummy 1 vegetables, fruiting n NA	Dummy 1 vegetables, leafy s of	Dummy 1 vegetables, root n mm	Dummy 1 vines, early applns s js	Dummy 1 vines, late applns n NA	Dummy 1 appln, aerial s of	Dummy 1 appln, hand (crop < 50 cm) n mm	Dummy 1 appln, hand (crop > 50 cm) s js	Dummy 1 no drift (incorp or seed trtmt) n NA		  -99.00	  -99.00	 6000.00	  344.80	0.00E+00	    6.00	0.00E+00	0.00E+00	 3000.00	    1.00	0.00E+00	0.00E+00	    1.00	    2.00	    3.00	    4.00	    5.00	    6.00	    7.00	    8.00	    9.00	   10.00	   11.00	   12.00	   13.00	   14.00	   15.00	   16.00	   17.00	   18.00	   19.00	   20.00	   21.00	   22.00	   23.00	   24.00	   25.00	   26.00	   27.00	   28.00	0.00E+00	  -99.00	  -99.00	  -99.00	0.00E+00	    1.00
 M1 cereals, winter n NA	M1 cereals, winter s of	M1 cereals, winter n mm	M1 cereals, winter s js	M1 cereals, winter n NA	M1 cereals, winter s of	M1 cereals, winter n mm	M1 cereals, winter s js		  250.00	  100.00	  100.00	   50.00	  100.00	  100.00	0.00E+00	   50.00	 1000.00	    1.00	0.00E+00	    1.00	  -99.00	  -99.00	  -99.00	  -99.00	0.00E+00	    1.00
-Dummy 1 cereals, spring n NA	Dummy 1 cereals, winter s of	Dummy 1 citrus n mm	Dummy 1 cotton s js	Dummy 1 field beans n NA	Dummy 1 grass / alfalfa s of	Dummy 1 hops n mm	Dummy 1 legumes s js	Dummy 1 maize n NA	Dummy 1 oil seed rape, spring s of	Dummy 1 oil seed rape, winter n mm	Dummy 1 olives s js	Dummy 1 pome / stone fruit, early applns n NA	Dummy 1 pome / stone fruit, late applns s of	Dummy 1 potatoes n mm	Dummy 1 soybeans s js	Dummy 1 sugar beets n NA	Dummy 1 sunflowers s of	Dummy 1 tobacco n mm	Dummy 1 vegetables, bulb s js	Dummy 1 vegetables, fruiting n NA	Dummy 1 vegetables, leafy s of	Dummy 1 vegetables, root n mm	Dummy 1 vines, early applns s js	Dummy 1 vines, late applns n NA	Dummy 1 appln, aerial s of	Dummy 1 appln, hand (crop < 50 cm) n mm	Dummy 1 appln, hand (crop > 50 cm) s js	Dummy 1 no drift (incorp or seed trtmt) n NA	Dummy 1 cereals, spring n NA	Dummy 1 cereals, winter s of	Dummy 1 citrus n mm	Dummy 1 cotton s js	Dummy 1 field beans n NA	Dummy 1 grass / alfalfa s of	Dummy 1 hops n mm	Dummy 1 legumes s js	Dummy 1 maize n NA	Dummy 1 oil seed rape, spring s of	Dummy 1 oil seed rape, winter n mm	Dummy 1 olives s js	Dummy 1 pome / stone fruit, early applns n NA	Dummy 1 pome / stone fruit, late applns s of	Dummy 1 potatoes n mm	Dummy 1 soybeans s js	Dummy 1 sugar beets n NA	Dummy 1 sunflowers s of	Dummy 1 tobacco n mm	Dummy 1 vegetables, bulb s js	Dummy 1 vegetables, fruiting n NA	Dummy 1 vegetables, leafy s of	Dummy 1 vegetables, root n mm	Dummy 1 vines, early applns s js	Dummy 1 vines, late applns n NA	Dummy 1 appln, aerial s of	Dummy 1 appln, hand (crop < 50 cm) n mm	Dummy 1 appln, hand (crop > 50 cm) s js	Dummy 1 no drift (incorp or seed trtmt) n NA		  -99.00	  -99.00	 6000.00	  344.80	0.00E+00	    6.00	0.00E+00	0.00E+00	 3000.00	    1.00	0.00E+00	0.00E+00	    1.00	    2.00	    3.00	    4.00	    5.00	    6.00	    7.00	    8.00	    9.00	   10.00	   11.00	   12.00	   13.00	   14.00	   15.00	   16.00	   17.00	   18.00	   19.00	   20.00	   21.00	   22.00	   23.00	   24.00	   25.00	   26.00	   27.00	   28.00	0.00E+00	  -99.00	  -99.00	  -99.00	0.00E+00	    1.00
-M1 cereals, winter n NA	M1 cereals, winter s of	M1 cereals, winter n mm	M1 cereals, winter s js	M1 cereals, winter n NA	M1 cereals, winter s of	M1 cereals, winter n mm	M1 cereals, winter s js		  250.00	  100.00	  100.00	   50.00	  100.00	  100.00	0.00E+00	   50.00	 1000.00	    1.00	0.00E+00	    1.00	  -99.00	  -99.00	  -99.00	  -99.00	0.00E+00	    1.00