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

1630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
261bc0113a fixed p_instance bug for raw and ppdump 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4650 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-07-16 01:04:30 +00:00
Scott R Charlton
778c7b05bc changed p_instance to p_instance1 hiding variables 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4642 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-07-15 23:27:37 +00:00
Scott R Charlton
ba762e6dde fixed hiding variables 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4641 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-07-15 23:11:54 +00:00
Scott R Charlton
bf1e9bfff6 fixed hiding variables 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4640 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-07-15 21:53:09 +00:00
David L Parkhurst
1e9f6e5760 Fixed up charting changes for class version. 
Left SKIPped 2 digit exponents in mainsubs.c.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4595 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-06-30 00:39:34 +00:00
David L Parkhurst
98e6f469b7 Modified class version to detect end of USER_GRAPH thread. 
Seems to work. Scott's way failed the first couple times I ran it, but don't really know why. 

ran fiona with all configurations (run without debugging).

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4559 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-06-18 21:19:44 +00:00
Scott R Charlton
24f5a295a7 Added code to allow phreeqc_instance to stay in scope until the thread count drops to 8. 
Don't know if this will always work.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4555 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-06-18 02:19:00 +00:00
David L Parkhurst
31eafb92e7 Sortof works on class clr version, but need to be able to detect when chart thread ends. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4553 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-06-18 00:04:28 +00:00
David L Parkhurst
0b4092e13b Still need to work on Form1 to pass a phreeqc instance. 
Removed Void definition in p2c, and changed all references to just void.

Moved all structures, globals, and prototypes to global_structures.h, global.h, and Phreeqc.h.

