Squashed 'examples/' changes from 1777f2bc..31517c71

31517c71 Updated output for 3.8.6 release

git-subtree-dir: examples
git-subtree-split: 31517c71c70af07af992b2dceb8ebc1b8ff74e3d

ex11.out

@@ -209,9 +209,6 @@ Reading input data for simulation 3.
 	        print_frequency 20
 	PRINT
 	 reset false
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 40.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 40.
-WARNING: 
-Calculating transport: 40 (mobile) cells, 100 shifts, 4 mixruns...
 
+Calculating transport: 40 (mobile) cells, 100 shifts, 4 mixruns...
 

ex12.out

@@ -52,13 +52,9 @@ Reading input data for simulation 1.
 	    KX    0.048
 	PRINT
 	   reset   false
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 60.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 60.
-WARNING: 
+
 Calculating transport: 60 (mobile) cells, 60 shifts, 0 mixruns...
 
 
-WARNING: 
 Calculating transport: 60 (mobile) cells, 1 shifts, 122 mixruns...
 
-

ex12a.out

@@ -72,14 +72,12 @@ Reading input data for simulation 1.
 	   shifts  1
 	   flow_direction diffusion
 	   boundary_conditions  constant  closed
-	   lengths           1.0
+	   lengths           20*1.0
 	   thermal_diffusion 3.0        # Heat is retarded equal to Na
-	   dispersivities    0.0        # No dispersion
+	   dispersivities    20*0.0        # No dispersion
 	   diffusion_coefficient 0.3e-9 # m^2/s
 	   time_step         1.0e+10    # 317 years, 19 substeps will be used
 	SELECTED_OUTPUT
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 20.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
 	   file           ex12a.sel
 	   high_precision true
 	   reset          false
@@ -115,9 +113,8 @@ WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
 	  2060 erfc = b * (a1 + b * (a2 + b * (a3 + b * (a4 + b * a5)))) * EXP(-(z * z))
 	  2080 RETURN
 	END
-WARNING: 
-Calculating transport: 20 (mobile) cells, 1 shifts, 14 mixruns...
 
+Calculating transport: 20 (mobile) cells, 1 shifts, 14 mixruns...
 
 	SELECTED_OUTPUT
 	   active        false     # See also PRINT; selected_output false
@@ -133,16 +130,14 @@ Calculating transport: 20 (mobile) cells, 1 shifts, 14 mixruns...
 	END
 	TRANSPORT  # no need to redefine parameters that don't change from 20 cell model
 	   cells        60
-	   lengths      0.33333333333333333
+	   lengths      60*0.33333333333333333
+	   disp         60*0.0
 	   punch_cells  1-60
 	SELECTED_OUTPUT
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 60.
-WARNING: No dispersivities were read; disp = 0 assumed.
 	   active        true      # See also PRINT; selected_output false
 	END
-WARNING: 
-Calculating transport: 60 (mobile) cells, 1 shifts, 122 mixruns...
 
+Calculating transport: 60 (mobile) cells, 1 shifts, 122 mixruns...
 
 	SOLUTION                    # Initial solution calculation for pure water
 	PRINT

ex13a.out

@@ -298,15 +298,12 @@ Reading input data for simulation 3.
 	   time_step       3600
 	   boundary_conditions   flux  flux
 	   diffusion_coefficient 0.0
-	   lengths         0.1
-	   dispersivities  0.015
+	   lengths         20*0.1
+	   dispersivities  20*0.015
 	   stagnant   1  6.8e-6  0.3        0.1
 	END
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 20.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
-WARNING: 
-Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
 	SOLUTION 0  # Original solution with KNO3 reenters
 	   units   mmol/l
@@ -339,7 +336,6 @@ Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 	  20 GRAPH_Y TOT("Na")*1000 TOT("Cl")*1000
 	  -end
 	END
-WARNING: 
-Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 

ex13ac.out

@@ -298,15 +298,12 @@ Reading input data for simulation 3.
 	        time_step       3600
 	        boundary_conditions   flux  flux
 	        diffusion_coefficient 0.0
