Skip to content
Snippets Groups Projects
Commit 93d45525 authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'clang-format-PhreeqcIO' into 'master'

[CL] clang-format PhreeqcIO

See merge request ogs/ogs!3748
parents 61aa7370 362c0a5a
No related branches found
No related tags found
No related merge requests found
...@@ -166,10 +166,10 @@ void setReactantMolality(Reactant& reactant, ...@@ -166,10 +166,10 @@ void setReactantMolality(Reactant& reactant,
template <typename Exchanger> template <typename Exchanger>
void initializeExchangerMolality(Exchanger& exchanger, void initializeExchangerMolality(Exchanger& exchanger,
GlobalIndexType const& chemical_system_id, GlobalIndexType const& chemical_system_id,
MaterialPropertyLib::Phase const& solid_phase, MaterialPropertyLib::Phase const& solid_phase,
ParameterLib::SpatialPosition const& pos, ParameterLib::SpatialPosition const& pos,
double const t) double const t)
{ {
auto const& solid_constituent = solid_phase.component(exchanger.name); auto const& solid_constituent = solid_phase.component(exchanger.name);
...@@ -182,11 +182,11 @@ void initializeExchangerMolality(Exchanger& exchanger, ...@@ -182,11 +182,11 @@ void initializeExchangerMolality(Exchanger& exchanger,
template <typename Reactant> template <typename Reactant>
void updateReactantVolumeFraction(Reactant& reactant, void updateReactantVolumeFraction(Reactant& reactant,
GlobalIndexType const& chemical_system_id, GlobalIndexType const& chemical_system_id,
MaterialPropertyLib::Medium const& medium, MaterialPropertyLib::Medium const& medium,
ParameterLib::SpatialPosition const& pos, ParameterLib::SpatialPosition const& pos,
double const porosity, double const t, double const porosity, double const t,
double const dt) double const dt)
{ {
auto const& solid_phase = medium.phase("Solid"); auto const& solid_phase = medium.phase("Solid");
auto const& liquid_phase = medium.phase("AqueousLiquid"); auto const& liquid_phase = medium.phase("AqueousLiquid");
...@@ -197,8 +197,7 @@ void updateReactantVolumeFraction(Reactant& reactant, ...@@ -197,8 +197,7 @@ void updateReactantVolumeFraction(Reactant& reactant,
liquid_phase[MaterialPropertyLib::PropertyType::density] liquid_phase[MaterialPropertyLib::PropertyType::density]
.template value<double>(vars, pos, t, dt); .template value<double>(vars, pos, t, dt);
auto const& solid_constituent = auto const& solid_constituent = solid_phase.component(reactant.name);
solid_phase.component(reactant.name);
if (solid_constituent.hasProperty( if (solid_constituent.hasProperty(
MaterialPropertyLib::PropertyType::molality)) MaterialPropertyLib::PropertyType::molality))
...@@ -212,7 +211,7 @@ void updateReactantVolumeFraction(Reactant& reactant, ...@@ -212,7 +211,7 @@ void updateReactantVolumeFraction(Reactant& reactant,
(*reactant.volume_fraction)[chemical_system_id] += (*reactant.volume_fraction)[chemical_system_id] +=
((*reactant.molality)[chemical_system_id] - ((*reactant.molality)[chemical_system_id] -
(*reactant.molality_prev)[chemical_system_id]) * (*reactant.molality_prev)[chemical_system_id]) *
liquid_density * porosity * molar_volume; liquid_density * porosity * molar_volume;
} }
...@@ -224,8 +223,7 @@ void setPorosityPostReaction(Reactant& reactant, ...@@ -224,8 +223,7 @@ void setPorosityPostReaction(Reactant& reactant,
{ {
auto const& solid_phase = medium.phase("Solid"); auto const& solid_phase = medium.phase("Solid");
auto const& solid_constituent = auto const& solid_constituent = solid_phase.component(reactant.name);
solid_phase.component(reactant.name);
if (solid_constituent.hasProperty( if (solid_constituent.hasProperty(
MaterialPropertyLib::PropertyType::molality)) MaterialPropertyLib::PropertyType::molality))
...@@ -233,9 +231,8 @@ void setPorosityPostReaction(Reactant& reactant, ...@@ -233,9 +231,8 @@ void setPorosityPostReaction(Reactant& reactant,
return; return;
} }
porosity -= porosity -= ((*reactant.volume_fraction)[chemical_system_id] -
((*reactant.volume_fraction)[chemical_system_id] - (*reactant.volume_fraction_prev)[chemical_system_id]);
(*reactant.volume_fraction_prev)[chemical_system_id]);
} }
template <typename Reactant> template <typename Reactant>
...@@ -245,9 +242,8 @@ static double averageReactantMolality( ...@@ -245,9 +242,8 @@ static double averageReactantMolality(
{ {
double const sum = std::accumulate( double const sum = std::accumulate(
chemical_system_indices.begin(), chemical_system_indices.end(), 0.0, chemical_system_indices.begin(), chemical_system_indices.end(), 0.0,
[&](double const s, GlobalIndexType const id) { [&](double const s, GlobalIndexType const id)
return s + (*reactant.molality)[id]; { return s + (*reactant.molality)[id]; });
});
return sum / chemical_system_indices.size(); return sum / chemical_system_indices.size();
} }
} // namespace } // namespace
...@@ -343,8 +339,8 @@ void PhreeqcIO::initializeChemicalSystemConcrete( ...@@ -343,8 +339,8 @@ void PhreeqcIO::initializeChemicalSystemConcrete(
for (auto& exchanger : _chemical_system->exchangers) for (auto& exchanger : _chemical_system->exchangers)
{ {
initializeExchangerMolality(exchanger, chemical_system_id, solid_phase, pos, initializeExchangerMolality(exchanger, chemical_system_id, solid_phase,
t); pos, t);
} }
} }
...@@ -690,9 +686,8 @@ std::istream& operator>>(std::istream& in, PhreeqcIO& phreeqc_io) ...@@ -690,9 +686,8 @@ std::istream& operator>>(std::istream& in, PhreeqcIO& phreeqc_io)
auto const& accepted_item = output.accepted_items[item_id]; auto const& accepted_item = output.accepted_items[item_id];
auto const& item_name = accepted_item.name; auto const& item_name = accepted_item.name;
auto compare_by_name = [&item_name](auto const& item) { auto compare_by_name = [&item_name](auto const& item)
return item.name == item_name; { return item.name == item_name; };
};
switch (accepted_item.item_type) switch (accepted_item.item_type)
{ {
...@@ -786,14 +781,14 @@ void PhreeqcIO::updateVolumeFractionPostReaction( ...@@ -786,14 +781,14 @@ void PhreeqcIO::updateVolumeFractionPostReaction(
{ {
for (auto& kinetic_reactant : _chemical_system->kinetic_reactants) for (auto& kinetic_reactant : _chemical_system->kinetic_reactants)
{ {
updateReactantVolumeFraction(kinetic_reactant, chemical_system_id, medium, updateReactantVolumeFraction(kinetic_reactant, chemical_system_id,
pos, porosity, t, dt); medium, pos, porosity, t, dt);
} }
for (auto& equilibrium_reactant : _chemical_system->equilibrium_reactants) for (auto& equilibrium_reactant : _chemical_system->equilibrium_reactants)
{ {
updateReactantVolumeFraction(equilibrium_reactant, chemical_system_id, medium, updateReactantVolumeFraction(equilibrium_reactant, chemical_system_id,
pos, porosity, t, dt); medium, pos, porosity, t, dt);
} }
} }
...@@ -804,12 +799,14 @@ void PhreeqcIO::updatePorosityPostReaction( ...@@ -804,12 +799,14 @@ void PhreeqcIO::updatePorosityPostReaction(
{ {
for (auto& kinetic_reactant : _chemical_system->kinetic_reactants) for (auto& kinetic_reactant : _chemical_system->kinetic_reactants)
{ {
setPorosityPostReaction(kinetic_reactant, chemical_system_id, medium, porosity); setPorosityPostReaction(kinetic_reactant, chemical_system_id, medium,
porosity);
} }
for (auto& equilibrium_reactant : _chemical_system->equilibrium_reactants) for (auto& equilibrium_reactant : _chemical_system->equilibrium_reactants)
{ {
setPorosityPostReaction(equilibrium_reactant, chemical_system_id, medium, porosity); setPorosityPostReaction(equilibrium_reactant, chemical_system_id,
medium, porosity);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment