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

Merge commit '94155a63c62b057011f9c961e240e0e04721ca05'

Browse Source
This commit is contained in:
Scott R Charlton 2019-02-05 23:49:55 -07:00
commit 027862acef
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phreeqcpp/GasPhase.cxx
View File

@ -169,9 +169,9 @@ cxxGasPhase::cxxGasPhase(std::map < int, cxxGasPhase > &entity_map,
this->pr_in = entity_ptr->pr_in; this->pr_in = entity_ptr->pr_in;
this->temperature = entity_ptr->temperature; this->temperature = entity_ptr->temperature;
first = false; first = false;
} }
else else
{ {
if (this->type != entity_ptr->type) if (this->type != entity_ptr->type)
{ {
std::ostringstream oss; std::ostringstream oss;
@ -180,9 +180,13 @@ cxxGasPhase::cxxGasPhase(std::map < int, cxxGasPhase > &entity_map,
return; return;
} }
this->total_p += entity_ptr->total_p * it->second; this->total_moles += entity_ptr->total_moles * it->second;
this->volume += entity_ptr->volume * it->second; this->volume += entity_ptr->volume * it->second;
this->v_m += entity_ptr->v_m * it->second; if (sum_fractions > 0.0)
{
this->v_m += entity_ptr->v_m * it->second / sum_fractions;
this->total_p += entity_ptr->total_p * it->second / sum_fractions;
}
} }
} }
cxxGasPhase *gas_phase_ptr = Utilities::Rxn_find(entity_map, it->first); cxxGasPhase *gas_phase_ptr = Utilities::Rxn_find(entity_map, it->first);