-	        lengths         0.1
-	        dispersivities  0.015
+	        lengths         20*0.1
+	        dispersivities  20*0.015
 	        stagnant   1  6.8e-6  0.3        0.1
 	END
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 20.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
-WARNING: 
-Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
 	SOLUTION 0  # Original solution with KNO3 reenters
 	        units   mmol/l
@@ -340,9 +337,8 @@ Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 	  30 plot_xy dist, TOT("Cl")*1000, color = Green, symbol = Diamond, symbol_size = 7
 	  -end
 	END
-WARNING: 
-Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 
 	PRINT
 	 user_graph false
@@ -819,15 +815,12 @@ Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 	        time_step       3600
 	        boundary_conditions   flux  flux
 	        diffusion_coefficient 0.0
-	        lengths         0.1
-	        dispersivities  0.015
+	        lengths         20*0.1
+	        dispersivities  20*0.015
 	      stagnant        5
 	END
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 20.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
-WARNING: 
-Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
 	SOLUTION 0  # Original solution reenters
 	        units   mmol/l
@@ -858,7 +851,6 @@ Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 	  30 plot_xy dist, TOT("Cl")*1000, color = Green, symbol = Plus
 	  -end
 	END
-WARNING: 
-Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 

ex13b.out

@@ -418,15 +418,12 @@ Reading input data for simulation 3.
 	   time_step       3600
 	   boundary_conditions   flux  flux
 	   diffusion_coefficient 0.0
-	   lengths         0.1
-	   dispersivities  0.015
+	   lengths         20*0.1
+	   dispersivities  20*0.015
 	   stagnant        1
 	END
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 20.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
-WARNING: 
-Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
 	SOLUTION 0  # Original solution reenters
 	   units   mmol/l
@@ -459,7 +456,6 @@ Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 	  20 GRAPH_Y TOT("Na")*1000 TOT("Cl")*1000
 	   -end
 	END
-WARNING: 
-Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 

ex13c.out

@@ -738,15 +738,12 @@ Reading input data for simulation 3.
 	   time_step       3600
 	   boundary_conditions   flux  flux
 	   diffusion_coefficient 0.0
-	   lengths         0.1
-	   dispersivities  0.015
+	   lengths         20*0.1
+	   dispersivities  20*0.015
 	   stagnant        5
 	END
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 20.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
-WARNING: 
-Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 
 	SOLUTION 0  # Original solution reenters
 	   units   mmol/l
@@ -779,7 +776,6 @@ Calculating transport: 20 (mobile) cells, 5 shifts, 1 mixruns...
 	  20 GRAPH_Y TOT("Na")*1000 TOT("Cl")*1000
 	    -end
 	END
-WARNING: 
-Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 10 shifts, 1 mixruns...
 

ex15.out

@@ -141,34 +141,30 @@ Reading input data for simulation 1.
 	        -end          -end
 	TRANSPORT First 20 hours have NTA and cobalt in infilling solution
 	        cells                10
-	        lengths              1
+	        lengths              10*1
 	        shifts               20
 	        time_step            3600
 	        flow_direction       forward
 	        boundary_conditions  flux flux
-	        dispersivities       .05
+	        dispersivities       10*.05
 	        correct_disp         true
 	        diffusion_coefficient 0.0
 	        punch_cells          10
 	        punch_frequency      1
 	        print_cells          10
 	        print_frequency      5
 	COPY solution 101 0 # initial column solution becomes influent
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 10.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 10.
 	END
-WARNING: 
-Calculating transport: 10 (mobile) cells, 20 shifts, 1 mixruns...
 
+Calculating transport: 10 (mobile) cells, 20 shifts, 1 mixruns...
 
 	TRANSPORT Last 55 hours with background infilling solution
 	        shifts               55
 	COPY cell 100 0 # for the 20 cell model...
 	COPY cell 101 1-20
 	END
-WARNING: 
-Calculating transport: 10 (mobile) cells, 55 shifts, 1 mixruns...
 
