max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
143 Commits 6 Branches 4 Tags
Commit Graph

143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
ed7cc3c69d Squashed 'phreeqc3-examples/' changes from e977363d..1201d371 
1201d371 added all examples
35636414 use cmake for valgrind tests
49d67912 [webmod] updated date
d2ea5947 [phreeqc3] updated image location
f464c3c4 saved as utf-8
a9303d18 [phreeqci] Testing subtree merges
6d4acba1 [phreeqc3] Testing subtree merges
a09a24b2 Added .gitlab-ci.yml
e6e3f30a checking in ex20_debug (added precision) and results
4128d5d4 another try for ex20_debug

git-subtree-dir: phreeqc3-examples
git-subtree-split: 1201d371a220072c5f33f01210f7be7c75ed1866
 2021-10-30 22:54:23 +00:00
David Parkhurst
e977363da4 Tony's changes to ex21 2018-03-06 15:14:26 -07:00
Scott R Charlton
9d86ee1b8c moved concrete-2005 and renamed to trunk 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12922 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-11-08 23:25:48 +00:00
David L Parkhurst
87e5122905 Before Ampere, check in all test cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12842 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-09-25 22:18:10 +00:00
David L Parkhurst
5ddc4bd307 checing in all test cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12523 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-08 17:20:41 +00:00
David L Parkhurst
7125f9e7a5 Commented out check for null. Not sure how it works for Clogging, will investigate on Linux. 
Checking in new SC values!


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12447 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-17 19:45:26 +00:00
David L Parkhurst
bce93ef42b Maybe will run on Linux? 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12391 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-09 20:58:49 +00:00
David L Parkhurst
43ec712688 Merged revision(s) 10984-12389 from phreeqc3/trunk/examples: 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12390 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-09 20:46:56 +00:00
David L Parkhurst
574b22159d Current example? 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12384 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-09 15:52:29 +00:00
David L Parkhurst
64f2517d03 Running tester on Windows. 
It's been a while since the test cases have been checked in.
With lobo gone, will do primary checks on Windows.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12376 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-08 20:26:12 +00:00
David L Parkhurst
7f222cb898 cerussite, sys_kin test case 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11153 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-05-04 20:38:31 +00:00
David L Parkhurst
cf64250963 two changes for vm_tc, always calc_delta_v 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10929 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-09 17:35:12 +00:00
David L Parkhurst
d3ead02f1d before changing vm_tc, units for Ionic strength 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10928 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-09 17:03:09 +00:00
David L Parkhurst
a98befde82 new sc values 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10725 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-21 00:17:41 +00:00
David L Parkhurst
37580c45e5 reran test cases. Diffs caused by CO2 changes in database 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10233 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-10 22:10:13 +00:00
David L Parkhurst
8d69f1b539 rerun of test cases, added missing to Makefile 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10042 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-05 21:31:30 +00:00
David L Parkhurst
559b6272ed Change in ETHETAS calculation 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9801 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-06-09 13:38:49 +00:00
Scott R Charlton
1ae8371b64 added missing co2.tsv; added txt to files on windows 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9746 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-29 23:51:12 +00:00
Scott R Charlton
7282904f68 added missing co2.tsv to EXTRA_DIST 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9739 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-29 05:42:35 +00:00
Scott R Charlton
28e1a66ee4 all tests pass if allowed to run to completion under vs2012(ClrRelease) 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9734 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-28 20:26:31 +00:00
Scott R Charlton
333f85a321 added cmake tests for ex1-ex22 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9732 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-27 23:51:55 +00:00
David L Parkhurst
5d0110a8d2 9627 output files 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9630 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-09 18:34:15 +00:00
Scott R Charlton
42af3ac27e added CMakeLists.txt to dist 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/cmake@9180 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-14 21:51:20 +00:00
Scott R Charlton
e0a24c4172 updated install locations 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/cmake@9177 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-13 23:01:21 +00:00
Scott R Charlton
50641eeb5b install targets 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/cmake@9172 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-09 06:30:47 +00:00
David L Parkhurst
40f52aceb8 latest test cases, minor changes except for .pat file, which were wrong 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9031 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-11-03 17:40:19 +00:00
David L Parkhurst
46d107425e Added andsurfcomplex4, USER_PUNCH was redefined without commands, caused a segv. 
Set commands to NULL in read_user_punch.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8957 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-09-24 16:50:02 +00:00
David L Parkhurst
6accca7fd3 ready for next release 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8896 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-31 15:25:11 +00:00
David L Parkhurst
abc4a9fb23 slight changes with last run 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8852 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-16 14:46:13 +00:00
David L Parkhurst
d5ef6baea5 after Valgrind fixes 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8848 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-15 22:39:56 +00:00
David L Parkhurst
9caa25da62 latest, fixed bug from R with relative dielectric 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8756 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-05-20 20:42:32 +00:00
David L Parkhurst
e2f503b829 no negative dump, fix for sit redefinition 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8628 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-08 15:30:47 +00:00
David L Parkhurst
870b63952a latest version 31Jan2014 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8417 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-01-31 17:48:00 +00:00
David L Parkhurst
bad57324f8 Tony changes for special symbols 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8370 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-01-14 16:38:08 +00:00
David L Parkhurst
dcba67604c Tony's vm revisions, phreeqc.dat gfw for N redox states 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8204 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-18 20:58:12 +00:00
Scott R Charlton
27ab00059d removed database keyword from ex12a 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8176 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-06 02:38:22 +00:00
David L Parkhurst
33a975b539 20131017, latest output, revised mgcl2so4_pz for convergence 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8095 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-10-17 18:42:49 +00:00
David L Parkhurst
860aebb6de with multi_punch finalized 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8002 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-30 19:04:23 +00:00
David L Parkhurst
cbc792e0f7 makefile's to run test cases 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7993 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-29 16:49:03 +00:00
David L Parkhurst
d11e3bb683 Added -high_precision to PRINT for USER_PRINT. 
Made dump_cpp always high precision.

Needed to modify ex12a to be consistent with new SELECTED_OUTPUT -active;
SELECTED_OUTPUT -user_print now has different meaning.
No longer set global high_precision from SELECTED_OUTPUT; only SelectedOutput instance value

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7992 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-29 16:43:04 +00:00
David L Parkhurst
99785bdb26 running with F1 and F2 Pitzer, changed fugacity statement 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7972 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-27 18:50:43 +00:00
David L Parkhurst
81a60b4b71 tony has new phreeqc.dat and Pabalan.dat coming 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7961 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-26 20:19:23 +00:00
David L Parkhurst
5717cf2393 order of heading did not match order of graph_y 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7955 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-23 14:59:26 +00:00
David L Parkhurst
e0ccb49828 Using latest pitzer.dat. Some files replaced with Linux files 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7917 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 18:41:20 +00:00
David L Parkhurst
f47adf21f2 added explanation for SI**, many changes. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7915 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 17:42:09 +00:00
David L Parkhurst
73e845d629 latest test with change in Pitzer pressure, -pressure in SOLUTION_RAW, runs modify_test, has error 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7873 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-01 18:20:33 +00:00
David L Parkhurst
92de4976da latest tests 7837; some Linux warnings in src 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7838 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-07-17 21:52:44 +00:00
David L Parkhurst
77b232942a latest test cases 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7757 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-06-03 23:36:10 +00:00
David L Parkhurst
b7747a663b latest examples 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7746 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-30 22:53:00 +00:00
David L Parkhurst
2c9cad2010 Tony changes for pr_in 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7742 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-29 20:21:11 +00:00