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

146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
David L Parkhurst
3a34995c8a Starting to work on next problems, arguments for RM_pass_data. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6804 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-20 23:03:08 +00:00
David L Parkhurst
abb8e82801 Checking in OpenMP pragmas in IPhreeqcLib.cpp. 
Working on Reaction_module, IPhreeqcPhast, and IPhreeqc interactions.

Runs through initial phreeqc calculation.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6800 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-20 00:20:16 +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
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
010f33b37b removed phreeqcpp/Phreeqc_class.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6736 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-06 23:54:04 +00:00
Scott R Charlton
e0a4cc067a Fixed typo 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6733 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-06 23:04:11 +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
Richard M Webb
b8c7004b6e shortened line to fit 72 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6667 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-06-13 23:55:12 +00:00
Richard M Webb
e9dfdfb62e changed comment char 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6666 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-06-13 23:54:02 +00:00
Scott R Charlton
ebb8ceda99 added additional FORTRAN wrappers for different External Procedure conventions 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6643 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-06-07 05:27:48 +00:00
Scott R Charlton
7c27e85d9d updated for latest IPhreeqc 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6641 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-06-07 00:21:55 +00:00
Scott R Charlton
0803930034 removed phreeqcpp/SolutionIsotopeList.[h,cxx] 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6363 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-05 03:38:11 +00:00
Scott R Charlton
34005181f1 added SScomp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6185 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-07 22:09:35 +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
c6d35c8bf1 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6106 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 05:31:57 +00:00
Scott R Charlton
612f35a5da working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6103 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 04:58:12 +00:00
Scott R Charlton
165d56bec4 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6100 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:57:52 +00:00
Scott R Charlton
2240e7b03a working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6099 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:49:33 +00:00
Scott R Charlton
594676ca33 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6098 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:46:10 +00:00
Scott R Charlton
dddf7fe2b5 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6097 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:42:47 +00:00
Scott R Charlton
293bbe0ff1 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6096 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:04:40 +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
fdcb31d93b added missing SetSelectedOutputStringOn 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6079 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-18 04:33:40 +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
0b16f6a237 added Use[h,cpp] to makfile 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6065 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-12 22:03:56 +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
9d9fcdc930 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6029 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 05:01:44 +00:00