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

488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
2ca408ed31 updated for linux (added headers) 
added build dirs to ignore list

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6522 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-20 05:18:15 +00:00
Scott R Charlton
fbe3108bb0 removed Phreeqc_class.h from dependencies 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6521 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-20 05:01:32 +00:00
Scott R Charlton
74c97b0e76 removed dependencies Phreeqc.h and Parser.h from Utils.h 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6517 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-20 03:59:14 +00:00
Scott R Charlton
aa8047e134 minor formatting 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6516 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-20 03:57:31 +00:00
Scott R Charlton
a4d8672a6b made get_line and get_logical_line virtual 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6515 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-20 03:55:39 +00:00
Scott R Charlton
eace3df0fb removed Utils.h dependency 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6514 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-20 02:57:55 +00:00
Scott R Charlton
59016d1ced added GNUmakefile which rebuilds dependencies during each compile 
the dependencies are stored in each configurations .deps directory

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6513 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-20 01:43:57 +00:00
Scott R Charlton
3eb956bdf0 removed dependency on phrqtype.h by using a template for addPair 
removed unnecessary Phreeqc.h

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6512 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-19 22:19:46 +00:00
David L Parkhurst
3d2e4ae4be Removed Phreeqc_class.h. 
Replaced all PHREEQC_PTR, P_INSTANCE, p_instance1.

Now uses Phreeqc * phreeqc_ptr for Phreeqc cookies.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6509 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-19 18:35:14 +00:00
David L Parkhurst
8e0844ed26 Fixed memory all memory leaks from mytest. 
Modified ss_r to run on Windows.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6475 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-13 17:08:59 +00:00
David L Parkhurst
bf96306cba output file was closed before free_all, no messages appeared. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6466 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-12 18:10:01 +00:00
David L Parkhurst
9c1a63dc87 Bug with key in pitzer parameters. Needed type, in addition to ions to make the key unique. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6464 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-12 16:59:51 +00:00
Scott R Charlton
a718706e91 fixed string_duplicate leaks 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6461 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-11 23:08:29 +00:00
Scott R Charlton
67b089f8a6 changed ifdefs for string_duplicate 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6460 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-11 22:48:45 +00:00
Scott R Charlton
2f10f2e70d fix for level 4 warning level 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6447 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-11 04:13:02 +00:00
Scott R Charlton
495a220070 merged in http://internalbrr.cr.usgs.gov/svn_GW/phreeqcpp/branches/ErrorHandling 6269-6445 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6446 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-11 02:21:16 +00:00
Scott R Charlton
e972c511f0 trying to recover Phreeqc.h w/ history 
this should have been -r 6391

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6445 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-11 01:49:12 +00:00
Scott R Charlton
969e5df5f6 trying to recover Phreeqc.h w/ history 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6444 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-11 01:43:06 +00:00
Scott R Charlton
cce0fe2547 fix for level 4 warning level 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6437 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-11 00:00:13 +00:00
Scott R Charlton
07fdb2cb33 added memory cleanup code 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6395 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-10 04:14:27 +00:00
Scott R Charlton
4d8f789347 added memory cleanup code 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6394 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-10 04:13:11 +00:00
Scott R Charlton
ac861bde62 replaced WaitForSingleObject w/ PhreeqcIWait; 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6393 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-10 04:10:11 +00:00
Scott R Charlton
4309bd451a minor cleanup of reading code 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6392 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-10 04:08:00 +00:00
Scott R Charlton
6167acc9cb sped up pitz_param/sit_param reading; 
added memory debug code for string_duplicate

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6391 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-10 04:06:49 +00:00
Scott R Charlton
a512faafbe setup for ERROR_OSTREAM 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6364 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-05 03:38:52 +00:00
Scott R Charlton
ae27e8a374 added init code 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6361 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 20:44:17 +00:00
Scott R Charlton
ae7c893c88 added initialization code 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6360 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 05:07:46 +00:00
Scott R Charlton
6a92166384 const modifications 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6359 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 05:05:14 +00:00
Scott R Charlton
828eaf16d3 const modifications 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6358 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 05:04:41 +00:00
Scott R Charlton
0e640f45cf const modifications 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6357 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 04:54:37 +00:00
Scott R Charlton
733d093f49 const modifications 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6356 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 04:54:09 +00:00
Scott R Charlton
8e9a4e0c3e made istream_getc static; 
made some routines virtual;
added virtual getc method;

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6355 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 04:53:03 +00:00
Scott R Charlton
8ea8082fa4 added const version of Get_pp_assemblage_comps 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6353 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 00:07:42 +00:00
Scott R Charlton
7347290a28 const modifications 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6352 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 00:05:30 +00:00
Scott R Charlton
d2577f8b46 const modifications 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6351 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 00:04:52 +00:00
Scott R Charlton
82d4997468 const modifications 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6350 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 00:04:16 +00:00
Scott R Charlton
02460252f7 added const version of Get_SSs 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6349 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 00:03:43 +00:00
Scott R Charlton
0574952b9c added const version of Get_temps 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6348 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-04 00:03:10 +00:00
Scott R Charlton
33eabd03e3 SOLUTION_SPREAD 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6331 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-31 01:27:31 +00:00
Scott R Charlton
7c3f0b5baf changed implementation of trim_left trim_right and trim. 
see http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring

