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

writing cxxStorageBin2phreeqc.

Browse Source 
clean up some consts.

Adding methods for Mix, Reaction, Temperature.

Need parallel method for exchange_ptr_to_user for mix, irrev, temperature.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5689 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-10-15 00:40:56 +00:00
parent 6e4445faf5
commit ee9dcce40b
11 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Exchange.cxx
View File

@ -67,7 +67,7 @@ cxxNumKeyword(io)
//
// Mix exchangers
//
std::map < int, double >&mixcomps = mix.Get_mixComps();
const std::map < int, double >&mixcomps = mix.Get_mixComps();
std::map < int, double >::const_iterator it;
for (it = mixcomps.begin(); it != mixcomps.end(); it++)
{

2
GasPhase.cxx
View File

@ -82,7 +82,7 @@ cxxNumKeyword(io)
// Mix
//
//cxxNameDouble gasPhaseComps;
std::map < int, double >&mixcomps = mix.Get_mixComps();
const std::map < int, double > & mixcomps = mix.Get_mixComps();
std::map < int, double >::const_iterator it;
for (it = mixcomps.begin(); it != mixcomps.end(); it++)
{

2
PPassemblage.cxx
View File

@ -64,7 +64,7 @@ cxxNumKeyword(io)
//
// Mix
//
std::map < int, double >&mixcomps = mix.Get_mixComps();
const std::map < int, double >&mixcomps = mix.Get_mixComps();
std::map < int, double >::const_iterator it;
for (it = mixcomps.begin(); it != mixcomps.end(); it++)
{

4
Phreeqc.h
View File

@ -1245,7 +1245,7 @@ extern void MergeFinalize(void);
// convert class to struct
struct mix * cxxMix2mix(cxxMix *mx);
struct mix * cxxMix2mix(const cxxMix *mx);
struct kinetics *cxxKinetics2kinetics(const cxxKinetics * kin);
struct kinetics_comp * cxxKineticsComp2kinetics_comp(const std::list < cxxKineticsComp > * el);
struct exchange * cxxExchange2exchange(const cxxExchange * ex);
@ -1275,7 +1275,7 @@ void Use2cxxStorageBin(cxxStorageBin & sb);
void phreeqc2cxxStorageBin(cxxStorageBin & sb);
void phreeqc2cxxStorageBin(cxxStorageBin & sb, int n);
void cxxStorageBin2phreeqc0(cxxStorageBin & sb, int n);
void cxxStorageBin2phreeqc(cxxStorageBin & sb);
/* tally.c */

2
SSassemblage.cxx
View File

@ -61,7 +61,7 @@ cxxNumKeyword(io)
//
// Mix
//
std::map < int, double >&mixcomps = mix.Get_mixComps();
const std::map < int, double >&mixcomps = mix.Get_mixComps();
std::map < int, double >::const_iterator it;
for (it = mixcomps.begin(); it != mixcomps.end(); it++)
{

2
Solution.cxx
View File

@ -115,7 +115,7 @@ isotopes(io)
//
// Mix solutions
//
std::map < int, double >&mixcomps = mix.Get_mixComps();
const std::map < int, double >&mixcomps = mix.Get_mixComps();
std::map < int, double >::const_iterator it;
for (it = mixcomps.begin(); it != mixcomps.end(); it++)
{

15
StorageBin.cxx
View File

@ -322,6 +322,21 @@ cxxStorageBin::Get_Surfaces() const
{
return this->Surfaces;
}
const std::map < int, cxxMix > &
cxxStorageBin::Get_Mixes() const
{
return this->Mixes;
}
const std::map < int, cxxReaction > &
cxxStorageBin::Get_Reactions() const
{
return this->Reactions;
}
const std::map < int, cxxTemperature > &
cxxStorageBin::Get_Temperatures() const
{
return this->Temperatures;
}
#ifdef SKIP
void

3
StorageBin.h
View File

@ -94,6 +94,9 @@ class cxxStorageBin: public PHRQ_base
const std::map < int, cxxPPassemblage > &Get_PPassemblages() const;
const std::map < int, cxxSSassemblage > &Get_SSassemblages() const;
const std::map < int, cxxSurface > &Get_Surfaces() const;
const std::map < int, cxxMix > &Get_Mixes() const;
const std::map < int, cxxReaction > &Get_Reactions() const;
const std::map < int, cxxTemperature > &Get_Temperatures() const;
cxxSystem & Get_system(void) {return system;};
#ifdef USE_MPI

2
Surface.cxx
View File

@ -100,7 +100,7 @@ cxxNumKeyword(io)
//
// Mix exchangers
//
std::map < int, double >&mixcomps = mix.Get_mixComps();
const std::map < int, double >&mixcomps = mix.Get_mixComps();
std::map < int, double >::const_iterator it;
for (it = mixcomps.begin(); it != mixcomps.end(); it++)
{

2
cxxKinetics.cxx
View File

@ -100,7 +100,7 @@ cxxNumKeyword(io)
//
// Mix
//
std::map < int, double >&mixcomps = mix.Get_mixComps();
const std::map < int, double >&mixcomps = mix.Get_mixComps();
std::map < int, double >::const_iterator it;
for (it = mixcomps.begin(); it != mixcomps.end(); it++)
{

2
cxxMix.h
View File

@ -43,7 +43,7 @@ class cxxMix:public cxxNumKeyword
}
};
std::map < int, double > & Get_mixComps()
const std::map < int, double > & Get_mixComps() const
{
return mixComps;
}