44 Commits

Author SHA1 Message Date
Charlton, Scott R
95dded5cf3 added missing CMakeLists.txt.in 2020-09-14 14:26:24 -07:00
Charlton, Scott R
03c40d1f51 added default build type 2020-09-14 14:12:59 -07:00
Charlton, Scott R
bf17f90d8e added newline 2020-09-11 19:44:28 -07:00
Charlton, Scott R
5c61108b60 added googletest and fixed some minor bugs 2020-08-25 12:27:15 -06:00
Darth Vader
a7e432f1c2 Merge commit 'ee7d1026e6dd8c5b372f9e24fb98111bd3c9fc16' 2020-01-28 17:57:19 +00:00
Darth Vader
52502bad19 Merge commit 'fae004f42baa79cb40476a1814ffbf1278871c5f' 2020-01-28 17:57:18 +00:00
Darth Vader
fd4937f7f4 Merge commit '7dade0c0a750da806f9de772e4b71086c66a18c6' 2020-01-28 17:57:17 +00:00
Darth Vader
83238996f0 Merge commit '795138ac720fcaf968a9aa18cad256244840057a' 2020-01-28 16:26:23 +00:00
Darth Vader
8e75719a72 Merge commit 'a1cf1e608ea822184059a4c93887c025f983bbfe' 2020-01-28 16:26:22 +00:00
Darth Vader
98e078a731 Merge commit '445c69457c0ee0864adc8214dd3e508569492c86' 2020-01-28 16:26:21 +00:00
Darth Vader
c264989022 Merge commit '46d70ad27917611742964d636306edd2244ddfee' 2020-01-28 16:15:54 +00:00
Darth Vader
c8b7e74b77 Merge commit '0163f911a4a33619d6e0960c24b6707bc27f8c61' 2020-01-28 16:15:53 +00:00
Darth Vader
50a6aac410 Merge commit '294e42f67e61325d5037fa48c6dc0390cea0608f' 2020-01-28 16:15:51 +00:00
Scott Charlton
9273992482 Added .gitlab-ci.yml 2020-01-18 23:42:45 -07:00
Scott Charlton
7a2e206ec3 Closes https://gitlab.cr.usgs.gov/coupled/IPhreeqc/issues/6 2019-12-02 09:30:18 -07:00
Scott Charlton
8daede105d Add 'examples/fortran/' from commit 'c5f2dba47264f3535411ca7510941efd282ffb9a'
git-subtree-dir: examples/fortran
git-subtree-mainline: badfc51b4fdc3f960243c69ff2707f952427f3ac
git-subtree-split: c5f2dba47264f3535411ca7510941efd282ffb9a
2018-07-31 16:54:58 -06:00
Scott Charlton
badfc51b4f Add 'examples/com/' from commit 'f90209d22ab165052a564c0ccdd346071d1fc803'
git-subtree-dir: examples/com
git-subtree-mainline: 6440359f1983c3200dc42fbcd59ed98edf376c7d
git-subtree-split: f90209d22ab165052a564c0ccdd346071d1fc803
2018-07-31 16:54:51 -06:00
Scott Charlton
6440359f19 Add 'examples/c/' from commit '8d5070c9f9dd15edb8734b9d06bc5f39773b05a1'
git-subtree-dir: examples/c
git-subtree-mainline: 7ecdd48257ae230c2569d3248a944d9cba6dc97e
git-subtree-split: 8d5070c9f9dd15edb8734b9d06bc5f39773b05a1
2018-07-31 16:54:46 -06:00
Scott R Charlton
37b7ab4f61 advect.f90 -> advect.F90
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9707 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-21 07:25:30 +00:00
Scott R Charlton
756abc03f6 added examples to cmake build;
changed IPhreeqc.f90.inc to use IPhreeqc

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9701 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-21 05:41:22 +00:00
Scott R Charlton
8da0fcf02e added com/README.txt
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9695 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-20 07:30:20 +00:00
Scott R Charlton
9ec2483d51 added com/README.txt
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9694 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-20 07:27:21 +00:00
Scott R Charlton
5da3656f8c fixed doc directory
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9692 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-20 07:08:18 +00:00
Scott R Charlton
a35a5af154 added example CMakeLists.txt
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9690 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-20 06:42:43 +00:00
Scott R Charlton
a61ab6664f added examples to CMake build
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9689 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-20 06:35:04 +00:00
Scott R Charlton
c5c6803c96 removed sln and proj from examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9688 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-20 05:52:28 +00:00
Scott R Charlton
ac7a518428 setting docdir back to default (w/o version)
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9687 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-20 05:48:06 +00:00
Scott R Charlton
fb9ec899cd added c++ examples to configure distribution
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7941 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-16 05:05:03 +00:00
Scott R Charlton
7e9e36af4e changed advect.c to acvect.cpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7938 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-16 00:12:43 +00:00
David L Parkhurst
02deb40ab3 Reorganized to put callback (and everything) in class.
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7918 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-12 20:40:32 +00:00
David L Parkhurst
7cb9b0ff1f added Makefile's for Linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7905 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-12 14:47:31 +00:00
David L Parkhurst
5d78a2962c C++ advection example
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7897 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-08 19:55:09 +00:00
David L Parkhurst
aaa8dfd905 Making new example for c++
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7894 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-08 17:29:18 +00:00
Scott R Charlton
15df602424 added some files
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5246 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-03-25 23:35:54 +00:00
Scott R Charlton
7aa606a511 removed c com fortran
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5244 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-03-25 23:26:48 +00:00
Scott R Charlton
ed93e89916 uncommented plot
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5239 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-03-25 22:19:26 +00:00
Scott R Charlton
90a04ef6d8 renamed revised2.py to Gypsum.py
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5237 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-03-25 22:14:33 +00:00
Scott R Charlton
af146750f8 final version
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5235 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-03-25 22:12:03 +00:00
Scott R Charlton
2b71fce3ed working on distribution
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5231 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-03-25 05:08:53 +00:00
Scott R Charlton
b956992ac4 removed tests
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5229 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-03-25 01:16:23 +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
2c4422593b # 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
80708d69fd removed Last from method names
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4390 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-05-13 02:57:20 +00:00
Scott R Charlton
e4d448c202 added simplified examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4320 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-04-28 05:50:47 +00:00