15 Commits

Author SHA1 Message Date
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
25666df97c Used new gcc on srv2rcolkr.
Cleaned up all the const errors when using constant string in 
arguments to functions.

removed ex1.

Modified makefile to include/exclude cl1mp.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-02-19 22:05:11 +00:00
David L Parkhurst
b9520a207f Worked on dependencies for Makefile.
Made dependencies the same for serial and parallel,
can check with make depends and make depends_parallel, 
dependencies and dependencies_parallel should be the same.

Modified fortran with -I/usr/include for gfortran compiler
to find mpif.h.

Now use mpif.h in mpimod.F90 to define MPI_COMM_WORLD.

Dictionary.h moved in cxx files to make serial and parallel
dependencies the same.

Ifdef'd mpimod to exclude everything in module for serial version. 



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2707 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-02-14 17:56:32 +00:00
David L Parkhurst
a7a19e57f4 Still has problems, but roughed in xsolution_save and xexchange_save
as constructor methods for Solution and Exchange.
Takes c storage and makes C++ objects after a calculation.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2062 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-05-31 21:59:00 +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
888140c4a5 Updated with phreeqc files.
Main difference is the logic for rebuilding a model. Should
run faster now, but has slight differences in example files.

Imported changes from ph2orch.

Plan to make phreeqcpp a subdirectory of ph2orch/src.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1601 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-01-10 00:03:03 +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
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
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
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
75b28d81ca Moved Conc to SolutionComp
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@791 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 18:34:28 +00:00
David L Parkhurst
60a1544019 Copying new classes (cxx) and cpp files to src
Will remove cpp and header files and make phreeqc an external directory.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@785 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 00:21:39 +00:00