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
278 Commits 6 Branches 4 Tags
Commit Graph

278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
7ae0e12a87 fixed f90 example 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8161 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-02 01:31:02 +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
6fe716a692 alphabetized libiphreeqc_la_SOURCES and added Version.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8154 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 06:10:29 +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
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
203a8bd67e working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8020 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 03:54:02 +00:00
Scott R Charlton
f6c3e998e6 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8019 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 03:43:35 +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
c12969725a added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8007 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:38:25 +00:00
Scott R Charlton
67ed0d1995 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8006 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:37:29 +00:00
Scott R Charlton
b392f96c73 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8005 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:35:59 +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
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
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
b69f9352da updates for multi_punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7928 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 22:06:57 +00:00
Scott R Charlton
71f7e7785f updates for multi_punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7927 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 22:01:41 +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
35cc8edceb renamed SelectedOutput to CSelectedOutput 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7925 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:30:41 +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
c111527fd1 updated thread.h to compile w/ VS2005 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7667 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-01 01:19:59 +00:00
Scott R Charlton
7c603854bd added patch from tmishima@jcity.maeda.co.jp for multi-threaded use 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7648 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-04-26 00:49:59 +00:00
Scott R Charlton
d0b0cfb72c sped up CErrorReporter<OS>::Clear(void) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7504 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-03-01 06:06:16 +00:00
David L Parkhurst
272ab08553 EndRow had extra loop on rows that was not needed. 
For many rows (400,000), it was unworkable before this fix.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7503 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-03-01 00:44:56 +00:00
Scott R Charlton
fa21a60a53 added library versioning code 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7446 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-02-07 01:27:06 +00:00
Scott R Charlton
5da7e08637 updated for resources 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7392 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-28 20:48:27 +00:00
Scott R Charlton
d1240dfe8d added missing header files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7364 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-23 21:29:29 +00:00
Scott R Charlton
b5a757fa3d added missing files for windows build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7363 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-23 20:58:45 +00:00
Scott R Charlton
cb45fd0d4b updated for phreeqc directory removal 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7346 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-22 21:20:16 +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
9692cd2e3a Switched to OpenMP. 
64-bit version does not link. Something about virtual void I think.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6889 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-08-20 17:02:03 +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