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

85 Commits

Author SHA1 Message Date
Scott R Charlton
89ec1151d6 fixed problem with formatting size_t 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8680 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-29 21:22:09 +00:00
Scott R Charlton
2174deb498 first pass @ removing std::cerr, std::cout, exit, stderr, stdout from R version. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8619 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-05 04:14:16 +00:00
Scott R Charlton
c29824b389 AccumulatedLines are now cleared after LoadDatabase/LoadDatabaseString/RunFile/RunString. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8583 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 05:55:57 +00:00
Scott R Charlton
7dc26ca743 Fixes error that occurs when using the DATABASE keyword with multiple calls RunAccumulated 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8574 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-19 06:26:46 +00:00
Scott R Charlton
cab196fcc5 passes all unit tests on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8506 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-20 07:19:05 +00:00
Scott R Charlton
700486f71c kinn fix 2014-02-18 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8501 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-19 01:24:38 +00:00
Scott R Charlton
dd008160f1 Added additional check to LoadDatabase 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8399 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-01-24 03:46:46 +00:00
Scott R Charlton
7df5a17e29 Added some additional std::map checking 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8288 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-12-06 05:19:34 +00:00
Scott R Charlton
435f2e2eb6 Added some assertions; optimized GetSelectedOutputValue; added some multi selected-output tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8285 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-12-05 23:59:31 +00:00
Scott R Charlton
0f93d71fc3 updated for SetCurrentSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8224 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-22 00:45:17 +00:00
Scott R Charlton
fef2ebd9db Added extra check in IPhreeqc::GetSelectedOutputValue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8195 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-16 06:26:16 +00:00
Scott R Charlton
7f03b8b72d removed old Warning for selected_output and user_print being redefined 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8159 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-02 01:12:18 +00:00
Scott R Charlton
81009f8570 added GetVersionString 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8153 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 04:20:31 +00:00
Scott R Charlton
9d18ae8811 fixed and added tests for SetSelectedOutputFileName 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8036 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-14 03:46:01 +00:00
Scott R Charlton
0cf335ee8c fixed for debug build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8035 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-14 00:09:41 +00:00
David L Parkhurst
f8988aa2c0 Added river turning into drain in IPhreeqc version of PHAST 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8034 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-13 21:18:23 +00:00
Scott R Charlton
070baebe94 updated for (Set)CurrentSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8028 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-13 05:52:16 +00:00
Scott R Charlton
f74d6d8fe7 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:39:13 +00:00
Scott R Charlton
7965206518 A few tests need to be updated. 
Merged revision(s) 7882-7988 from IPhreeqc/branches/multi_punch:
multi_punch branch

........
Added a Fortran callback.

Will try to revise so that the same callback works for Fortran and C.
........
Revised name to BasicFortran

Added methods for C call SetBasicCallback.

Need to check C side and documentation.
........


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7989 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 23:32:19 +00:00
Scott R Charlton
96931f4835 fixed for phreeqc3-multi-punch; 
passes all unit tests

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7979 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 05:03:26 +00:00
Scott R Charlton
c7a0836273 cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7968 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-27 05:27:58 +00:00
Scott R Charlton
2ae3e40889 changes req'd for multi_punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7967 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-27 05:07:46 +00:00
Scott R Charlton
a0db8567c1 updated database paths for running on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7953 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-23 04:58:59 +00:00
Scott R Charlton
9873bfef26 All tests passing on windows; before inverse change 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7952 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-23 04:46:35 +00:00
Scott R Charlton
a23e36491a minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7949 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-20 02:34:08 +00:00
Scott R Charlton
c6377ae656 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7947 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-20 02:30:14 +00:00
Scott R Charlton
2c65a6353e working on multi_punch tests for IPhreeqc 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7946 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-17 06:18:06 +00:00
Scott R Charlton
4221c4bdb8 updates for renaming SelectedOutput to CSelectedOutput 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7926 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:41:54 +00:00
Scott R Charlton
e8bcdd8c1f fixes compile error on linux; 
changes made for TestIPhreeqc::case2 

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7923 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:26:16 +00:00
Scott R Charlton
1a815501c0 all tests passing for one selected_output file; 
may still need additional tests for TestIPhreeqc case1 and case2

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7919 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 22:24:18 +00:00
David L Parkhurst
b11bb4a3e1 functions are fcn 
Added cookie to c callback.



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7895 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-08 19:53:31 +00:00
David L Parkhurst
9212e8f18d Fixed post-build in project 
Phreeqc.h was jacked up??? The has_infinite block did not end until the end of the file.

Made the arguments for the C callback double, double, const char *.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7888 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-07 17:01:30 +00:00
David L Parkhurst
dc6d21b5ae Revised name to BasicFortran 
Added methods for C call SetBasicCallback.

Need to check C side and documentation.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7884 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-05 20:53:54 +00:00
David L Parkhurst
21ca300721 Added a Fortran callback. 
Will try to revise so that the same callback works for Fortran and C.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7883 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-05 18:56:31 +00:00
Scott R Charlton
955b586120 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7706 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-10 23:10:46 +00:00
Scott R Charlton
03560cdf35 new threading mutex patch from tmishima@jcity.maeda.co.jp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7705 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-10 22:15:00 +00:00
Scott R Charlton
02e7db584b fixed buffer overwrite in fpunchf; 
updated unit tests for phreeqc3

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7132 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 07:31:46 +00:00
David L Parkhurst
2b15b22d4d Compiles, working on writing HDF file. 
probalem with root.scalar_names

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6870 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-08-15 19:49:03 +00:00
David L Parkhurst
2eff4a0a5f Runs, getting xyz file right, checking results. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6864 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-08-10 23:02:55 +00:00
David L Parkhurst
9fab6884aa Does initial conditions, but is really slow. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6814 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-24 22:35:37 +00:00
Scott R Charlton
d91607335b fixed for latest phreeqc3 (only TestIPhreeqcLib) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6778 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-13 00:32:01 +00:00
Scott R Charlton
12c28b7f96 Added GetSelectedOutputValue2 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6731 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-06 22:55:42 +00:00
Scott R Charlton
8a4c8426f3 fixed bug in GetSelectedOutputString (bad args); 
cleared SelectedOutputString for each run

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6156 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-02 01:29:19 +00:00
Scott R Charlton
d682cf5723 passing on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6091 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 23:24:52 +00:00
Scott R Charlton
2ee8c4203c error routines working on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6082 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 00:28:46 +00:00
Scott R Charlton
3d1ee8f9e5 added fortran Error; SelectedOutput methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6077 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-18 04:04:00 +00:00
Scott R Charlton
a69da2dd27 Error implementation w/o unit testing 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6068 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-13 04:22:16 +00:00
Scott R Charlton
401ed03156 added changes for use 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6045 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-12 00:01:23 +00:00
Scott R Charlton
9674406e59 windows log functions passed (w/ phreeqcpp -r 5966) except for (PHRQ_io.h -r 5990) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5991 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-05 23:07:20 +00:00
Scott R Charlton
b7b845adfd working on Dump/Output routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5951 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-28 22:58:01 +00:00