50 Commits

Author SHA1 Message Date
Charlton, Scott R
09619534e7
[iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN (#9) 2023-01-14 22:14:20 -07:00
Charlton, Scott R
20c11bc17e IPhreeqc_interface must be compiled first 2020-09-29 16:05:52 -06:00
Scott R Charlton
b1da32aa01 updated for common directory and optional string length argument
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10769 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-30 02:50:37 +00:00
Scott R Charlton
5de8fe87e9 updated SetBasicFortranCallback for IPhreeqc fortran module
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9714 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-22 00:30:04 +00:00
Scott R Charlton
a4ed1c9078 replaced IPhreeqc.f90.inc to USE IPhreeqc
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9702 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-21 06:15:16 +00:00
Scott R Charlton
a0ddc0a7ce added multi_punch example
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8225 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-22 00:58:25 +00:00
Scott R Charlton
6686cf481c formatting
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8213 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-19 04:57:47 +00:00
Scott R Charlton
ea0d5f0e6d renamed CurrentSelectedOutputUserNumber.c to SetCurrentSelectedOutputUserNumber.c
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8212 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-19 04:44:07 +00:00
Scott R Charlton
a594f0fbcd renamed CurrentSelectedOutputUserNumber.c to SetCurrentSelectedOutputUserNumber.c
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8211 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-19 04:43:18 +00:00
Scott R Charlton
bec88bbeae added example for CurrentSelectedOutputUserNumber
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8210 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-19 04:40:03 +00:00
Scott R Charlton
e5dcf9b9b0 updated toc for getversionstring; changed single apostrophe to double for fortran example.
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8162 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-02 01:40:47 +00:00
Scott R Charlton
5c52b2744f updated f90 version
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8158 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-02 01:09:12 +00:00
Scott R Charlton
f53118406b added doc examples for GetVersionString
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8156 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-01 06:43:24 +00:00
Scott R Charlton
f5bcccafcb 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
ca9a7a486e added multi example
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8026 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-12 04:54:10 +00:00
Scott R Charlton
c2e8112075 whitespace
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8022 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-09 22:08:42 +00:00
Scott R Charlton
05872a6340 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
3fa099261f minor changes for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8015 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 21:44:07 +00:00
Scott R Charlton
a61511a2fe renamed F90SetBasicCallback.f90 to F90SetBasicFortranCallback.f90
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8014 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 04:29:38 +00:00
Scott R Charlton
93ab13b89d added F90SetBasicCallback.f90
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8013 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 04:25:20 +00:00
Scott R Charlton
1fd4b81bf5 added missing headers for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8012 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 02:16:27 +00:00
Scott R Charlton
c30454c78f formatting
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8011 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 01:47:38 +00:00
Scott R Charlton
9bf00aa48a added SetBasicCallback example
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8010 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 01:45:34 +00:00
Scott R Charlton
d100ac9492 replaced IPhreeqc.vcproj with IPhreeqc.2005.vcproj
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6735 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-06 23:45:02 +00:00
Scott R Charlton
9952bb955f finished GetSeletectedOutputValue2
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6734 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-06 23:31:38 +00:00
Scott R Charlton
306e09c6cc 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
b4b4fc0288 updated examples for documentation
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6186 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-02-07 22:41:30 +00:00
Scott R Charlton
894d8531e5 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6108 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 05:37:04 +00:00
Scott R Charlton
23123e6883 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6107 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 05:35:41 +00:00
Scott R Charlton
1ce85992bc working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6105 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 05:16:28 +00:00
Scott R Charlton
5a2014c6b2 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6104 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 05:04:19 +00:00
Scott R Charlton
01bdb454be working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6102 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 04:51:34 +00:00
Scott R Charlton
f93d48d395 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6101 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 04:42:34 +00:00
Scott R Charlton
fb0ec4984f 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
2b8adbe34c fixed unchanged copy and paste
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6086 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-20 04:21:23 +00:00
Scott R Charlton
918541e7a0 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
Scott R Charlton
d5d37e65af 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
ef1e4a894b working on Dump/Output routines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5955 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-28 23:17:26 +00:00
Scott R Charlton
d31e8b0037 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
Scott R Charlton
eaf070d56b Updated Makefile; changed single-quotes to double-quotes since they didn't format correcly in html
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4463 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-24 23:08:45 +00:00
Scott R Charlton
5701f87232 got rid of some warnings
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4453 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-21 07:51:45 +00:00
Scott R Charlton
a0ac5895e9 changed ENDDO to END DO and ENDIF to END IF
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4452 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-21 07:33:33 +00:00
Scott R Charlton
770fea9d2f removed #
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4447 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-21 01:43:55 +00:00
Scott R Charlton
e1d81ae65c updated docs
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4433 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-20 06:04:05 +00:00
Scott R Charlton
9b3a5e3b03 updated docs
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4432 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-20 05:58:25 +00:00
Scott R Charlton
12ac80f2a7 # 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@4412 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-18 03:17:39 +00:00
Scott R Charlton
8cfffff789 added F90ClearAccumulatedLines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4410 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-17 23:44:32 +00:00
Scott R Charlton
8a0e427058 updated IPhreeqc.h for doxygen
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4401 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-15 01:08:08 +00:00
Scott R Charlton
d478c050a3 working on adding examples to doxygen
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4392 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-13 04:17:45 +00:00
Scott R Charlton
b7317dda11 working on adding examples to doxygen
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4391 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-13 04:00:46 +00:00