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

33 Commits

Author SHA1 Message Date
David L Parkhurst
d850641336 mpi.h needs to be defined first because of a conflict with stdio (SEEK_SET ifdef). 
output.h is needed for NameDouble mpi version.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3886 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2009-12-09 17:35:19 +00:00
David L Parkhurst
65ff0a9456 Fixed Makefile on Linux to make class version. 
Added eol and other changes for linux.

Had statics in ReadClass.cxx, removed.

Problems with .dmp files. May be because of statics.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3879 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2009-12-08 23:58:06 +00:00
David L Parkhurst
3131740cfb Compiles as class, debug, and Release. 
Requires recompilation of the entire solution for some reason.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3878 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2009-12-08 22:12:42 +00:00
David L Parkhurst
9f4eefd214 Made all the changes to add phreeqc pointer as argument to 
Phreeqcpp class methods.

Still compiles on Debug and Release, but problem with
phrq_malloc in cvdense and cvode.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3876 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2009-12-08 18:09:39 +00:00
David L Parkhurst
2b76f04a8b Cleaned up header files to remove unnecessary includes of .h files. Moved includes to source code where possible. 
Moved some methods for .h to source files to avoid need for includes.

Debug and Release compile. 

Still need to get class version working. 

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3868 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2009-12-07 19:49:38 +00:00
David L Parkhurst
e65ab2ea73 cleaned up storagebin headers. 
cleaned up ssassemblage.h headers.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3867 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2009-12-04 23:30:03 +00:00
David L Parkhurst
cefe071f17 Reindented, fixed errors, ran test cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3176 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2008-10-31 19:09:45 +00:00
David L Parkhurst
3313c814a9 Ran indent program on phreeqcpp 
indent -bli0 -i4 -ts4 -npcs -nbc *.cxx




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3168 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2008-10-31 15:19:39 +00:00
David L Parkhurst
8d475282bf Added read_raw_keyword. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2271 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2007-09-20 19:09:38 +00:00
David L Parkhurst
e3859a08c3 reordering mpi.h 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2189 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2007-08-28 20:45:29 +00:00
David L Parkhurst
37b1add946 Ifdef'd ORCHESTRA. 
Added lines at end of files.

Ran test cases, a few had changes from format and Tony.





git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2182 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2007-08-16 19:49:38 +00:00
David L Parkhurst
7ab1e21ce7 Works with reaction calculation of pure phase equilibrium. 
Worked out relation between phreeqc components H,O,charge and Orchestra H+, e-, H2O.

It's a lot of code and still have not implemented SURFACE, EXCHANGE, GAS_PHASE,

much les KINETICS.

Convergence problem when including pyrite.

Also have REACTION (REQCTION_TEMP?);

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2181 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2007-08-16 18:51:35 +00:00
David L Parkhurst
7830f46d8d Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2057 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2007-05-30 23:43:59 +00:00
David L Parkhurst
2b442eef30 git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1723 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2007-01-30 01:34:18 +00:00
David L Parkhurst
93a7759e1b Beginning to revise cpp classes. 
Have worked on mixing solutions.

Roughed in mixing Exchange.h



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1722 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2007-01-30 01:05:44 +00:00
David L Parkhurst
eb5b95110d Stray debug print removed from StorageBin. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1426 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-11-01 20:03:05 +00:00
David L Parkhurst
4230069264 fixed warn again. 
fixed error when no doubles sent in message.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1422 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-11-01 16:00:47 +00:00
David L Parkhurst
309d3d7bee Fixed cast warnings in c++ 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-07-07 21:27:45 +00:00
David L Parkhurst
382075cc6a Couple changes for exchange mixing 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@945 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-05-18 16:15:04 +00:00
Scott R Charlton
1e28de647f changed automatic arrays to dynamic arrays 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@924 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-05-16 01:10:25 +00:00
David L Parkhurst
6df20749e2 Added mix_cxxExchange to storage bin with assorted routines and 
changes to make it work.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@921 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-05-12 19:26:37 +00:00
David L Parkhurst
764d31c7ae Added Dictionary to svn 
Use pointer to vector instead of copying arrays.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@901 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-05-04 23:09:32 +00:00
David L Parkhurst
11431ae291 packing and unpacking cxx classes for mpi is running 
need to check result.

changed SurfComp.h SurfaceComp.h
changed SurfComp.cxx SurfaceComp.cxx

changed SurfCharge.h SurfaceCharge.h
changed SurfCharge.cxx SurfaceCharge.cxx

Added Dictionary.cxx and Dictionary.h




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@894 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-05-04 00:02:01 +00:00
David L Parkhurst
a38caf4970 Serial version is working for Linux with restart option. 
Tried including printing just active cells, but went back to writing
entire storage bin in case wanted a new head condition with free
surface.

Waiting for Scott on Windows version.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@887 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-05-01 16:31:27 +00:00
David L Parkhurst
8356664d52 workds on serial and parallel using StorageBin for uz, sz, and phreeqc 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@878 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-04-21 22:37:51 +00:00
David L Parkhurst
cb5ccd55d1 Works with szBin on serial and parallel. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@876 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-04-21 20:00:26 +00:00
David L Parkhurst
b3028f79eb Roughed in some printing for debugging phast 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@865 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-04-13 23:39:56 +00:00
David L Parkhurst
c41fb4e5ec phastpp works on linear_ic in debug mode. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@862 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-04-13 21:16:33 +00:00
David L Parkhurst
574da9a1ac Working on phast driver to use classes for main storage 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@859 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-04-12 21:44:32 +00:00
David L Parkhurst
3261c99891 Added class SolutionIsotopeList 
Working through using C++ structures in transport




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@855 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-04-11 23:41:57 +00:00
David L Parkhurst
957551d0a7 Updates 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@837 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-03-08 14:54:34 +00:00
David L Parkhurst
e2b5a47014 Dump_raw for storage bin works, but have not tested. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@800 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-02-28 16:56:34 +00:00
David L Parkhurst
bc11981448 Adding StorageBin 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@798 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-02-27 21:24:28 +00:00