Initialized chart variables in Phreeqc.cpp.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4552 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-06-17 20:17:08 +00:00
Scott R Charlton
5fa682d846 initialized VAR 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4474 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-28 00:08:43 +00:00
Scott R Charlton
1874da5f1d ListComponents is now cached 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4464 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-25 00:47:02 +00:00
Scott R Charlton
4480134e5d updated include files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4450 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-21 05:09:18 +00:00
Scott R Charlton
556b588e64 removed UnLoadDatabase from public API 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4449 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-21 05:01:07 +00:00
Scott R Charlton
f8f24e1c78 Added AddWarning AddError C/Fortran methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4439 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-20 18:49:08 +00:00
Scott R Charlton
cf6d8d2eaf added open_output_files method 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4429 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-20 01:30:47 +00:00
Scott R Charlton
7427c34aa1 renamed DLL_EXPORT to IPQ_DLL_EXPORT 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4420 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-18 05:07:56 +00:00
Scott R Charlton
c30ed6369a resorted renamed methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4413 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-18 04:35:20 +00:00
Scott R Charlton
67f49a29c0 # IPQ_DLL_EXPORT int GetDumpOn(int id); 
#	IPQ_DLL_EXPORT int         GetDumpFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetDumpOn(int id, int dump_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetDumpFileOn(int id, int dump_on);
s/etDumpOn/etDumpFileOn/g
s/etdumpon/etdumpfileon/g
s/ETDUMPON/ETDUMPFILEON/g
#	IPQ_DLL_EXPORT int         GetErrorOn(int id);
#	IPQ_DLL_EXPORT int         GetErrorFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetErrorOn(int id, int error_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetErrorFileOn(int id, int error_on);
s/etErrorOn/etErrorFileOn/g
s/eterroron/eterrorfileon/g
s/ETERRORON/ETERRORFILEON/g
#	IPQ_DLL_EXPORT int         GetLogOn(int id);
#	IPQ_DLL_EXPORT int         GetLogFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetLogOn(int id, int log_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetLogFileOn(int id, int log_on);
s/etLogOn/etLogFileOn/g
s/etlogon/etlogfileon/g
s/ETLOGON/ETLOGFILEON/g
#	IPQ_DLL_EXPORT int         GetOutputOn(int id);
#	IPQ_DLL_EXPORT int         GetOutputFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetOutputOn(int id, int output_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetOutputFileOn(int id, int output_on);
s/etOutputOn/etOutputFileOn/g
s/etoutputon/etoutputfileon/g
s/ETOUTPUTON/ETOUTPUTFILEON/g
#	IPQ_DLL_EXPORT int         GetSelectedOutputOn(int id);
#	IPQ_DLL_EXPORT int         GetSelectedOutputFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetSelectedOutputOn(int id, int sel_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetSelectedOutputFileOn(int id, int sel_on);
s/etSelectedOutputOn/etSelectedOutputFileOn/g
s/etselectedoutputon/etselectedoutputfileon/g
s/ETSELECTEDOUTPUTON/ETSELECTEDOUTPUTFILEON/g
#	IPQ_DLL_EXPORT const char* GetDumpLine(int id, int n);
#	IPQ_DLL_EXPORT const char* GetDumpStringLine(int id, int n);
#	IPQ_DLL_EXPORT int         GetDumpLineCount(int id);
#	IPQ_DLL_EXPORT int         GetDumpStringLineCount(int id);
s/GetDumpLine/GetDumpStringLine/g
s/getdumpline/getdumpstringline/g
s/GETDUMPLINE/GETDUMPSTRINGLINE/g
#	IPQ_DLL_EXPORT const char* GetErrorLine(int id, int n);
#	IPQ_DLL_EXPORT const char* GetErrorStringLine(int id, int n);
#	IPQ_DLL_EXPORT int         GetErrorLineCount(int id);
#	IPQ_DLL_EXPORT int         GetErrorStringLineCount(int id);
s/GetErrorLine/GetErrorStringLine/g
s/geterrorline/geterrorstringline/g
s/GETERRORLINE/GETERRORSTRINGLINE/g
#	IPQ_DLL_EXPORT const char* GetWarningLine(int id, int n);
#	IPQ_DLL_EXPORT const char* GetWarningStringLine(int id, int n);
#	IPQ_DLL_EXPORT int         GetWarningLineCount(int id);
#	IPQ_DLL_EXPORT int         GetWarningStringLineCount(int id);
s/GetWarningLine/GetWarningStringLine/g
s/getwarningline/getwarningstringline/g
s/GETWARNINGLINE/GETWARNINGSTRINGLINE/g
#	IPQ_DLL_EXPORT void        OutputError(int id);
#	IPQ_DLL_EXPORT void        OutputErrorString(int id);
s/OutputError/OutputErrorString/g
s/outputerror/outputerrorstring/g
s/OUTPUTERROR/OUTPUTERRORSTRING/g
#	IPQ_DLL_EXPORT void        OutputLines(int id);
#	IPQ_DLL_EXPORT void        OutputAccumulatedLines(int id);
s/OutputLines/OutputAccumulatedLines/g
s/outputlines/outputaccumulatedlines/g
s/OUTPUTLINES/OUTPUTACCUMULATEDLINES/g
#	IPQ_DLL_EXPORT void        OutputWarning(int id);
#	IPQ_DLL_EXPORT void        OutputWarningString(int id);
s/OutputWarning/OutputWarningString/g
s/outputwarning/outputwarningstring/g
s/OUTPUTWARNING/OUTPUTWARNINGSTRING/g


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4411 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-18 01:59:33 +00:00
Scott R Charlton
caa9bd83ca alphabetized src/IPhreeqcLib.cpp; added ClearAccumulatedLines routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4408 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-17 21:59:43 +00:00
Scott R Charlton
4c0e1fbdff changed to avoid warnings from intel c++ compiler 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4395 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 04:23:01 +00:00
Scott R Charlton
5b8e7fdfbd added output_message prototype to output.h 
removed prototype from phreeqcpp/Phreeqc.h and phreeqcpp/phreeqc/print.c

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4388 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 00:19:31 +00:00
Scott R Charlton
e1b52e15f2 reworking output_message prototype 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4386 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-12 23:40:05 +00:00
David L Parkhurst
09bf8787f8 deleted unused variables sit_remove_unstable_phases and pitzer_remove_unstable_phases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4380 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 22:48:52 +00:00
Scott R Charlton
ed8ca4aedd All tests compile in all configurations 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4357 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-10 06:12:42 +00:00
Scott R Charlton
c3c27d34d8 working on fortran interfaces 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4349 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 06:48:20 +00:00
Scott R Charlton
4a9fdcfffb added KIND= to fortran wrappers 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4348 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 03:18:32 +00:00
Scott R Charlton
2f1b9f0d90 Added some additional error handling for GetDumpString; 
Changed return value for UnLoadDatabase.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4345 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 01:31:08 +00:00
Scott R Charlton
166750a340 Changed error messages 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4343 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-05 21:25:06 +00:00
Scott R Charlton
0fc11d724b Renamed GetLastErrorString to GetErrorString 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4339 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-04 23:36:21 +00:00
Scott R Charlton
51ee087d84 removed SAX header files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4329 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-03 22:34:37 +00:00
Scott R Charlton
272f661a96 removed libtool versioning for now 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4328 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-03 22:23:43 +00:00
Scott R Charlton
1f20f19a80 working on library versioning 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4327 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-03 22:19:55 +00:00
Scott R Charlton
4940d97f42 combined src/Makefile.am src/phreeqcpp/Makefile.am src/phreecpp/phreeqc/Makefile.am into one file 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4318 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-27 22:26:25 +00:00
Scott R Charlton
6745855c70 combined src/Makefile.am src/phreeqcpp/Makefile.am src/phreecpp/phreeqc/Makefile.am into one file 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4316 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-27 22:25:21 +00:00
Scott R Charlton
0713b95e00 working on autotools 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4307 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-27 03:20:38 +00:00
Scott R Charlton
cba7d11b4c modified Makefile.am's to handle each src dir independently 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4299 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-23 10:42:07 +00:00
Scott R Charlton
d8ed021b21 modified Makefile.am's to handle each src dir independently 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4298 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-23 05:21:21 +00:00
Scott R Charlton
e3888e1f0c added newline at end of files 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4296 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-22 22:13:47 +00:00
Scott R Charlton
1ba5b0dcfa added newline al end of files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4293 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-22 21:00:35 +00:00
Scott R Charlton
e1c4814d96 replaced malloc.h with stdlib.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4291 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-22 20:39:16 +00:00
Scott R Charlton
0833d79ec1 changed svn:eol-style to native for many files 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4276 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-21 05:29:27 +00:00
Scott R Charlton
b522a268b2 changed svn:eol-style to native for many files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4276 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-21 05:29:27 +00:00
Scott R Charlton
b90695455a working on autotools 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4273 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-21 04:49:32 +00:00
Scott R Charlton
b51c3bf7d6 removed debugging code 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4272 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-21 00:17:20 +00:00
Scott R Charlton
0a2feb4ad1 working on configure script and testing on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4271 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-20 23:30:04 +00:00
Scott R Charlton
74589b4d48 Added AC_F77_WRAPPERS handling 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4262 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-16 06:56:42 +00:00
Scott R Charlton
7941ba5cf5 still working on autotools integration 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4261 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-16 06:24:43 +00:00
Scott R Charlton
0527e27f64 working on autotools 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4260 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-15 06:47:05 +00:00
Scott R Charlton
156ceae299 working on autotools integration 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4259 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-15 03:36:24 +00:00
Scott R Charlton
459c77562a added missing fortran routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4257 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-14 23:07:01 +00:00