Squashed 'examples/' changes from 8f9acfc7..1777f2bc

1777f2bc Merge branch 'mix_error' of github.com:dlparkhurst/phreeqc3-1 into mix_error da8a610a Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments. git-subtree-dir: examples git-subtree-split: 1777f2bc99bd9b655e838908e0fdfb81bfdd1e3f
usgs-coupled · Jan 7, 2025 · 821dc55 · 821dc55
1 parent 074768c
commit 821dc55
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 29 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -8,6 +8,8 @@ examplesdir = $(docdir)/examples
 dist_examples_DATA = $(EXAMPLES)
 
 EXAMPLES= \
+	co2.dat \
+	co2_VP.dat \
 	co2.tsv \
 	ex1 \
 	ex2 \

diff --git a/ex11 b/ex11
@@ -58,13 +58,13 @@ USER_GRAPH 1
 END
 TRANSPORT
         -cells           40
-        -lengths         0.002
+        -lengths         40*0.002
         -shifts          100
         -time_step       720.0
         -flow_direction  forward
         -boundary_conditions   flux  flux
         -diffusion_coefficient 0.0e-9
-        -dispersivities  0.002
+        -dispersivities  40*0.002
         -correct_disp    true
         -punch_cells     40
         -punch_frequency 1

diff --git a/ex12 b/ex12
@@ -47,8 +47,8 @@ TRANSPORT           # Make column temperature 0C, displace Cl
    -shifts  60
    -flow_direction  forward
    -boundary_conditions flux  flux
-   -lengths 0.333333
-   -dispersivities        0.0     # No dispersion
+   -lengths 60*0.333333
+   -dispersivities        60*0.0     # No dispersion
    -diffusion_coefficient 0.0     # No diffusion
    -thermal_diffusion     1.0     # No retardation for heat
 END

diff --git a/ex12a b/ex12a
@@ -56,9 +56,9 @@ TRANSPORT   # Diffuse 24C, NaCl solution from column ends
    -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
@@ -121,7 +121,8 @@ 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
    -active        true      # See also PRINT; selected_output false

diff --git a/ex13a b/ex13a
@@ -34,8 +34,8 @@ TRANSPORT
    -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
 #   1 stagnant layer^, ^alpha, ^epsil(m), ^epsil(im)
 END

diff --git a/ex13ac b/ex13ac
@@ -34,8 +34,8 @@ TRANSPORT
         -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
 #   1 stagnant layer^, ^alpha, ^epsil(m), ^epsil(im)
 END
@@ -228,8 +228,8 @@ TRANSPORT
         -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
 SOLUTION 0  # Original solution reenters

diff --git a/ex13b b/ex13b
@@ -55,8 +55,8 @@ TRANSPORT
    -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
 SOLUTION 0  # Original solution reenters

diff --git a/ex13c b/ex13c
@@ -155,8 +155,8 @@ TRANSPORT
    -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
 SOLUTION 0  # Original solution reenters

diff --git a/ex15 b/ex15
@@ -135,12 +135,12 @@ USER_GRAPH 2 Example 15
         -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
@@ -183,13 +183,13 @@ USER_GRAPH 2
         -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

diff --git a/ex15a b/ex15a
@@ -118,12 +118,12 @@ USER_GRAPH Example 15A
         -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
@@ -156,13 +156,13 @@ USER_GRAPH
         -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

diff --git a/ex15b b/ex15b
@@ -103,12 +103,12 @@ USER_PUNCH
         -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
@@ -147,13 +147,13 @@ USER_PUNCH
         -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

diff --git a/ex20b b/ex20b
@@ -96,6 +96,7 @@ USER_PUNCH
 END
 PRINT
 	-selected_output false
+	-warnings        0
 END
 INCLUDE$ ex20_open
 END

diff --git a/ex21 b/ex21
@@ -357,5 +357,6 @@ USER_PUNCH
 END
 PRINT
  -selected_out false
+ -status       false
 INCLUDE$ radial
 END
diff --git a/ex22 b/ex22
@@ -1,6 +1,8 @@
 TITLE Example 22.--Compare experimental CO2 solubilities at high CO2 pressure with
       Peng-Robinson calc`ns with fixed-volume gas_phase, 25, 50, 75, 100, 150 oC.
 #PRINT; -reset false
+PRINT
+-warnings 0
 SOLUTION 1
 GAS_PHASE 1
     -fixed_volume

diff --git a/ex9 b/ex9
@@ -96,6 +96,8 @@ Goethite
         Fe_triOOH + 3 H+ = Fe_tri+3 + 2 H2O
         log_k   -1.0
 END
+PRINT
+-warnings 0
 SOLUTION 1
         pH  7.0
         pe 10.0  O2(g) -0.67
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,6 +96,7 @@ USER_PUNCH @@
     END
     PRINT
     	-selected_output false
+    	-warnings        0
     END
     INCLUDE$ ex20_open
     END
@@ Expand Down @@