Skip to content

Commit

Permalink
[phreeqc3] Made it so tests can be run in parallel
Browse files Browse the repository at this point in the history
  • Loading branch information
scharlton2 committed May 28, 2024
1 parent 9cb289b commit 2e0d42d
Show file tree
Hide file tree
Showing 5 changed files with 812 additions and 282 deletions.
22 changes: 13 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,29 @@
/mytest/out1
/mytest/phreeqc.log
/mytest/reldiff.exe
/mytest/rho_CaKMgNaCl.15.prn
/mytest/rho_CaKMgNaCl.25.prn
/mytest/rho_CaKMgNaCl.35.prn
/mytest/rho_CaKMgNaCl.45.prn
/mytest/rho_CaNaCl.25.prn
/mytest/rho_CaNaCl.49.prn
/mytest/rho_CaNaCl.5.prn
/mytest/rho_CaNaCl.99.prn
/mytest/rho_MgCaCl.24.prn
/mytest/rho_MgNaCl.24.prn
/mytest/rho_MgCaCl.49.prn
/mytest/rho_MgNaCl.49.prn
/mytest/rho_MgCaCl.5.prn
/mytest/rho_MgNaCl.5.prn
/mytest/rho_MgCaCl.74.prn
/mytest/rho_MgNaCl.74.prn
/mytest/rho_MgCaCl.99.prn
/mytest/rho_MgNaCl.24.prn
/mytest/rho_MgNaCl.49.prn
/mytest/rho_MgNaCl.5.prn
/mytest/rho_MgNaCl.74.prn
/mytest/rho_MgNaCl.99.prn
/mytest/rho_CaKMgNaCl.15.prn
/mytest/rho_CaKMgNaCl.25.prn
/mytest/rho_CaKMgNaCl.35.prn
/mytest/rho_CaKMgNaCl.45.prn
/mytest/run_copy_test.bat
/mytest/sel_o$$$101.prn
/mytest/selected.sel
/mytest/selected_output_1.sel
/mytest/selected_output_100.sel
/mytest/selected.sel


# /packages/
Expand Down
10 changes: 5 additions & 5 deletions mytest/rho_CaKMgNaCl.out
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Reading input data for simulation 1.
SOLUTION 1
pH 7 charge
SELECTED_OUTPUT
file rhoCaKMgNaCl15.prn
file rho_CaKMgNaCl.15.prn
reset false
PRINT
selected_output true
Expand Down Expand Up @@ -155,7 +155,7 @@ Reading input data for simulation 2.
selected_output false
echo_input false

Reading data from rhoCaKMgNaCl15.prn ...
Reading data from rho_CaKMgNaCl.15.prn ...
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
Expand Down Expand Up @@ -1570,7 +1570,7 @@ Reading input data for simulation 20.
-------------------------------------


Reading data from rhoCaKMgNaCl25.prn ...
Reading data from rho_CaKMgNaCl.25.prn ...
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
Expand Down Expand Up @@ -3741,7 +3741,7 @@ Reading input data for simulation 47.
-------------------------------------


Reading data from rhoCaKMgNaCl35.prn ...
Reading data from rho_CaKMgNaCl.35.prn ...
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
Expand Down Expand Up @@ -5912,7 +5912,7 @@ Reading input data for simulation 74.
-------------------------------------


Reading data from rhoCaKMgNaCl45.prn ...
Reading data from rho_CaKMgNaCl.45.prn ...
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions mytest/rho_CaNaCl.out
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Reading input data for simulation 1.
SOLUTION 1
pH 7 charge
SELECTED_OUTPUT
file rho5.prn
file rho_CaNaCl.5.prn
reset false
selected_out true
USER_GRAPH
Expand Down Expand Up @@ -144,7 +144,7 @@ Reading input data for simulation 2.
selected_output false
echo_input false

Reading data from rho5.prn ...
Reading data from rho_CaNaCl.5.prn ...
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
Expand Down Expand Up @@ -1243,7 +1243,7 @@ Reading input data for simulation 18.
-------------------------------------


Reading data from rho25.prn ...
Reading data from rho_CaNaCl.25.prn ...
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
Expand Down Expand Up @@ -15917,7 +15917,7 @@ Reading input data for simulation 215.
--------------------------------------


Reading data from rho49.prn ...
Reading data from rho_CaNaCl.49.prn ...
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
Expand Down Expand Up @@ -17466,7 +17466,7 @@ Reading input data for simulation 237.
--------------------------------------


Reading data from rho99.prn ...
Reading data from rho_CaNaCl.99.prn ...
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
Expand Down
Loading

0 comments on commit 2e0d42d

Please # to comment.