OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

put BlackoilModelEbos::ComponentName in separate header

Browse Source 
more tidy and potentially easier to reuse
This commit is contained in:
Arne Morten Kvarving 2023-06-30 11:18:27 +02:00
parent 77baad7243
commit 35bb329022
3 changed files with 102 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists_files.cmake
View File

@ -441,6 +441,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/timestepping/SimulatorTimer.hpp
opm/simulators/timestepping/SimulatorTimerInterface.hpp
opm/simulators/timestepping/gatherConvergenceReport.hpp
opm/simulators/utils/ComponentName.hpp
opm/simulators/utils/ParallelFileMerger.hpp
opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
opm/simulators/utils/DeferredLogger.hpp

65
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@ -50,6 +50,7 @@
#include <opm/simulators/timestepping/ConvergenceReport.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp>
#include <opm/simulators/utils/ComponentName.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/simulators/utils/ParallelCommunication.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp>
@ -203,73 +204,11 @@ namespace Opm {
using Mat = typename SparseMatrixAdapter::IstlMatrix;
using BVector = Dune::BlockVector<VectorBlockType>;
using ComponentName = ::Opm::ComponentName<FluidSystem,Indices>;
using Domain = SubDomain<Grid>;
using ISTLSolverType = ISTLSolverEbos<TypeTag>;
class ComponentName
{
public:
ComponentName()
: names_(numEq)
{
for (unsigned phaseIdx = 0; phaseIdx < FluidSystem::numPhases; ++phaseIdx) {
if (!FluidSystem::phaseIsActive(phaseIdx)) {
continue;
}
const unsigned canonicalCompIdx = FluidSystem::solventComponentIndex(phaseIdx);
names_[Indices::canonicalToActiveComponentIndex(canonicalCompIdx)]
= FluidSystem::componentName(canonicalCompIdx);
}
if constexpr (has_solvent_) {
names_[solventSaturationIdx] = "Solvent";
}
if constexpr (has_extbo_) {
names_[zFractionIdx] = "ZFraction";
}
if constexpr (has_polymer_) {
names_[polymerConcentrationIdx] = "Polymer";
}
if constexpr (has_polymermw_) {
assert(has_polymer_);
names_[polymerMoleWeightIdx] = "MolecularWeightP";
}
if constexpr (has_energy_) {
names_[temperatureIdx] = "Energy";
}
if constexpr (has_foam_) {
names_[foamConcentrationIdx] = "Foam";
}
if constexpr (has_brine_) {
names_[saltConcentrationIdx] = "Brine";
}
if constexpr (has_micp_) {
names_[microbialConcentrationIdx] = "Microbes";
names_[oxygenConcentrationIdx] = "Oxygen";
names_[ureaConcentrationIdx] = "Urea";
names_[biofilmConcentrationIdx] = "Biofilm";
names_[calciteConcentrationIdx] = "Calcite";
}
}
const std::string& name(const int compIdx) const
{
return this->names_[compIdx];
}
private:
std::vector<std::string> names_{};
};
// --------- Public methods ---------
/// Construct the model. It will retain references to the

99
opm/simulators/utils/ComponentName.hpp Normal file
View File

@ -0,0 +1,99 @@
/*
Copyright 2013, 2015 SINTEF ICT, Applied Mathematics.
Copyright 2014, 2015 Dr. Blatt - HPC-Simulation-Software & Services
Copyright 2014, 2015 Statoil ASA.
Copyright 2015 NTNU
Copyright 2015, 2016, 2017 IRIS AS
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef COMPONENT_NAME_HPP
#define COMPONENT_NAME_HPP
#include <string>
#include <vector>
namespace Opm {
template<class FluidSystem, class Indices>
class ComponentName
{
public:
ComponentName()
: names_(Indices::numEq)
{
for (unsigned phaseIdx = 0; phaseIdx < FluidSystem::numPhases; ++phaseIdx) {
if (!FluidSystem::phaseIsActive(phaseIdx)) {
continue;
}
const unsigned canonicalCompIdx = FluidSystem::solventComponentIndex(phaseIdx);
names_[Indices::canonicalToActiveComponentIndex(canonicalCompIdx)]
= FluidSystem::componentName(canonicalCompIdx);
}
if constexpr (Indices::enableSolvent) {
names_[Indices::solventSaturationIdx] = "Solvent";
}
if constexpr (Indices::enableExtbo) {
names_[Indices::zFractionIdx] = "ZFraction";
}
if constexpr (Indices::enablePolymer) {
names_[Indices::polymerConcentrationIdx] = "Polymer";
}
if constexpr (Indices::polymerMoleWeightIdx >= 0) {
assert(Indices::enablePolymer);
names_[Indices::polymerMoleWeightIdx] = "MolecularWeightP";
}
if constexpr (Indices::enableEnergy) {
names_[Indices::temperatureIdx] = "Energy";
}
if constexpr (Indices::numFoam == 1) {
names_[Indices::foamConcentrationIdx] = "Foam";
}
if constexpr (Indices::numBrine == 1) {
names_[Indices::saltConcentrationIdx] = "Brine";
}
if constexpr (Indices::enableMICP) {
names_[Indices::microbialConcentrationIdx] = "Microbes";
names_[Indices::oxygenConcentrationIdx] = "Oxygen";
names_[Indices::ureaConcentrationIdx] = "Urea";
names_[Indices::biofilmConcentrationIdx] = "Biofilm";
names_[Indices::calciteConcentrationIdx] = "Calcite";
}
}
const std::string& name(const int compIdx) const
{
return this->names_[compIdx];
}
private:
std::vector<std::string> names_{};
};
} // namespace Opm
#endif