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

Cleaned up Get_ and Set_ except for parser.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5661 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-09-29 18:51:39 +00:00
parent bf84746d3e
commit 9fe532eaaf
26 changed files with 217 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Exchange.cxx
View File

@ -43,7 +43,7 @@ cxxNumKeyword(io)
{
int i;
this->set_description(exchange_ptr->description);
this->Set_description(exchange_ptr->description);
n_user = exchange_ptr->n_user;
n_user_end = exchange_ptr->n_user_end;
pitzer_exchange_gammas = (exchange_ptr->pitzer_exchange_gammas == TRUE);
@ -94,7 +94,7 @@ cxxNumKeyword(io)
{
int i;
//this->set_description(exchange_ptr->description);
//this->Set_description(exchange_ptr->description);
this->n_user = l_n_user;
this->n_user_end = l_n_user;
this->pitzer_exchange_gammas =
@ -467,7 +467,7 @@ cxxExchange::Set_pitzer_exchange_gammas(bool b)
}
const std::map < std::string, cxxExchComp > &
cxxExchange::get_exchComps(void) const
cxxExchange::Get_exchComps(void) const
{
return (this->exchComps);
}

2
Exchange.h
View File

@ -32,7 +32,7 @@ public:
bool Get_pitzer_exchange_gammas() const;
void Set_pitzer_exchange_gammas(bool b);
const std::map < std::string, cxxExchComp > &get_exchComps(void) const;
const std::map < std::string, cxxExchComp > &Get_exchComps(void) const;
void totalize();
const cxxNameDouble & Get_totals() const;

2
GasPhase.cxx
View File

@ -46,7 +46,7 @@ cxxNumKeyword(io)
{
int i;
this->set_description(gas_phase_ptr->description);
this->Set_description(gas_phase_ptr->description);
n_user = gas_phase_ptr->n_user;
n_user_end = gas_phase_ptr->n_user_end;
if (gas_phase_ptr->type == PRESSURE)

2
GasPhase.h
View File

@ -41,7 +41,7 @@ class cxxGasPhase:public cxxNumKeyword
void totalize(PHREEQC_PTR_ARG);
const cxxNameDouble & get_totals() const
const cxxNameDouble & Get_totals() const
{
return this->totals;
};

14
ISolution.cxx
View File

@ -58,9 +58,9 @@ cxxISolution::ConvertUnits(PHREEQC_PTR_ARG)
struct master *master_ptr = P_INSTANCE_POINTER master_bsearch(iter->first.c_str());
if (master_ptr != NULL && (master_ptr->minor_isotope == TRUE))
continue;
//if (iter->second.get_description() == "H(1)" || iter->second.get_description() == "E") continue;
if (strcmp(iter->second.get_description().c_str(), "H(1)") == 0
|| strcmp(iter->second.get_description().c_str(), "E"))
//if (iter->second.Get_description() == "H(1)" || iter->second.Get_description() == "E") continue;
if (strcmp(iter->second.Get_description().c_str(), "H(1)") == 0
|| strcmp(iter->second.Get_description().c_str(), "E"))
continue;
if (iter->second.get_input_conc() <= 0.0)
continue;
@ -88,7 +88,7 @@ cxxISolution::ConvertUnits(PHREEQC_PTR_ARG)
{
std::ostringstream oss;
oss << "Could not find gfw, " << iter->second.
get_description();
Get_description();
error_msg(oss.str().c_str(), CONTINUE);
//P_INSTANCE_POINTER input_error++;
}
@ -259,7 +259,7 @@ cxxISolution & cxxISolution::read(CParser & parser)
{
break;
}
conc.set_description("H(1)");
conc.Set_description("H(1)");
sol.add(conc);
}
break;
@ -278,7 +278,7 @@ cxxISolution & cxxISolution::read(CParser & parser)
{
break;
}
conc.set_description("E");
conc.Set_description("E");
sol.add(conc);
}
break;
@ -340,7 +340,7 @@ cxxISolution & cxxISolution::read(CParser & parser)
std::vector < cxxISolutionComp >::iterator iter = sol.totals.begin();
for (; iter != sol.totals.end(); ++iter)
{
token = (*iter).get_description();
token = (*iter).Get_description();
Utilities::str_tolower(token);
if ((*iter).get_units().empty())
{

10
ISolution.h
View File

@ -24,24 +24,24 @@ class cxxISolution:public cxxSolution
//static cxxISolution& read(CParser& parser);
//void add(cxxISolutionComp conc) { this->concs.push_back(conc); }
double get_density() const
double Get_density() const
{
return this->density;
}
void set_density(double l_density)
void Set_density(double l_density)
{
this->density = l_density;
}
std::string get_units() const
std::string Get_units() const
{
return units;
}
void set_units(std::string l_units)
void Set_units(std::string l_units)
{
units = l_units;
}
void set_units(char * l_units)
void Set_units(char * l_units)
{
if (l_units != NULL)
this->units = std::string(l_units);

8
ISolutionComp.cxx
View File

@ -31,14 +31,14 @@ gfw(0.0)
cxxISolutionComp::cxxISolutionComp(struct conc *conc_ptr, PHRQ_io *io)
: PHRQ_base(io)
{
this->set_description(conc_ptr->description);
this->Set_description(conc_ptr->description);
moles = conc_ptr->moles;
input_conc = conc_ptr->input_conc;
this->set_units(conc_ptr->units);
this->set_equation_name(conc_ptr->equation_name);
this->Set_units(conc_ptr->units);
this->Set_equation_name(conc_ptr->equation_name);
phase_si = conc_ptr->phase_si;
n_pe = conc_ptr->n_pe;
this->set_as(conc_ptr->as);
this->Set_as(conc_ptr->as);
gfw = conc_ptr->gfw;
//skip = conc_ptr->skip;
//phase = conc_ptr->phase;

38
ISolutionComp.h
View File

@ -22,11 +22,11 @@ class cxxISolutionComp: public PHRQ_base
void dump_xml(std::ostream & os, unsigned int indent = 0) const;
const std::string &get_description() const
const std::string &Get_description() const
{
return this->description;
}
void set_description(char *l_description)
void Set_description(char *l_description)
{
if (l_description != NULL)
this->description = std::string(l_description);
@ -34,29 +34,29 @@ class cxxISolutionComp: public PHRQ_base
this->description.clear();
}
double get_moles() const
double Get_moles() const
{
return this->moles;
}
void set_moles(double l_moles)
void Set_moles(double l_moles)
{
this->moles = l_moles;
}
double get_input_conc() const
double Get_input_conc() const
{
return this->input_conc;
}
void set_input_conc(double l_input_conc)
void Set_input_conc(double l_input_conc)
{
this->input_conc = l_input_conc;
}
std::string get_units()const
std::string Get_units()const
{
return this->units;
}
void set_units(char *l_units)
void Set_units(char *l_units)
{
if (l_units != NULL)
this->units = std::string(l_units);
@ -64,11 +64,11 @@ class cxxISolutionComp: public PHRQ_base
this->units.clear();
}
const std::string &get_equation_name() const
const std::string &Get_equation_name() const
{
return this->equation_name;
}
void set_equation_name(char *l_equation_name)
void Set_equation_name(char *l_equation_name)
{
if (l_equation_name != NULL)
this->equation_name = std::string(l_equation_name);
@ -77,29 +77,29 @@ class cxxISolutionComp: public PHRQ_base
}
double get_phase_si() const
double Get_phase_si() const
{
return this->phase_si;
}
void set_phase_si(int l_phase_si)
void Set_phase_si(int l_phase_si)
{
this->phase_si = l_phase_si;
}
int get_n_pe() const
int Get_n_pe() const
{
return this->n_pe;
}
void set_n_pe(int l_n_pe)
void Set_n_pe(int l_n_pe)
{
this->n_pe = l_n_pe;
}
const std::string &get_as() const
const std::string &Get_as() const
{
return this->as;
}
void set_as(char *l_as)
void Set_as(char *l_as)
{
if (l_as != NULL)
this->as = std::string(l_as);
@ -108,15 +108,15 @@ class cxxISolutionComp: public PHRQ_base
}
//double get_gfw()const {return this->gfw;}
double get_gfw() const
double Get_gfw() const
{
return this->gfw;
};
void set_gfw(double l_gfw)
void Set_gfw(double l_gfw)
{
this->gfw = l_gfw;
}
//void set_gfw(PHREEQC_PTR_ARG);
//void Set_gfw(PHREEQC_PTR_ARG);
bool operator<(const cxxISolutionComp & conc) const
{

16
NumKeyword.h
View File

@ -14,39 +14,39 @@ class cxxNumKeyword: public PHRQ_base
public:
cxxNumKeyword(PHRQ_io *io=NULL);
virtual ~ cxxNumKeyword();
const std::string &get_description() const
const std::string &Get_description() const
{
return this->description;
}
//char *get_description() const
//char *Get_description() const
//{
// return string_duplicate(this->description.c_str());
//}
void set_description(std::string str)
void Set_description(std::string str)
{
this->description = str;
}
void set_description(char *str)
void Set_description(char *str)
{
if (str != NULL)
this->description = str;
}
int get_n_user() const
int Get_n_user() const
{
return this->n_user;
}
void set_n_user(int user)
void Set_n_user(int user)
{
this->n_user = user;
}
int get_n_user_end() const
int Get_n_user_end() const
{
return this->n_user_end;
}
void set_n_user_end(int user_end)
void Set_n_user_end(int user_end)
{
this->n_user_end = user_end;
}

2
PPassemblage.cxx
View File

@ -42,7 +42,7 @@ eltList(pp_assemblage_ptr->next_elt)
{
int i;
this->set_description(pp_assemblage_ptr->description);
this->Set_description(pp_assemblage_ptr->description);
n_user = pp_assemblage_ptr->n_user;
n_user_end = pp_assemblage_ptr->n_user_end;
for (i = 0; i < pp_assemblage_ptr->count_comps; i++)

4
Phreeqc.cpp
View File

@ -496,7 +496,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
{
cxxGasPhase entity(&gas_phase[i], &phrq_io);
entity.totalize(this);
accumulator.add_extensive(entity.get_totals(), 1.0);
accumulator.add_extensive(entity.Get_totals(), 1.0);
}
// solid-solutions
@ -504,7 +504,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
{
cxxSSassemblage entity(&s_s_assemblage[i]);
entity.totalize(this);
accumulator.add_extensive(entity.get_totals(), 1.0);
accumulator.add_extensive(entity.Get_totals(), 1.0);
}
// kinetics

2
Reaction.cxx
View File

@ -45,7 +45,7 @@ elementList(irrev_ptr->elts)
{
int i;
this->set_description(irrev_ptr->description);
this->Set_description(irrev_ptr->description);
this->n_user = irrev_ptr->n_user;
this->n_user_end = irrev_ptr->n_user_end;
this->Set_units(irrev_ptr->units);

8
ReadClass.cxx
View File

@ -1973,18 +1973,18 @@ dump_entities(void)
}
std::ofstream dump_stream;
if (dump_info.get_append())
if (dump_info.Get_append())
{
//dump_stream.open(dump_info.get_file_name(), std::ios_base::app);
dump_stream.open(dump_info.get_file_name().c_str(), std::ios_base::app);
dump_stream.open(dump_info.Get_file_name().c_str(), std::ios_base::app);
}
else
{
dump_stream.open(dump_info.get_file_name().c_str());
dump_stream.open(dump_info.Get_file_name().c_str());
}
if (!dump_stream.is_open())
{
sprintf(error_string, "Unable to open dump file \"%s\"", dump_info.get_file_name().c_str());
sprintf(error_string, "Unable to open dump file \"%s\"", dump_info.Get_file_name().c_str());
error_msg(error_string, STOP);
}

2
SSassemblage.cxx
View File

@ -41,7 +41,7 @@ cxxSSassemblage::cxxSSassemblage(struct s_s_assemblage * s_s_assemblage_ptr, PHR
cxxNumKeyword(io)
{
int i;
this->set_description(s_s_assemblage_ptr->description);
this->Set_description(s_s_assemblage_ptr->description);
n_user = s_s_assemblage_ptr->n_user;
n_user_end = s_s_assemblage_ptr->n_user_end;
for (i = 0; i < s_s_assemblage_ptr->count_s_s; i++)

4
SSassemblage.h
View File

@ -32,7 +32,7 @@ public:
void dump_raw(std::ostream & s_oss, unsigned int indent) const;
void read_raw(CParser & parser, bool check = true);
const std::map <std::string, cxxSSassemblageSS > & get_ssAssemblageSSs() const
const std::map <std::string, cxxSSassemblageSS > & Get_ssAssemblageSSs() const
{
return this->ssAssemblageSSs;
};
@ -43,7 +43,7 @@ public:
#endif
void totalize(PHREEQC_PTR_ARG);
const cxxNameDouble & get_totals() const
const cxxNameDouble & Get_totals() const
{
return this->totals;
};

4
Solution.cxx
View File

@ -68,7 +68,7 @@ species_gamma(solution_ptr->species_gamma, solution_ptr->count_species_gamma, cx
isotopes(solution_ptr, io)
{
this->set_description(solution_ptr->description);
this->Set_description(solution_ptr->description);
this->n_user = solution_ptr->n_user;
this->n_user_end = solution_ptr->n_user_end;
this->tc = solution_ptr->tc;
@ -148,7 +148,7 @@ cxxNumKeyword(io),
isotopes(io)
{
//this->set_description none;
//this->Set_description none;
this->n_user = l_n_user;
this->n_user_end = l_n_user;
this->tc = P_INSTANCE_POINTER tc_x;

202
StorageBin.cxx
View File

@ -166,7 +166,7 @@ cxxStorageBin::~cxxStorageBin()
{
}
cxxSolution *
cxxStorageBin::getSolution(int n_user)
cxxStorageBin::Get_Solution(int n_user)
{
if (this->Solutions.find(n_user) != this->Solutions.end())
{
@ -175,14 +175,14 @@ cxxStorageBin::getSolution(int n_user)
return (NULL);
}
void
cxxStorageBin::setSolution(int n_user, cxxSolution * entity)
cxxStorageBin::Set_Solution(int n_user, cxxSolution * entity)
{
if (entity == NULL)
return;
Solutions[n_user] = *entity;
}
void
cxxStorageBin::setSolution(int n_user, cxxSolution & entity)
cxxStorageBin::Set_Solution(int n_user, cxxSolution & entity)
{
Solutions[n_user] = entity;
}
@ -193,7 +193,7 @@ cxxStorageBin::removeSolution(int n_user)
}
cxxExchange *
cxxStorageBin::getExchange(int n_user)
cxxStorageBin::Get_Exchange(int n_user)
{
if (this->Exchangers.find(n_user) != this->Exchangers.end())
{
@ -202,7 +202,7 @@ cxxStorageBin::getExchange(int n_user)
return (NULL);
}
void
cxxStorageBin::setExchange(int n_user, cxxExchange * entity)
cxxStorageBin::Set_Exchange(int n_user, cxxExchange * entity)
{
if (entity == NULL)
return;
@ -215,7 +215,7 @@ cxxStorageBin::removeExchange(int n_user)
}
cxxPPassemblage *
cxxStorageBin::getPPassemblage(int n_user)
cxxStorageBin::Get_PPassemblage(int n_user)
{
if (this->PPassemblages.find(n_user) != this->PPassemblages.end())
{
@ -224,14 +224,14 @@ cxxStorageBin::getPPassemblage(int n_user)
return (NULL);
}
void
cxxStorageBin::setPPassemblage(int n_user, cxxPPassemblage * entity)
cxxStorageBin::Set_PPassemblage(int n_user, cxxPPassemblage * entity)
{
if (entity == NULL)
return;
PPassemblages[n_user] = *entity;
}
void
cxxStorageBin::setPPassemblage(int n_user, cxxPPassemblage & entity)
cxxStorageBin::Set_PPassemblage(int n_user, cxxPPassemblage & entity)
{
PPassemblages[n_user] = entity;
}
@ -242,7 +242,7 @@ cxxStorageBin::removePPassemblage(int n_user)
}
cxxGasPhase *
cxxStorageBin::getGasPhase(int n_user)
cxxStorageBin::Get_GasPhase(int n_user)
{
if (this->GasPhases.find(n_user) != this->GasPhases.end())
{
@ -251,7 +251,7 @@ cxxStorageBin::getGasPhase(int n_user)
return (NULL);
}
void
cxxStorageBin::setGasPhase(int n_user, cxxGasPhase * entity)
cxxStorageBin::Set_GasPhase(int n_user, cxxGasPhase * entity)
{
if (entity == NULL)
return;
@ -264,7 +264,7 @@ cxxStorageBin::removeGasPhase(int n_user)
}
cxxSSassemblage *
cxxStorageBin::getSSassemblage(int n_user)
cxxStorageBin::Get_SSassemblage(int n_user)
{
if (this->SSassemblages.find(n_user) != this->SSassemblages.end())
{
@ -273,14 +273,14 @@ cxxStorageBin::getSSassemblage(int n_user)
return (NULL);
}
void
cxxStorageBin::setSSassemblage(int n_user, cxxSSassemblage * entity)
cxxStorageBin::Set_SSassemblage(int n_user, cxxSSassemblage * entity)
{
if (entity == NULL)
return;
SSassemblages[n_user] = *entity;
}
void
cxxStorageBin::setSSassemblage(int n_user, cxxSSassemblage & entity)
cxxStorageBin::Set_SSassemblage(int n_user, cxxSSassemblage & entity)
{
SSassemblages[n_user] = entity;
}
@ -291,7 +291,7 @@ cxxStorageBin::removeSSassemblage(int n_user)
}
cxxKinetics *
cxxStorageBin::getKinetics(int n_user)
cxxStorageBin::Get_Kinetics(int n_user)
{
if (this->Kinetics.find(n_user) != this->Kinetics.end())
{
@ -300,7 +300,7 @@ cxxStorageBin::getKinetics(int n_user)
return (NULL);
}
void
cxxStorageBin::setKinetics(int n_user, cxxKinetics * entity)
cxxStorageBin::Set_Kinetics(int n_user, cxxKinetics * entity)
{
if (entity == NULL)
return;
@ -313,7 +313,7 @@ cxxStorageBin::removeKinetics(int n_user)
}
cxxSurface *
cxxStorageBin::getSurface(int n_user)
cxxStorageBin::Get_Surface(int n_user)
{
if (this->Surfaces.find(n_user) != this->Surfaces.end())
{
@ -322,7 +322,7 @@ cxxStorageBin::getSurface(int n_user)
return (NULL);
}
void
cxxStorageBin::setSurface(int n_user, cxxSurface * entity)
cxxStorageBin::Set_Surface(int n_user, cxxSurface * entity)
{
if (entity == NULL)
return;
@ -335,7 +335,7 @@ cxxStorageBin::removeSurface(int n_user)
}
cxxMix *
cxxStorageBin::getMix(int n_user)
cxxStorageBin::Get_Mix(int n_user)
{
if (this->Mixes.find(n_user) != this->Mixes.end())
{
@ -344,7 +344,7 @@ cxxStorageBin::getMix(int n_user)
return (NULL);
}
void
cxxStorageBin::setMix(int n_user, cxxMix * entity)
cxxStorageBin::Set_Mix(int n_user, cxxMix * entity)
{
if (entity == NULL)
return;
@ -357,7 +357,7 @@ cxxStorageBin::removeMix(int n_user)
}
cxxReaction *
cxxStorageBin::getReaction(int n_user)
cxxStorageBin::Get_Reaction(int n_user)
{
if (this->Reactions.find(n_user) != this->Reactions.end())
{
@ -366,7 +366,7 @@ cxxStorageBin::getReaction(int n_user)
return (NULL);
}
void
cxxStorageBin::setReaction(int n_user, cxxReaction * entity)
cxxStorageBin::Set_Reaction(int n_user, cxxReaction * entity)
{
if (entity == NULL)
return;
@ -379,7 +379,7 @@ cxxStorageBin::removeReaction(int n_user)
}
cxxTemperature *
cxxStorageBin::getTemperature(int n_user)
cxxStorageBin::Get_Temperature(int n_user)
{
if (this->Temperatures.find(n_user) != this->Temperatures.end())
{
@ -388,7 +388,7 @@ cxxStorageBin::getTemperature(int n_user)
return (NULL);
}
void
cxxStorageBin::setTemperature(int n_user, cxxTemperature * entity)
cxxStorageBin::Set_Temperature(int n_user, cxxTemperature * entity)
{
if (entity == NULL)
return;
@ -401,37 +401,37 @@ cxxStorageBin::removeTemperature(int n_user)
}
const std::map < int, cxxSolution > &
cxxStorageBin::getSolutions() const
cxxStorageBin::Get_Solutions() const
{
return this->Solutions;
}
const std::map < int, cxxExchange > &
cxxStorageBin::getExchangers() const
cxxStorageBin::Get_Exchangers() const
{
return this->Exchangers;
}
const std::map < int, cxxGasPhase > &
cxxStorageBin::getGasPhases() const
cxxStorageBin::Get_GasPhases() const
{
return this->GasPhases;
}
const std::map < int, cxxKinetics > &
cxxStorageBin::getKinetics() const
cxxStorageBin::Get_Kinetics() const
{
return this->Kinetics;
}
const std::map < int, cxxPPassemblage > &
cxxStorageBin::getPPassemblages() const
cxxStorageBin::Get_PPassemblages() const
{
return this->PPassemblages;
}
const std::map < int, cxxSSassemblage > &
cxxStorageBin::getSSassemblages() const
cxxStorageBin::Get_SSassemblages() const
{
return this->SSassemblages;
}
const std::map < int, cxxSurface > &
cxxStorageBin::getSurfaces() const
cxxStorageBin::Get_Surfaces() const
{
return this->Surfaces;
}
@ -593,45 +593,45 @@ cxxStorageBin::dump_raw(std::ostream & s_oss, int n, unsigned int indent)
s_oss.precision(DBL_DIG - 1);
// Solutions
if (this->getSolution(n) != NULL)
if (this->Get_Solution(n) != NULL)
{
this->getSolution(n)->dump_raw(s_oss, indent);
this->Get_Solution(n)->dump_raw(s_oss, indent);
}
// Exchange
if (this->getExchange(n) != NULL)
if (this->Get_Exchange(n) != NULL)
{
this->getExchange(n)->dump_raw(s_oss, indent);
this->Get_Exchange(n)->dump_raw(s_oss, indent);
}
// Gas Phases
if (this->getGasPhase(n) != NULL)
if (this->Get_GasPhase(n) != NULL)
{
this->getGasPhase(n)->dump_raw(s_oss, indent);
this->Get_GasPhase(n)->dump_raw(s_oss, indent);
}
// Kinetics
if (this->getKinetics(n) != NULL)
if (this->Get_Kinetics(n) != NULL)
{
this->getKinetics(n)->dump_raw(s_oss, indent);
this->Get_Kinetics(n)->dump_raw(s_oss, indent);
}
// PPassemblage
if (this->getPPassemblage(n) != NULL)
if (this->Get_PPassemblage(n) != NULL)
{
this->getPPassemblage(n)->dump_raw(s_oss, indent);
this->Get_PPassemblage(n)->dump_raw(s_oss, indent);
}
// SSassemblage
if (this->getSSassemblage(n) != NULL)
if (this->Get_SSassemblage(n) != NULL)
{
this->getSSassemblage(n)->dump_raw(s_oss, indent);
this->Get_SSassemblage(n)->dump_raw(s_oss, indent);
}
// Surface
if (this->getSurface(n) != NULL)
if (this->Get_Surface(n) != NULL)
{
this->getSurface(n)->dump_raw(s_oss, indent);
this->Get_Surface(n)->dump_raw(s_oss, indent);
}
}
@ -671,7 +671,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxSolution entity(this->Get_io());
entity.read_raw(parser);
Solutions[entity.get_n_user()] = entity;
Solutions[entity.Get_n_user()] = entity;
}
break;
@ -679,7 +679,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxExchange entity(this->Get_io());
entity.read_raw(parser);
Exchangers[entity.get_n_user()] = entity;
Exchangers[entity.Get_n_user()] = entity;
}
break;
@ -687,7 +687,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxGasPhase entity(this->Get_io());
entity.read_raw(parser);
GasPhases[entity.get_n_user()] = entity;
GasPhases[entity.Get_n_user()] = entity;
}
break;
@ -695,7 +695,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxKinetics entity(this->Get_io());
entity.read_raw(parser);
Kinetics[entity.get_n_user()] = entity;
Kinetics[entity.Get_n_user()] = entity;
}
break;
@ -703,7 +703,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxPPassemblage entity(this->Get_io());
entity.read_raw(parser);
PPassemblages[entity.get_n_user()] = entity;
PPassemblages[entity.Get_n_user()] = entity;
}
break;
@ -711,7 +711,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxSSassemblage entity;
entity.read_raw(parser);
SSassemblages[entity.get_n_user()] = entity;
SSassemblages[entity.Get_n_user()] = entity;
}
break;
@ -719,7 +719,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxSurface entity(this->Get_io());
entity.read_raw(parser);
Surfaces[entity.get_n_user()] = entity;
Surfaces[entity.Get_n_user()] = entity;
}
break;
@ -727,7 +727,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxTemperature entity(this->Get_io());
entity.read_raw(parser);
Temperatures[entity.get_n_user()] = entity;
Temperatures[entity.Get_n_user()] = entity;
}
break;
@ -735,7 +735,7 @@ cxxStorageBin::read_raw(CParser & parser)
{
cxxReaction entity;
entity.read_raw(parser, true);
Reactions[entity.get_n_user()] = entity;
Reactions[entity.Get_n_user()] = entity;
}
break;
default:
@ -782,8 +782,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxSolution entity(this->Get_io());
entity.read_raw(parser);
Solutions[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
Solutions[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -791,8 +791,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxExchange entity(this->Get_io());
entity.read_raw(parser);
Exchangers[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
Exchangers[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -800,8 +800,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxGasPhase entity(this->Get_io());
entity.read_raw(parser);
GasPhases[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
GasPhases[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -809,8 +809,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxKinetics entity(this->Get_io());
entity.read_raw(parser);
Kinetics[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
Kinetics[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -818,8 +818,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxPPassemblage entity(this->Get_io());
entity.read_raw(parser);
PPassemblages[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
PPassemblages[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -827,8 +827,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxSSassemblage entity;
entity.read_raw(parser);
SSassemblages[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
SSassemblages[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -836,8 +836,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxSurface entity(this->Get_io());
entity.read_raw(parser);
Surfaces[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
Surfaces[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -845,8 +845,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxTemperature entity(this->Get_io());
entity.read_raw(parser);
Temperatures[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
Temperatures[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -854,8 +854,8 @@ cxxStorageBin::read_raw_keyword(CParser & parser)
{
cxxReaction entity;
entity.read_raw(parser, true);
Reactions[entity.get_n_user()] = entity;
entity_number = entity.get_n_user();
Reactions[entity.Get_n_user()] = entity;
entity_number = entity.Get_n_user();
}
break;
@ -1486,7 +1486,7 @@ cxxStorageBin::mpi_recv(int task_number)
{
cxxSolution entity;
entity.mpi_unpack(ints, &i, doubles, &d);
this->setSolution(entity.get_n_user(), &entity);
this->setSolution(entity.Get_n_user(), &entity);
}
//std::cerr << "Unpacked Solution" << std::endl;
@ -1495,7 +1495,7 @@ cxxStorageBin::mpi_recv(int task_number)
{
cxxExchange entity;
entity.mpi_unpack(ints, &i, doubles, &d);
this->setExchange(entity.get_n_user(), &entity);
this->setExchange(entity.Get_n_user(), &entity);
}
//std::cerr << "Unpacked Exchange" << std::endl;
@ -1504,7 +1504,7 @@ cxxStorageBin::mpi_recv(int task_number)
{
cxxGasPhase entity;
entity.mpi_unpack(ints, &i, doubles, &d);
this->setGasPhase(entity.get_n_user(), &entity);
this->setGasPhase(entity.Get_n_user(), &entity);
}
//std::cerr << "Unpacked GasPhase" << std::endl;
@ -1513,7 +1513,7 @@ cxxStorageBin::mpi_recv(int task_number)
{
cxxKinetics entity;
entity.mpi_unpack(ints, &i, doubles, &d);
this->setKinetics(entity.get_n_user(), &entity);
this->setKinetics(entity.Get_n_user(), &entity);
}
//std::cerr << "Unpacked Kinetics" << std::endl;
@ -1522,7 +1522,7 @@ cxxStorageBin::mpi_recv(int task_number)
{
cxxPPassemblage entity;
entity.mpi_unpack(ints, &i, doubles, &d);
this->setPPassemblage(entity.get_n_user(), &entity);
this->setPPassemblage(entity.Get_n_user(), &entity);
}
//std::cerr << "Unpacked PPassemblage" << std::endl;
@ -1531,7 +1531,7 @@ cxxStorageBin::mpi_recv(int task_number)
{
cxxSSassemblage entity;
entity.mpi_unpack(ints, &i, doubles, &d);
this->setSSassemblage(entity.get_n_user(), &entity);
this->setSSassemblage(entity.Get_n_user(), &entity);
}
//std::cerr << "Unpacked SSassemblage" << std::endl;
@ -1540,7 +1540,7 @@ cxxStorageBin::mpi_recv(int task_number)
{
cxxSurface entity;
entity.mpi_unpack(ints, &i, doubles, &d);
this->setSurface(entity.get_n_user(), &entity);
this->setSurface(entity.Get_n_user(), &entity);
}
//std::cerr << "Unpacked Surface" << std::endl;
@ -1657,13 +1657,13 @@ cxxStorageBin::mix_cxxExchange(cxxMix & mixmap)
#endif
cxxSystem &
cxxStorageBin::getSystem(void)
cxxStorageBin::Get_System(void)
{
return this->system;
}
void
cxxStorageBin::setSystem(struct Use *use_ptr)
cxxStorageBin::Set_System(struct Use *use_ptr)
{
// Initialize
this->system.Initialize();
@ -1674,7 +1674,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->Solutions.find(use_ptr->n_solution_user);
if (it != this->Solutions.end())
{
this->system.setSolution(&(it->second));
this->system.Set_Solution(&(it->second));
}
}
// Exchange
@ -1684,7 +1684,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->Exchangers.find(use_ptr->n_exchange_user);
if (it != this->Exchangers.end())
{
this->system.setExchange(&(it->second));
this->system.Set_Exchange(&(it->second));
}
}
// gas_phase
@ -1694,7 +1694,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->GasPhases.find(use_ptr->n_gas_phase_user);
if (it != this->GasPhases.end())
{
this->system.setGasPhase(&(it->second));
this->system.Set_GasPhase(&(it->second));
}
}
// kinetics
@ -1704,7 +1704,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->Kinetics.find(use_ptr->n_kinetics_user);
if (it != this->Kinetics.end())
{
this->system.setKinetics(&(it->second));
this->system.Set_Kinetics(&(it->second));
}
}
// pp_assemblage
@ -1714,7 +1714,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->PPassemblages.find(use_ptr->n_pp_assemblage_user);
if (it != this->PPassemblages.end())
{
this->system.setPPassemblage(&(it->second));
this->system.Set_PPassemblage(&(it->second));
}
}
// s_s_assemblage
@ -1724,7 +1724,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->SSassemblages.find(use_ptr->n_s_s_assemblage_user);
if (it != this->SSassemblages.end())
{
this->system.setSSassemblage(&(it->second));
this->system.Set_SSassemblage(&(it->second));
}
}
// surface
@ -1734,7 +1734,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->Surfaces.find(use_ptr->n_surface_user);
if (it != this->Surfaces.end())
{
this->system.setSurface(&(it->second));
this->system.Set_Surface(&(it->second));
}
}
// mix
@ -1744,7 +1744,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->Mixes.find(use_ptr->n_mix_user);
if (it != this->Mixes.end())
{
this->system.setMix(&(it->second));
this->system.Set_Mix(&(it->second));
}
}
// reaction
@ -1754,7 +1754,7 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->Reactions.find(use_ptr->n_irrev_user);
if (it != this->Reactions.end())
{
this->system.setReaction(&(it->second));
this->system.Set_Reaction(&(it->second));
}
}
// reaction temperature
@ -1764,12 +1764,12 @@ cxxStorageBin::setSystem(struct Use *use_ptr)
this->Temperatures.find(use_ptr->n_temperature_user);
if (it != this->Temperatures.end())
{
this->system.setTemperature(&(it->second));
this->system.Set_Temperature(&(it->second));
}
}
}
void
cxxStorageBin::setSystem(int i)
cxxStorageBin::Set_System(int i)
{
// Initialize
this->system.Initialize();
@ -1778,7 +1778,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxSolution >::iterator it = this->Solutions.find(i);
if (it != this->Solutions.end())
{
this->system.setSolution(&(it->second));
this->system.Set_Solution(&(it->second));
}
}
@ -1787,7 +1787,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxExchange >::iterator it = this->Exchangers.find(i);
if (it != this->Exchangers.end())
{
this->system.setExchange(&(it->second));
this->system.Set_Exchange(&(it->second));
}
}
@ -1796,7 +1796,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxGasPhase >::iterator it = this->GasPhases.find(i);
if (it != this->GasPhases.end())
{
this->system.setGasPhase(&(it->second));
this->system.Set_GasPhase(&(it->second));
}
}
// kinetics
@ -1804,7 +1804,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxKinetics >::iterator it = this->Kinetics.find(i);
if (it != this->Kinetics.end())
{
this->system.setKinetics(&(it->second));
this->system.Set_Kinetics(&(it->second));
}
}
// pp_assemblage
@ -1812,7 +1812,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxPPassemblage >::iterator it = this->PPassemblages.find(i);
if (it != this->PPassemblages.end())
{
this->system.setPPassemblage(&(it->second));
this->system.Set_PPassemblage(&(it->second));
}
}
// s_s_assemblage
@ -1820,7 +1820,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxSSassemblage >::iterator it = this->SSassemblages.find(i);
if (it != this->SSassemblages.end())
{
this->system.setSSassemblage(&(it->second));
this->system.Set_SSassemblage(&(it->second));
}
}
// surface
@ -1828,7 +1828,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxSurface >::iterator it = this->Surfaces.find(i);
if (it != this->Surfaces.end())
{
this->system.setSurface(&(it->second));
this->system.Set_Surface(&(it->second));
}
}
// mix
@ -1836,7 +1836,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxMix >::iterator it = this->Mixes.find(i);
if (it != this->Mixes.end())
{
this->system.setMix(&(it->second));
this->system.Set_Mix(&(it->second));
}
}
// reaction
@ -1844,7 +1844,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxReaction >::iterator it = this->Reactions.find(i);
if (it != this->Reactions.end())
{
this->system.setReaction(&(it->second));
this->system.Set_Reaction(&(it->second));
}
}
// reaction temperature
@ -1852,7 +1852,7 @@ cxxStorageBin::setSystem(int i)
std::map < int, cxxTemperature >::iterator it = this->Temperatures.find(i);
if (it != this->Temperatures.end())
{
this->system.setTemperature(&(it->second));
this->system.Set_Temperature(&(it->second));
}
}
}

75
StorageBin.h
View File

@ -24,63 +24,56 @@ class cxxStorageBin: public PHRQ_base
public:
cxxStorageBin(PHRQ_io *io=NULL);
//cxxStorageBin(PHREEQC_PTR_ARG_COMMA struct Use *use_ptr, PHRQ_io *io=NULL);
~cxxStorageBin();
//void import_phreeqc(PHREEQC_PTR_ARG);
//void cxxStorageBin2phreeqc(PHREEQC_PTR_ARG_COMMA int n);
//void phreeqc2cxxStorageBin(PHREEQC_PTR_ARG_COMMA int n);
~cxxStorageBin();
void remove(int n);
cxxSolution *getSolution(int n_user);
void setSolution(int n_user, cxxSolution * entity);
void setSolution(int n_user, cxxSolution & entity);
cxxSolution *Get_Solution(int n_user);
void Set_Solution(int n_user, cxxSolution * entity);
void Set_Solution(int n_user, cxxSolution & entity);
void removeSolution(int n_user);
cxxExchange *getExchange(int n_user);
void setExchange(int n_user, cxxExchange * entity);
cxxExchange *Get_Exchange(int n_user);
void Set_Exchange(int n_user, cxxExchange * entity);
void removeExchange(int n_user);
cxxPPassemblage *getPPassemblage(int n_user);
void setPPassemblage(int n_user, cxxPPassemblage * entity);
void setPPassemblage(int n_user, cxxPPassemblage & entity);
cxxPPassemblage *Get_PPassemblage(int n_user);
void Set_PPassemblage(int n_user, cxxPPassemblage * entity);
void Set_PPassemblage(int n_user, cxxPPassemblage & entity);
void removePPassemblage(int n_user);
cxxGasPhase *getGasPhase(int n_user);
void setGasPhase(int n_user, cxxGasPhase * entity);
cxxGasPhase *Get_GasPhase(int n_user);
void Set_GasPhase(int n_user, cxxGasPhase * entity);
void removeGasPhase(int n_user);
cxxSSassemblage *getSSassemblage(int n_user);
void setSSassemblage(int n_user, cxxSSassemblage * entity);
void setSSassemblage(int n_user, cxxSSassemblage & entity);
cxxSSassemblage *Get_SSassemblage(int n_user);
void Set_SSassemblage(int n_user, cxxSSassemblage * entity);
void Set_SSassemblage(int n_user, cxxSSassemblage & entity);
void removeSSassemblage(int n_user);
cxxKinetics *getKinetics(int n_user);
void setKinetics(int n_user, cxxKinetics * entity);
cxxKinetics *Get_Kinetics(int n_user);
void Set_Kinetics(int n_user, cxxKinetics * entity);
void removeKinetics(int n_user);
cxxSurface *getSurface(int n_user);
void setSurface(int n_user, cxxSurface * entity);
cxxSurface *Get_Surface(int n_user);
void Set_Surface(int n_user, cxxSurface * entity);
void removeSurface(int n_user);
cxxMix *getMix(int n_user);
void setMix(int n_user, cxxMix * entity);
cxxMix *Get_Mix(int n_user);
void Set_Mix(int n_user, cxxMix * entity);
void removeMix(int n_user);
cxxReaction *getReaction(int n_user);
void setReaction(int n_user, cxxReaction * entity);
cxxReaction *Get_Reaction(int n_user);
void Set_Reaction(int n_user, cxxReaction * entity);
void removeReaction(int n_user);
cxxTemperature *getTemperature(int n_user);
void setTemperature(int n_user, cxxTemperature * entity);
cxxTemperature *Get_Temperature(int n_user);
void Set_Temperature(int n_user, cxxTemperature * entity);
void removeTemperature(int n_user);
cxxSystem &getSystem(void);
void setSystem(struct Use *use_ptr);
void setSystem(int i);
cxxSystem &Get_System(void);
void Set_System(struct Use *use_ptr);
void Set_System(int i);
void dump_raw(std::ostream & s_oss, unsigned int indent) const;
@ -96,13 +89,13 @@ class cxxStorageBin: public PHRQ_base
//cxxSolution *mix_cxxSolutions(cxxMix &mixmap);
cxxExchange *mix_cxxExchange(cxxMix & mixmap);
const std::map < int, cxxSolution > &getSolutions() const;
const std::map < int, cxxExchange > &getExchangers() const;
const std::map < int, cxxGasPhase > &getGasPhases() const;
const std::map < int, cxxKinetics > &getKinetics() const;
const std::map < int, cxxPPassemblage > &getPPassemblages() const;
const std::map < int, cxxSSassemblage > &getSSassemblages() const;
const std::map < int, cxxSurface > &getSurfaces() const;
const std::map < int, cxxSolution > &Get_Solutions() const;
const std::map < int, cxxExchange > &Get_Exchangers() const;
const std::map < int, cxxGasPhase > &Get_GasPhases() const;
const std::map < int, cxxKinetics > &Get_Kinetics() const;
const std::map < int, cxxPPassemblage > &Get_PPassemblages() const;
const std::map < int, cxxSSassemblage > &Get_SSassemblages() const;
const std::map < int, cxxSurface > &Get_Surfaces() const;
cxxSystem & Get_system(void) {return system;};
#ifdef USE_MPI

2
Surface.cxx
View File

@ -52,7 +52,7 @@ cxxNumKeyword(io)
{
int i;
this->set_description(surface_ptr->description);
this->Set_description(surface_ptr->description);
n_user = surface_ptr->n_user;
n_user_end = surface_ptr->n_user_end;
type = surface_ptr->type;

2
SurfaceCharge.h
View File

@ -21,7 +21,7 @@ public:
~cxxSurfaceCharge();
struct master *get_psi_master();
struct master *Get_psi_master();
void dump_xml(std::ostream & os, unsigned int indent = 0) const;

4
System.cxx
View File

@ -82,12 +82,12 @@ cxxSystem::totalize(PHREEQC_PTR_ARG)
if (this->gasphase != NULL)
{
this->gasphase->totalize(P_INSTANCE);
this->totals.add_extensive(this->gasphase->get_totals(), 1.0);
this->totals.add_extensive(this->gasphase->Get_totals(), 1.0);
}
if (this->ssassemblage != NULL)
{
this->ssassemblage->totalize(P_INSTANCE);
this->totals.add_extensive(this->ssassemblage->get_totals(), 1.0);
this->totals.add_extensive(this->ssassemblage->Get_totals(), 1.0);
}
if (this->surface != NULL)
{

22
System.h
View File

@ -30,48 +30,48 @@ public:
cxxSystem(PHRQ_io *io=NULL);
~cxxSystem(void);
void Initialize(void);
void setSolution(cxxSolution * entity)
void Set_Solution(cxxSolution * entity)
{
this->solution = entity;
}
void setExchange(cxxExchange * entity)
void Set_Exchange(cxxExchange * entity)
{
this->exchange = entity;
}
void setPPassemblage(cxxPPassemblage * entity)
void Set_PPassemblage(cxxPPassemblage * entity)
{
this->ppassemblage = entity;
}
void setGasPhase(cxxGasPhase * entity)
void Set_GasPhase(cxxGasPhase * entity)
{
this->gasphase = entity;
}
void setSSassemblage(cxxSSassemblage * entity)
void Set_SSassemblage(cxxSSassemblage * entity)
{
this->ssassemblage = entity;
}
void setKinetics(cxxKinetics * entity)
void Set_Kinetics(cxxKinetics * entity)
{
this->kinetics = entity;
}
void setSurface(cxxSurface * entity)
void Set_Surface(cxxSurface * entity)
{
this->surface = entity;
}
void setMix(cxxMix * entity)
void Set_Mix(cxxMix * entity)
{
this->mix = entity;
}
void setReaction(cxxReaction * entity)
void Set_Reaction(cxxReaction * entity)
{
this->reaction = entity;
}
void setTemperature(cxxTemperature * entity)
void Set_Temperature(cxxTemperature * entity)
{
this->temperature = entity;
}
void totalize(PHREEQC_PTR_ARG);
cxxNameDouble &getTotals(void)
cxxNameDouble &Get_Totals(void)
{
return this->totals;
}

2
Temperature.cxx
View File

@ -43,7 +43,7 @@ cxxNumKeyword(io)
{
int i;
this->set_description(temperature_ptr->description);
this->Set_description(temperature_ptr->description);
this->n_user = temperature_ptr->n_user;
this->n_user_end = temperature_ptr->n_user_end;
// temps

2
cxxKinetics.cxx
View File

@ -53,7 +53,7 @@ totals(kinetics_ptr->totals)
{
int i;
this->set_description(kinetics_ptr->description);
this->Set_description(kinetics_ptr->description);
n_user = kinetics_ptr->n_user;
n_user_end = kinetics_ptr->n_user_end;
step_divide = kinetics_ptr->step_divide;

2
cxxMix.cxx
View File

@ -41,7 +41,7 @@ cxxNumKeyword(io)
{
int i;
this->set_description(mix_ptr->description);
this->Set_description(mix_ptr->description);
this->n_user = mix_ptr->n_user;
this->n_user_end = mix_ptr->n_user_end;
// comps

4
dumper.h
View File

@ -15,8 +15,8 @@ public:
~dumper(void);
bool Read(CParser & parser);
void SetAll(bool tf);
std::string get_file_name(void) { return(this->file_name); };
bool get_append(void) { return(this->append); };
std::string Get_file_name(void) { return(this->file_name); };
bool Get_append(void) { return(this->append); };
bool Get_bool_solution(void) { return(this->binList.Get_solution().Get_defined()); };
bool Get_bool_pp_assemblage(void) { return(this->binList.Get_pp_assemblage().Get_defined()); };
bool Get_bool_exchange(void) { return(this->binList.Get_exchange().Get_defined()); };