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

Do not dump negative entities.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8502 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2014-02-19 16:57:35 +00:00
parent 01a54bdb7d
commit b5e86c636e
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Phreeqc.h
View File

@ -1971,7 +1971,11 @@ namespace Utilities
typename T::const_iterator it;
for (it = b.begin(); it != b.end(); ++it)
{
it->second.dump_raw(s_oss, indent);
// Adding logic to dump only non-negative entities
if (it->second.Get_n_user() >= 0)
{
it->second.dump_raw(s_oss, indent);
}
}
return;
}

22
ReadClass.cxx
View File

@ -856,7 +856,7 @@ dump_ostream(std::ostream& os)
for (it = dump_info.Get_solution().begin(); it != dump_info.Get_solution().end(); it++)
{
cxxSolution *p = Utilities::Rxn_find(Rxn_solution_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -878,7 +878,7 @@ dump_ostream(std::ostream& os)
{
cxxPPassemblage *p = Utilities::Rxn_find(Rxn_pp_assemblage_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -899,7 +899,7 @@ dump_ostream(std::ostream& os)
{
cxxExchange *p = Utilities::Rxn_find(Rxn_exchange_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -921,7 +921,7 @@ dump_ostream(std::ostream& os)
{
cxxSurface *p = Utilities::Rxn_find(Rxn_surface_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -942,7 +942,7 @@ dump_ostream(std::ostream& os)
{
cxxSSassemblage *p = Utilities::Rxn_find(Rxn_ss_assemblage_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -963,7 +963,7 @@ dump_ostream(std::ostream& os)
{
cxxGasPhase *p = Utilities::Rxn_find(Rxn_gas_phase_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -985,7 +985,7 @@ dump_ostream(std::ostream& os)
{
cxxKinetics *p = Utilities::Rxn_find(Rxn_kinetics_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -1006,7 +1006,7 @@ dump_ostream(std::ostream& os)
{
cxxMix *p = Utilities::Rxn_find(Rxn_mix_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -1028,7 +1028,7 @@ dump_ostream(std::ostream& os)
{
cxxReaction *p = Utilities::Rxn_find(Rxn_reaction_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -1050,7 +1050,7 @@ dump_ostream(std::ostream& os)
{
cxxTemperature *p = Utilities::Rxn_find(Rxn_temperature_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}
@ -1071,7 +1071,7 @@ dump_ostream(std::ostream& os)
{
cxxPressure *p = Utilities::Rxn_find(Rxn_pressure_map, *it);
if (p != NULL)
if (p != NULL && p->Get_n_user() >= 0)
{
p->dump_raw(os, 0);
}