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
1,856 Commits 6 Branches 4 Tags
Commit Graph

38 Commits

Author SHA1 Message Date
Charlton, Scott R
0b0fced395 added src/phreeqcpp/common/PHRQ_exports.h 2020-09-15 20:29:41 -06:00
Charlton, Scott R
dd058e3bec implemented Get/SetErrorOn 2020-08-25 12:17:54 -06:00
Scott R Charlton
ca5e069a50 Closes #1 2018-08-02 23:18:10 -06:00
David Parkhurst
cf35bf3bf1 fixed some bugs in the reaction lists and got to the point that data is now all available in the phreeqcrm object once FindComponents is called. 2018-08-01 21:38:39 -06:00
David Parkhurst
e8ae8322eb gammas finished, working on reactants 2018-08-01 21:32:10 -06: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
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
6c199ffc46 len=l for callback fortran string. 
Made basic callback string a "const" in 8 places.


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9463 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-02 22:59:33 +00:00
David L Parkhurst
81d91ff357 length argument needed for callback. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9435 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-30 18:38:56 +00:00
David L Parkhurst
b66d8cf775 Working on IPhreeqc Basic callback. Compiles with ISO_C_BINDING, but may need some more debugging. 
Need to merge this change with PhreeqcRM-trunk.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9424 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-27 22:03:36 +00:00
Scott R Charlton
6a4760abd6 changed all fortran string length parameters to be size_t 
simplified fortran wrappers for windows


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9015 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-10-29 01:59:37 +00:00
Scott R Charlton
b06370674a fixed problem with formatting size_t 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8683 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-29 21:38:45 +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
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
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
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
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
165b30e7ba changed selected.id.out to selected_n.id.out 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8021 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 04:37:05 +00:00
Scott R Charlton
f75c09eb6c updated for new multi selected output files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8016 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 23:22:12 +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
f08689c230 updated some documentation for multi-punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7975 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 04:57:23 +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
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
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
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
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
2e463d6f79 updated for doxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6755 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-10 02:30:37 +00:00
Scott R Charlton
6b60e9d7cd fixed for doxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6754 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-10 02:23:35 +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
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
4490d97970 getting rid of include driectory to avoid duplicate header files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 01:18:11 +00:00