Moved uz_bin to workers to avoid possible data conflicts.

PartitionUZ updated
Added TransferCellsUZ
Added Add(src_bin, n) to StorageBin

Need to document partitioning.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8658 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2014-04-15 22:55:59 +00:00
parent 3945c0d78e
commit 53e3bd59e6
2 changed files with 70 additions and 1 deletions

View File

@ -117,6 +117,75 @@ cxxStorageBin::~cxxStorageBin()
{
}
void
cxxStorageBin::Add(cxxStorageBin &src, int n)
{
// Solution
if (src.Get_Solution(n) != NULL)
{
this->Set_Solution(n, src.Get_Solution(n));
}
// Exchange
if (src.Get_Exchange(n) != NULL)
{
this->Set_Exchange(n, src.Get_Exchange(n));
}
// gas_phase
if (src.Get_GasPhase(n) != NULL)
{
this->Set_GasPhase(n, src.Get_GasPhase(n));
}
// kinetics
if (src.Get_Kinetics(n) != NULL)
{
this->Set_Kinetics(n, src.Get_Kinetics(n));
}
// pp_assemblage
if (src.Get_PPassemblage(n) != NULL)
{
this->Set_PPassemblage(n, src.Get_PPassemblage(n));
}
// ss_assemblage
if (src.Get_SSassemblage(n) != NULL)
{
this->Set_SSassemblage(n, src.Get_SSassemblage(n));
}
// surface
if (src.Get_Surface(n) != NULL)
{
this->Set_Surface(n, src.Get_Surface(n));
}
// mix
if (src.Get_Mix(n) != NULL)
{
this->Set_Mix(n, src.Get_Mix(n));
}
// reaction
if (src.Get_Reaction(n) != NULL)
{
this->Set_Reaction(n, src.Get_Reaction(n));
}
// reaction temperature
if (src.Get_Temperature(n) != NULL)
{
this->Set_Temperature(n, src.Get_Temperature(n));
}
// reaction pressure
if (src.Get_Pressure(n) != NULL)
{
this->Set_Pressure(n, src.Get_Pressure(n));
}
}
void
cxxStorageBin::Copy(int destination, int source)
{
if (destination == source)

View File

@ -98,7 +98,7 @@ class cxxStorageBin: public PHRQ_base
void read_raw(CParser & parser);
int read_raw_keyword(CParser & parser);
//void add(struct system *sys_ptr);
void Add(cxxStorageBin &src, int n);
//cxxSolution *mix_cxxSolutions(cxxMix &mixmap);
cxxExchange *mix_cxxExchange(cxxMix & mixmap);