Note: some previous uses of trim were erroneous (see tokiso_unit) since it had to be used like this:
 s = trim(s);
can now be used like
 trim(s)


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6330 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 23:44:01 +00:00
Scott R Charlton
69711a425a made iso_defaults public and static 
This is really just 6324 without deleting Phreeqc.h and keeping the history. In order
to keep the history you need to do a reverse merge.

see http://stackoverflow.com/questions/2863028/recover-a-folder-or-file-in-tortoisesvn-whilst-also-retaining-all-history

answer attached:

Do a "reverse merge":
 1.Ensure that your working copy is updated to HEAD and completely clean (not strictly necessary, but always a good idea before trying to merge)
 2.Right click on the folder and select TortoiseSVN > Merge...
 3.Select "Merge a range of revisions" and hit "Next"
 4.The URL to merge from is the repo path for your current directory (ie. the one containing the deleted file)
 5.The revision range to merge is the revision in which you deleted the file (show log might help here)
 6.Be sure to select "Reverse merge"
 7.Hit "Next"
 8.All the default merge options should be sufficient, so hit "Merge"
 
The file should now be added and still retain all of its previous history.

Explanation:

This "rolls back" the revision containing the deletion, but adds the merge information to the directory properties. SVN can track the original file through this metadata. On the command line you would to do a backwards merge of the revision in which you deleted it:
svn merge -c -<revision-number> path/containing/file

Note the hyphen before the rev number (ie. a "negative" revision nunber).
 

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6328 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 22:36:01 +00:00
Scott R Charlton
96294247ac trying to fix loss of history with Phreeqc.h 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6327 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 22:24:25 +00:00
Scott R Charlton
c98ac9ac53 trying to fix loss of history with Phreeqc.h 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6326 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 22:14:49 +00:00
Scott R Charlton
c8c82a9942 resurrected Phreeqc.h; Don't know how it was deleted 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6325 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 22:04:19 +00:00
Scott R Charlton
3df08dd0f1 made iso_defaults public and static 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6324 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 21:49:57 +00:00
Scott R Charlton
1ad10142ab added serializing code for selected_output file name 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6322 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 03:55:12 +00:00
Scott R Charlton
54d517d477 added const versions 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6319 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 02:54:35 +00:00
Scott R Charlton
4f70c3947b added const versions 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6316 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-30 00:17:31 +00:00
Scott R Charlton
4b5f269224 updated to use windows malloc debug 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6309 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-29 04:22:37 +00:00
Scott R Charlton
c892ae27f9 BasicObj 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6308 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-03-29 02:47:43 +00:00