David L Parkhurst 193e8ef865 Bug with adding mixing solution when already in list. Replaced old fraction with new ...

fraction. Now adds the two fractions. 

This created a bug with rivers when mixing with the same solution. The mass fraction
was calculated incorrectly because only the second part of the solution was used (solution, frac 2).


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2888 1feff8c3-07ed-0310-ac33-dd36852eb9cd

2008-04-24 23:59:55 +00:00

char_star.h

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

cxxKinetics.cxx

Missing break in kinetics_read_raw switch.

2008-02-07 23:14:24 +00:00

cxxKinetics.h

Updated C++ to have new variables for KINETICS

2008-02-05 21:41:45 +00:00

cxxMix.cxx

Fixed cast warnings in c++

2006-07-07 21:27:45 +00:00

cxxMix.h

Bug with adding mixing solution when already in list. Replaced old fraction with new

2008-04-24 23:59:55 +00:00

Dictionary.cxx

Fixed cast warnings in c++

2006-07-07 21:27:45 +00:00

Dictionary.h

removed extraneous cxxDictionary:: from int2char method

2007-01-20 01:22:45 +00:00

distribution.checklist

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

Exchange.cxx

Works with reaction calculation of pure phase equilibrium.

2007-08-16 18:51:35 +00:00

Exchange.h

Still has problems, but roughed in xsolution_save and xexchange_save

2007-05-31 21:59:00 +00:00

ExchComp.cxx

Worked on dependencies for Makefile.

2008-02-14 17:56:32 +00:00

ExchComp.h

Still has problems, but roughed in xsolution_save and xexchange_save

2007-05-31 21:59:00 +00:00

GasPhase.cxx

Still has problems, but roughed in xsolution_save and xexchange_save

2007-05-31 21:59:00 +00:00

GasPhase.h

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

ISolution.cxx

Used new gcc on srv2rcolkr.

2008-02-19 22:05:11 +00:00

ISolution.h

Ifdef'd ORCHESTRA.

2007-08-16 19:49:38 +00:00

ISolutionComp.cxx

Used new gcc on srv2rcolkr.

2008-02-19 22:05:11 +00:00

ISolutionComp.h

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

kinetics.h

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

KineticsComp.cxx

Worked on dependencies for Makefile.

2008-02-14 17:56:32 +00:00

KineticsComp.h

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

Makefile

Added missing tests from phreeqc/mytest and related files:

2008-02-19 23:28:29 +00:00

NameDouble.cxx

Used new gcc on srv2rcolkr.

2008-02-19 22:05:11 +00:00

NameDouble.h

Used new gcc on srv2rcolkr.

2008-02-19 22:05:11 +00:00

NumKeyword.cxx

Initialize default NumKeyword n_user = 1.

2006-04-18 19:56:18 +00:00

NumKeyword.h

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

Parser.cxx

Removed echo that was always true. Made huge string that crashed

2007-09-21 19:01:46 +00:00

Parser.h

gcc did not like comma at end of enumeration

2007-01-10 23:46:29 +00:00

phast.xsd

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

phreeqc.dat

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

phreeqc.rev

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

PPassemblage.cxx

Ifdef'd ORCHESTRA.

2007-08-16 19:49:38 +00:00

PPassemblage.h

Ifdef'd ORCHESTRA.

2007-08-16 19:49:38 +00:00

PPassemblageComp.cxx

Worked on dependencies for Makefile.

2008-02-14 17:56:32 +00:00

PPassemblageComp.h

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

Reaction.cxx

Fixed cast warnings in c++

2006-07-07 21:27:45 +00:00

Reaction.h

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

ReadClass.cxx

Fixed echo in parser for ReadClass.cxx.

2007-01-10 23:19:56 +00:00

revisions

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

SAXPhreeqc.cxx

House cleaning for phreeqcpp

2006-02-16 15:40:24 +00:00

SAXPhreeqc.h

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

SaxPhreeqcHandlers.h

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

Solution.cxx

Simplified get_total_element a bit

2007-11-08 00:08:45 +00:00

Solution.h

Ifdef'd ORCHESTRA.

2007-08-16 19:49:38 +00:00

SolutionIsotope.cxx

Added new functions to allow multiply.

2007-06-21 19:50:55 +00:00

SolutionIsotope.h

Added new functions to allow multiply.

2007-06-21 19:50:55 +00:00

SolutionIsotopeList.cxx

Added new functions to allow multiply.

2007-06-21 19:50:55 +00:00

SolutionIsotopeList.h

Added new functions to allow multiply.

2007-06-21 19:50:55 +00:00

SSassemblage.cxx

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

SSassemblage.h

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

SSassemblageSS.cxx

Worked on dependencies for Makefile.

2008-02-14 17:56:32 +00:00

SSassemblageSS.h

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

StorageBin.cxx

Added read_raw_keyword.

2007-09-20 19:09:38 +00:00

StorageBin.h

Added read_raw_keyword.

2007-09-20 19:09:38 +00:00

Surface.cxx

Write around assert.

2008-03-11 22:04:33 +00:00

Surface.h

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

SurfaceCharge.cxx

Worked on dependencies for Makefile.

2008-02-14 17:56:32 +00:00

SurfaceCharge.h

Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk

2007-05-30 23:43:59 +00:00

SurfaceComp.cxx

Worked on dependencies for Makefile.

2008-02-14 17:56:32 +00:00

SurfaceComp.h

Works with reaction calculation of pure phase equilibrium.

2007-08-16 18:51:35 +00:00

System.cxx

Used new gcc on srv2rcolkr.

2008-02-19 22:05:11 +00:00

System.h

Ifdef'd ORCHESTRA.

2007-08-16 19:49:38 +00:00

Temperature.cxx

Fixed cast warnings in c++

2006-07-07 21:27:45 +00:00

Temperature.h

Makefile is working.

2006-02-16 17:35:35 +00:00

test.xml

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

Utils.cxx

Copying new classes (cxx) and cpp files to src

2006-02-16 00:21:39 +00:00

Utils.h

Updated with phreeqc files.

2007-01-10 00:03:03 +00:00

Description

No description provided

40 MiB

Languages

C++ 81.6%

Makefile 9.2%

C 4.8%

Fortran 1.8%

R 1%

Other 1.3%