max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reindented, fixed errors, ran test cases.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3176 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2008-10-31 19:09:45 +00:00
parent d37ed2c6ae
commit cefe071f17
20 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ExchComp.cxx
View File

@ -220,7 +220,7 @@ cxxExchComp::cxxExchComp2exch_comp(std::list < cxxExchComp > &el)
}
void
cxxExchComp::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxExchComp::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing exch_comp message: %s, element not found\n";
unsigned int i;
@ -267,7 +267,7 @@ cxxExchComp::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
void
cxxExchComp::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxExchComp::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing exch_comp message: %s, element not found\n";
unsigned int i;

4
Exchange.cxx
View File

@ -220,7 +220,7 @@ cxxExchange::cxxExchange2exchange()
}
void
cxxExchange::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxExchange::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing exchange message: %s, element not found\n";
unsigned int i;
@ -254,7 +254,7 @@ cxxExchange::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
void
cxxExchange::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxExchange::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing exchange message: %s, element not found\n";
unsigned int i;

2
GasPhase.cxx
View File

@ -219,7 +219,7 @@ cxxGasPhase::dump_xml(std::ostream & s_oss, unsigned int indent) const const
#endif
void
cxxGasPhase::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxGasPhase::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing gas_phase message: %s, element not found\n";
unsigned int i;

2
KineticsComp.cxx
View File

@ -150,7 +150,7 @@ cxxKineticsComp::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
#endif
void
cxxKineticsComp::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxKineticsComp::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing kinetics_comp message: %s, element not found\n";
unsigned int i;

10
NameDouble.cxx
View File

@ -154,7 +154,7 @@ cxxNameDouble::elt_list()
}
struct master_activity *
cxxNameDouble::master_activity() const const
cxxNameDouble::master_activity() const
//
// Builds a list of master_activity structures from instance of cxxNameDouble
//
@ -213,7 +213,7 @@ cxxNameDouble::master_activity() const const
}
struct conc *
cxxNameDouble::conc() const const
cxxNameDouble::conc() const
// for Solutions, not ISolutions
// takes a map of (elt name, moles)
// returns list of conc structures
@ -245,7 +245,7 @@ cxxNameDouble::conc() const const
}
struct name_coef *
cxxNameDouble::name_coef() const const
cxxNameDouble::name_coef() const
//
// Builds a name_coef structure from instance of cxxNameDouble
//
@ -267,7 +267,7 @@ cxxNameDouble::name_coef() const const
}
void
cxxNameDouble::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxNameDouble::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing exch_comp message: %s, element not found\n";
unsigned int i;
@ -312,7 +312,7 @@ cxxNameDouble::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
void
cxxNameDouble::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxNameDouble::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing exch_comp message: %s, element not found\n";
unsigned int i;

2
NumKeyword.cxx
View File

@ -22,7 +22,7 @@ cxxNumKeyword::~cxxNumKeyword()
}
void
cxxNumKeyword::dump_xml(std::ostream & os, unsigned int indent) const const
cxxNumKeyword::dump_xml(std::ostream & os, unsigned int indent) const
{
unsigned int i;

4
PPassemblage.cxx
View File

@ -97,7 +97,7 @@ cxxPPassemblage::cxxPPassemblage2pp_assemblage()
}
void
cxxPPassemblage::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxPPassemblage::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing PPassemblage message: %s, element not found\n";
unsigned int i;
@ -128,7 +128,7 @@ cxxPPassemblage::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
void
cxxPPassemblage::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxPPassemblage::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing PPassemblage message: %s, element not found\n";
unsigned int i;

4
PPassemblageComp.cxx
View File

@ -93,7 +93,7 @@ cxxPPassemblageComp::cxxPPassemblageComp2pure_phase(std::list <
}
void
cxxPPassemblageComp::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxPPassemblageComp::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing pure_phase message: %s, element not found\n";
unsigned int i;
@ -124,7 +124,7 @@ cxxPPassemblageComp::dump_xml(std::ostream & s_oss, unsigned int indent) const c
}
void
cxxPPassemblageComp::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxPPassemblageComp::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing pure_phase message: %s, element not found\n";
unsigned int i;

2
Reaction.cxx
View File

@ -158,7 +158,7 @@ cxxReaction::dump_xml(std::ostream & s_oss, unsigned int indent) const const
#endif
void
cxxReaction::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxReaction::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing irrev message: %s, element not found\n";
unsigned int i;

2
SSassemblage.cxx
View File

@ -122,7 +122,7 @@ cxxSSassemblage::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
#endif
void
cxxSSassemblage::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxSSassemblage::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing SSassemblage message: %s, element not found\n";
unsigned int i;

2
SSassemblageSS.cxx
View File

@ -184,7 +184,7 @@ cxxSSassemblageSS::dump_xml(std::ostream & s_oss, unsigned int indent) const con
}
#endif
void
cxxSSassemblageSS::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxSSassemblageSS::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing s_s message: %s, element not found\n";
unsigned int i;

10
Solution.cxx
View File

