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

1300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
867a6eeb73 updated unit tests for jenkins 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10483 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-07 05:26:07 +00:00
Scott R Charlton
4262024a1b removed debugging 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10478 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-05 02:15:31 +00:00
Scott R Charlton
63405c14fa working on jenkins build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10477 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-05 00:26:34 +00:00
Scott R Charlton
7d92e2e8f4 turn echo on 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10476 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-05 00:12:57 +00:00
Scott R Charlton
4033246d1e now using linux dist.sh 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10475 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-04 23:45:45 +00:00
Scott R Charlton
298fcda3bb working on jenkins build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10474 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-04 23:18:21 +00:00
Scott R Charlton
fa232e6eb3 working on jenkins build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10473 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-04 22:53:31 +00:00
David L Parkhurst
a51e899fdc Activated argument for number of threads. 
Typo in print.
Revised ASSERT to avoid asserting with std::cerr.


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10364 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-10-08 15:20:42 +00:00
David L Parkhurst
bbbb610b16 Activated argument for number of threads. 
Typo in print.
Revised ASSERT to avoid asserting with std::cerr.


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10364 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-10-08 15:20:42 +00:00
Scott R Charlton
12402a92ab updated Description for cran submittal 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10323 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-30 21:35:41 +00:00
Scott R Charlton
6cb0d3fd08 updated for cran submittal 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10322 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-30 21:04:49 +00:00
Scott R Charlton
efc0591a59 updated for common/PhreeqcKeywords reorg 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10309 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-25 06:18:12 +00:00
Scott R Charlton
0ac279c652 added additional Get test to TestGetSet 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10284 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-18 06:17:09 +00:00
Scott R Charlton
092c766abd commented out save from module 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10237 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-11 00:42:47 +00:00
Scott R Charlton
6512928772 commented out save from module 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10237 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-11 00:42:47 +00:00
Richard M Webb
662293d37f Appears that variables are not initialized with each call, and previous values are persistent. 
Set all true/false variables to 0 to make sure they are initialized.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10231 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-10 17:54:45 +00:00
Richard M Webb
21ed14bb6c Appears that variables are not initialized with each call, and previous values are persistent. 
Set all true/false variables to 0 to make sure they are initialized.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10231 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-10 17:54:45 +00:00
David L Parkhurst
ebe582ad89 Updates for CO2 and CH4 in phreeqc.dat and CH4 in pitzer.dat. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10176 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-27 15:20:57 +00:00
Scott R Charlton
3cfce822e4 added safe_close to log_ostream; fixed segv for selected output 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10121 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-20 00:29:23 +00:00
Scott R Charlton
14c544ea91 added safe_close to log_ostream; fixed segv for selected output 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10121 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-20 00:29:23 +00:00
Scott R Charlton
c365511480 added reqd changes to compile on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10112 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-19 06:06:08 +00:00
Scott R Charlton
ebff3cc584 added reqd changes to compile on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10112 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-19 06:06:08 +00:00
Scott R Charlton
10288a2430 added common to VPATH 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10111 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-19 06:05:30 +00:00
David L Parkhurst
b20b71f383 Added public when inheriting from std::exception (IPhreeqcStop and PhreeqcRMStop). 
Rewrote dump to parallelized the dump_raw part.

More zlib changes for PhreeqcRM project.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10107 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-19 00:32:49 +00:00
David L Parkhurst
c1008adc1b Added public when inheriting from std::exception (IPhreeqcStop and PhreeqcRMStop). 
Rewrote dump to parallelized the dump_raw part.

More zlib changes for PhreeqcRM project.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10107 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-19 00:32:49 +00:00
David L Parkhurst
4a4d22f675 safe closed streams in IPhreeqc; set subsystem to console in order to stop after non-debug; set worker phrq_io error_ostream to std:cerr. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10089 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 22:41:27 +00:00
David L Parkhurst
9fbd4da815 safe closed streams in IPhreeqc; set subsystem to console in order to stop after non-debug; set worker phrq_io error_ostream to std:cerr. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10089 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 22:41:27 +00:00
David L Parkhurst
65e8272554 Catch std::exception 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10087 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 13:11:41 +00:00
David L Parkhurst
f4815e2205 Catch std::exception 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10087 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 13:11:41 +00:00
David L Parkhurst
33aa0bc2cc Add errprt in steady flow. 
Some changes in solution files, 
IPhreeqc catch std::exception and print meaning.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10086 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 13:05:39 +00:00
David L Parkhurst
83de1657dc Add errprt in steady flow. 
Some changes in solution files, 
IPhreeqc catch std::exception and print meaning.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10086 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 13:05:39 +00:00
Scott R Charlton
f0a6fb578e updated for module 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10064 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 04:58:22 +00:00
Scott R Charlton
73db0d827e added common to include 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10063 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 04:45:55 +00:00
Scott R Charlton
4866ae0beb added common to include 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10062 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 04:34:56 +00:00
Scott R Charlton
be73d77965 added common to include 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10059 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 02:50:07 +00:00
Scott R Charlton
97c36acb6f commmon -> common 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10058 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 02:38:22 +00:00
Scott R Charlton
24b9989c50 commmon -> common 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10058 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 02:38:22 +00:00
Scott R Charlton
fc8e97a89c added common directory for Parser/PHRQ_base/PHRQ_io/phrqtype/Utils 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10056 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 02:29:22 +00:00
Scott R Charlton
fb33ab1e95 added common directory for Parser/PHRQ_base/PHRQ_io/phrqtype/Utils 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10056 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 02:29:22 +00:00
David L Parkhurst
e4bc7b8eb9 MINTEQ version 4 has wrong sign for delta H of NH3. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10038 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-03 13:41:50 +00:00
Scott R Charlton
5ecc9e5b5b added minsizerel and relwithdebinfo to static runtime lib list 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10005 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-17 06:22:40 +00:00
Scott R Charlton
fb0b523d88 automated build for Kinniburgh 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10004 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-17 06:20:39 +00:00
Scott R Charlton
36a346e44a needed full path 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10003 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-17 00:22:57 +00:00
Scott R Charlton
f326e46b53 enabled dashboard only if CTestConfig.cmake exists 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10002 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-16 22:43:15 +00:00
Scott R Charlton
6a6d3d7cd4 added build with a static runtime option 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9999 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-16 05:05:39 +00:00
David L Parkhurst
a245bdbf84 Tony's latest CO2. 
looks like Hebach has multiple roots, and
ternary looks off.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9988 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-13 20:17:56 +00:00
Scott R Charlton
516d2b0468 added reqd CTestConfig.cmake for ctest builds 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9926 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-02 21:43:11 +00:00
David L Parkhurst
f90209d22a 3 new Excel example files and a README describing them. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc/trunk@9890 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-06-25 16:07:27 +00:00
Scott R Charlton
e0096c1221 added CTest and CPack to automate testing and package building 
added build configuration for vs2008-64 on windows

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9887 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-06-25 04:23:27 +00:00
Scott R Charlton
454c2cfc75 added missing ) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9791 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-06-06 00:43:28 +00:00