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 067ebd9 commit 9cb289b
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 2,172 deletions.
24 changes: 14 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,20 @@
/mytest/out1
/mytest/phreeqc.log
/mytest/reldiff.exe
/mytest/rho24_MgCaCl
/mytest/rho24_MgNaCl
/mytest/rho49.prn
/mytest/rho5.prn
/mytest/rho74.prn
/mytest/rho99.prn
/mytest/rhoCaKMgNaCl15.prn
/mytest/rhoCaKMgNaCl25.prn
/mytest/rhoCaKMgNaCl35.prn
/mytest/rhoCaKMgNaCl45.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.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
Expand Down
2 changes: 1 addition & 1 deletion mytest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ if (NOT PHRQC_ENABLE_REGRESSION_TESTING)
foreach(test ${all_tests})
get_test_property(${test} LABELS test_labels)
if ("long_debug" IN_LIST test_labels OR "long_memcheck" IN_LIST test_labels)
message(STATUS "disabling ${test}" )
# message(STATUS "disabling ${test}" )
set_tests_properties(${test} PROPERTIES DISABLED TRUE)
endif()
endforeach()
Expand Down
6 changes: 3 additions & 3 deletions mytest/kinetic_rates_carbfix.out
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Reading input data for simulation 2.
LiCl = Li+ + Cl-
log_k -20 # (very) unsoluble phase with base cation and acid anion, permits to use HBr or LiOH as reactant
SELECTED_OUTPUT 1
file kinetic_rates.inc
file kinetic_rates_carbfix.inc
reset false
USER_PUNCH 1 # write out the pH's to equilibrate...
10 FOR i = 0 to 14 STEP 0.5
Expand Down Expand Up @@ -137,7 +137,7 @@ Reading input data for simulation 3.
10 graph_x -la("H+")
20 graph_sy log10(tot("Al"))

Reading data from kinetic_rates.inc ...
Reading data from kinetic_rates_carbfix.inc ...
USE solution 1
EQUILIBRIUM_PHASES 1
LiCl
Expand Down Expand Up @@ -5228,7 +5228,7 @@ Reading input data for simulation 33.
USER_GRAPH 1
-headings Albite_data
10 data 1.1, 2.05, 2.45, 2.9, 3, 3.5, 4.1, 5.1, 5.35, 5.47, 5.63, 5.63, 5.73, 7.73, 9.95, 9.95, 9.95, 10.6, 11.2, 11.55, 12.3
20 data -10.25, -10.55, -10.82, -11.25, -11.1, -11.4, -11.47, -11.82, -11.75, -11.65, -11.83, -11.92, -11.92, -11.83, -10.97, -11.05, -11.13, -10.95, -10.55, -10.6, -10.38 # Chou, L., Wollast, R., 1985. Steady-state kinetics and dissolution mechanisms of albite. Am. J. Sci. 285, 963�993.
20 data -10.25, -10.55, -10.82, -11.25, -11.1, -11.4, -11.47, -11.82, -11.75, -11.65, -11.83, -11.92, -11.92, -11.83, -10.97, -11.05, -11.13, -10.95, -10.55, -10.6, -10.38 # Chou, L., Wollast, R., 1985. Steady-state kinetics and dissolution mechanisms of albite. Am. J. Sci. 285, 963�993.
30 restore 10 : dim ph(21) : for i = 1 to step_no : read ph(i) : next i
40 restore 20 : dim lk(21) : for i = 1 to step_no : read lk(i) : next i
50 i = step_no : plot_xy ph(i), lk(i), line_width = 0, color = Black, y_axis = 2, symbol_size = 10, symbol = Circle
Expand Down
Loading

0 comments on commit 9cb289b

Please # to comment.