@ -324,7 +324,7 @@ cxxSolution::cxxSolution2solution()
}
void
cxxSolution::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxSolution::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing solution message: %s, element not found\n";
unsigned int i;
@ -436,7 +436,7 @@ cxxSolution::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
void
cxxSolution::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxSolution::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing solution message: %s, element not found\n";
unsigned int i;
@ -936,7 +936,7 @@ cxxSolution::multiply(double extensive)
}
double
cxxSolution::get_total(char *string) const const
cxxSolution::get_total(char *string) const
{
cxxNameDouble::const_iterator it = this->totals.find(string);
if (it == this->totals.end())
@ -949,7 +949,7 @@ cxxSolution::get_total(char *string) const const
}
}
double
cxxSolution::get_total_element(char *string) const const
cxxSolution::get_total_element(char *string) const
{
cxxNameDouble::const_iterator it;
double d = 0.0;
@ -991,7 +991,7 @@ cxxSolution::set_total(char *string, double d)
}
double
cxxSolution::get_master_activity(char *string) const const
cxxSolution::get_master_activity(char *string) const
{
cxxNameDouble::const_iterator it = this->master_activity.find(string);
if (it == this->master_activity.end())

6
SolutionIsotope.cxx
View File

@ -76,7 +76,7 @@ std::string cxxSolutionIsotope::get_name() constconst
#endif
void
cxxSolutionIsotope::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxSolutionIsotope::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
unsigned int i;
@ -116,7 +116,7 @@ cxxSolutionIsotope::dump_xml(std::ostream & s_oss, unsigned int indent) const co
}
void
cxxSolutionIsotope::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxSolutionIsotope::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
unsigned int i;
@ -200,7 +200,7 @@ CParser::STATUS_TYPE cxxSolutionIsotope::read_raw(CParser & parser)
}
bool
cxxSolutionIsotope::operator<(const cxxSolutionIsotope & isotope) const const
cxxSolutionIsotope::operator<(const cxxSolutionIsotope & isotope) const
{
int i = Utilities::strcmp_nocase(this->elt_name, isotope.elt_name);
if (i != 0)

2
StorageBin.cxx
View File

@ -210,7 +210,7 @@ cxxStorageBin::dump_xml(std::ostream & s_oss, unsigned int indent) const const
#endif
void
cxxStorageBin::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxStorageBin::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
// Dump all data

4
Surface.cxx
View File

@ -213,7 +213,7 @@ cxxSurface::cxxSurface2surface()
}
void
cxxSurface::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxSurface::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing surface message: %s, element not found\n";
unsigned int i;
@ -286,7 +286,7 @@ cxxSurface::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
void
cxxSurface::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxSurface::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing surface message: %s, element not found\n";
unsigned int i;

4
SurfaceCharge.cxx
View File

@ -122,7 +122,7 @@ cxxSurfaceCharge::cxxSurfaceCharge2surface_charge(std::list <
}
void
cxxSurfaceCharge::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxSurfaceCharge::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing surf_charge message: %s, element not found\n";
unsigned int i;
@ -159,7 +159,7 @@ cxxSurfaceCharge::dump_xml(std::ostream & s_oss, unsigned int indent) const cons
}
void
cxxSurfaceCharge::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxSurfaceCharge::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing surf_charge message: %s, element not found\n";
unsigned int i;

4
SurfaceComp.cxx
View File

@ -136,7 +136,7 @@ cxxSurfaceComp::cxxSurfaceComp2surface_comp(std::list < cxxSurfaceComp > &el)
}
void
cxxSurfaceComp::dump_xml(std::ostream & s_oss, unsigned int indent) const const
cxxSurfaceComp::dump_xml(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing surf_comp message: %s, element not found\n";
unsigned int i;
@ -186,7 +186,7 @@ cxxSurfaceComp::dump_xml(std::ostream & s_oss, unsigned int indent) const const
}
void
cxxSurfaceComp::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxSurfaceComp::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing surf_comp message: %s, element not found\n";
unsigned int i;

2
Temperature.cxx
View File

@ -141,7 +141,7 @@ cxxTemperature::dump_xml(std::ostream & s_oss, unsigned int indent) const const
#endif
void
cxxTemperature::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxTemperature::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing temperature message: %s, element not found\n";
unsigned int i;

2
cxxKinetics.cxx
View File

@ -186,7 +186,7 @@ cxxKinetics::dump_xml(std::ostream & s_oss, unsigned int indent) const const
#endif
void
cxxKinetics::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxKinetics::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing kinetics message: %s, element not found\n";
unsigned int i;

2
cxxMix.cxx
View File

@ -129,7 +129,7 @@ cxxMix::dump_xml(std::ostream & s_oss, unsigned int indent) const const
#endif
void
cxxMix::dump_raw(std::ostream & s_oss, unsigned int indent) const const
cxxMix::dump_raw(std::ostream & s_oss, unsigned int indent) const
{
//const char ERR_MESSAGE[] = "Packing mix message: %s, element not found\n";
unsigned int i;