max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure proper value assignment for exchange totals

Browse Source
This commit is contained in:
Max Lübke 2025-09-23 12:06:35 +02:00
parent 24b55af288
commit a23a1a9f40
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
poet/src/Wrapper/ExchangeCompWrapper.cpp
View File

@ -8,6 +8,9 @@ ExchangeWrapper::ExchangeCompWrapper::ExchangeCompWrapper(cxxExchComp &comp)
void ExchangeWrapper::ExchangeCompWrapper::get( void ExchangeWrapper::ExchangeCompWrapper::get(
std::span<LDBLE> &exchange) const { std::span<LDBLE> &exchange) const {
std::size_t exch_index = this->NUM_NOT_TOTALS;
exchange[0] = exch_comp.Get_totals().find(exch_comp.Get_formula())->second; exchange[0] = exch_comp.Get_totals().find(exch_comp.Get_formula())->second;
exchange[1] = exch_comp.Get_charge_balance(); exchange[1] = exch_comp.Get_charge_balance();
exchange[2] = exch_comp.Get_la(); exchange[2] = exch_comp.Get_la();
@ -16,15 +19,16 @@ void ExchangeWrapper::ExchangeCompWrapper::get(
for (const auto &[name, value] : exch_comp.Get_totals()) { for (const auto &[name, value] : exch_comp.Get_totals()) {
if (name != exch_comp.Get_formula()) { if (name != exch_comp.Get_formula()) {
exchange[NUM_NOT_TOTALS + exchange[exch_index++] = value;
std::distance(exch_comp.Get_totals().begin(),
exch_comp.Get_totals().find(name))] = value;
} }
} }
} }
void ExchangeWrapper::ExchangeCompWrapper::set( void ExchangeWrapper::ExchangeCompWrapper::set(
const std::span<LDBLE> &exchange) { const std::span<LDBLE> &exchange) {
std::size_t exch_index = this->NUM_NOT_TOTALS;
exch_comp.Get_totals().find(exch_comp.Get_formula())->second = exchange[0]; exch_comp.Get_totals().find(exch_comp.Get_formula())->second = exchange[0];
exch_comp.Set_charge_balance(exchange[1]); exch_comp.Set_charge_balance(exchange[1]);
exch_comp.Set_la(exchange[2]); exch_comp.Set_la(exchange[2]);
@ -33,9 +37,7 @@ void ExchangeWrapper::ExchangeCompWrapper::set(
for (auto &[name, value] : exch_comp.Get_totals()) { for (auto &[name, value] : exch_comp.Get_totals()) {
if (name != exch_comp.Get_formula()) { if (name != exch_comp.Get_formula()) {
value = exchange[NUM_NOT_TOTALS + value = exchange[exch_index++];
std::distance(exch_comp.Get_totals().begin(),
exch_comp.Get_totals().find(name))];
} }
} }
} }