+Calculating transport: 10 (mobile) cells, 55 shifts, 1 mixruns...
 
 	USER_PUNCH
 	        start
@@ -198,33 +194,29 @@ Calculating transport: 10 (mobile) cells, 55 shifts, 1 mixruns...
 	        -end        
 	TRANSPORT First 20 hours have NTA and cobalt in infilling solution
 	        cells                20
-	        lengths              0.5
+	        lengths              20*0.5
 	        shifts               40
 	        initial_time         0
 	        time_step            1800
 	        flow_direction       forward
 	        boundary_conditions  flux  flux
-	        dispersivities       .05
+	        dispersivities       20*.05
 	        correct_disp         true
 	        diffusion_coefficient 0.0
 	        punch_cells          20
 	        punch_frequency      2
 	        print_cells          20
 	        print_frequency      10
 	COPY cell 101 0
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 20.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
 	END
 WARNING: USER_PUNCH: Headings count does not match number of calls to PUNCH.
 
-WARNING: 
-Calculating transport: 20 (mobile) cells, 40 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 40 shifts, 1 mixruns...
 
 	TRANSPORT Last 55 hours with background infilling solution
 	        shifts               110
 	END
-WARNING: 
-Calculating transport: 20 (mobile) cells, 110 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 110 shifts, 1 mixruns...
 

ex15a.out

@@ -127,34 +127,30 @@ Reading input data for simulation 1.
 	        -end
 	TRANSPORT First 20 hours have NTA and cobalt in infilling solution
 	        cells                10
-	        lengths              1
+	        lengths              10*1
 	        shifts               20
 	        time_step            3600
 	        flow_direction       forward
 	        boundary_conditions  flux flux
-	        dispersivities       .05
+	        dispersivities       10*.05
 	        correct_disp         true
 	        diffusion_coefficient 0.0
 	        punch_cells          10
 	        punch_frequency      1
 	        print_cells          10
 	        print_frequency      5
 	COPY solution 101 0 # initial column solution becomes influent
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 10.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 10.
 	END
-WARNING: 
-Calculating transport: 10 (mobile) cells, 20 shifts, 1 mixruns...
 
+Calculating transport: 10 (mobile) cells, 20 shifts, 1 mixruns...
 
 	TRANSPORT Last 55 hours with background infilling solution
 	        shifts               55
 	COPY cell 100 0 # for the 20 cell model...
 	COPY cell 101 1-20
 	END
-WARNING: 
-Calculating transport: 10 (mobile) cells, 55 shifts, 1 mixruns...
 
+Calculating transport: 10 (mobile) cells, 55 shifts, 1 mixruns...
 
 	USER_PUNCH
 	        start
@@ -175,33 +171,29 @@ Calculating transport: 10 (mobile) cells, 55 shifts, 1 mixruns...
 	        -end
 	TRANSPORT First 20 hours have NTA and cobalt in infilling solution
 	        cells                20
-	        lengths              0.5
+	        lengths              20*0.5
 	        shifts               40
 	        initial_time         0
 	        time_step            1800
 	        flow_direction       forward
 	        boundary_conditions  flux  flux
-	        dispersivities       .05
+	        dispersivities       20*.05
 	        correct_disp         true
 	        diffusion_coefficient 0.0
 	        punch_cells          20
 	        punch_frequency      2
 	        print_cells          20
 	        print_frequency      10
 	COPY cell 101 0
-WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 20.
-WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
 	END
 WARNING: USER_PUNCH: Headings count does not match number of calls to PUNCH.
 
-WARNING: 
-Calculating transport: 20 (mobile) cells, 40 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 40 shifts, 1 mixruns...
 
 	TRANSPORT Last 55 hours with background infilling solution
 	        shifts               110
 	END
-WARNING: 
-Calculating transport: 20 (mobile) cells, 110 shifts, 1 mixruns...
 
+Calculating transport: 20 (mobile) cells, 110 shifts, 1 mixruns...