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

Merge pull request #4730 from akva2/blackoilmodelebos_janitoring

Browse Source 
BlackoilModelEbos: some janitoring
This commit is contained in:
Bård Skaflestad 2023-06-30 10:59:32 +02:00 committed by GitHub
commit 77baad7243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebos/eclbaseaquifermodel.hh
View File

@ -27,10 +27,12 @@
#ifndef EWOMS_ECL_BASE_AQUIFER_MODEL_HH #ifndef EWOMS_ECL_BASE_AQUIFER_MODEL_HH
#define EWOMS_ECL_BASE_AQUIFER_MODEL_HH #define EWOMS_ECL_BASE_AQUIFER_MODEL_HH
#include <opm/output/data/Aquifer.hpp> #include <opm/models/discretization/common/fvbaseproperties.hh>
#include <opm/models/utils/basicproperties.hh>
#include <opm/models/utils/propertysystem.hh> #include <opm/models/utils/propertysystem.hh>
#include <opm/output/data/Aquifer.hpp>
#include <exception> #include <exception>
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>

2
opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
View File

@ -22,6 +22,8 @@
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <fmt/format.h>
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>

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

@ -25,7 +25,6 @@
#define OPM_BLACKOILMODELEBOS_HEADER_INCLUDED #define OPM_BLACKOILMODELEBOS_HEADER_INCLUDED
#include <ebos/eclproblem.hh> #include <ebos/eclproblem.hh>
#include <opm/models/utils/start.hh>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/common/Exceptions.hpp> #include <opm/common/Exceptions.hpp>
@ -52,13 +51,11 @@
#include <opm/simulators/timestepping/SimulatorReport.hpp> #include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp> #include <opm/simulators/timestepping/SimulatorTimer.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp> #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/simulators/utils/ParallelCommunication.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp> #include <opm/simulators/wells/BlackoilWellModel.hpp>
#include <opm/simulators/wells/WellConnectionAuxiliaryModule.hpp> #include <opm/simulators/wells/WellConnectionAuxiliaryModule.hpp>
#include <dune/istl/owneroverlapcopy.hh>
#include <dune/common/parallel/communication.hh>
#include <dune/common/timer.hh> #include <dune/common/timer.hh>
#include <dune/common/unused.hh>
#include <fmt/format.h> #include <fmt/format.h>
@ -66,9 +63,9 @@
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
#include <iomanip> #include <iomanip>
#include <iostream>
#include <limits> #include <limits>
#include <type_traits> #include <type_traits>
#include <tuple>
#include <utility> #include <utility>
#include <vector> #include <vector>
@ -161,7 +158,7 @@ namespace Opm {
{ {
public: public:
// --------- Types and enums --------- // --------- Types and enums ---------
typedef BlackoilModelParametersEbos<TypeTag> ModelParameters; using ModelParameters = BlackoilModelParametersEbos<TypeTag>;
using Simulator = GetPropType<TypeTag, Properties::Simulator>; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
@ -173,42 +170,42 @@ namespace Opm {
using Indices = GetPropType<TypeTag, Properties::Indices>; using Indices = GetPropType<TypeTag, Properties::Indices>;
using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>; using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef double Scalar; static constexpr int numEq = Indices::numEq;
static const int numEq = Indices::numEq; static constexpr int contiSolventEqIdx = Indices::contiSolventEqIdx;
static const int contiSolventEqIdx = Indices::contiSolventEqIdx; static constexpr int contiZfracEqIdx = Indices::contiZfracEqIdx;
static const int contiZfracEqIdx = Indices::contiZfracEqIdx; static constexpr int contiPolymerEqIdx = Indices::contiPolymerEqIdx;
static const int contiPolymerEqIdx = Indices::contiPolymerEqIdx; static constexpr int contiEnergyEqIdx = Indices::contiEnergyEqIdx;
static const int contiEnergyEqIdx = Indices::contiEnergyEqIdx; static constexpr int contiPolymerMWEqIdx = Indices::contiPolymerMWEqIdx;
static const int contiPolymerMWEqIdx = Indices::contiPolymerMWEqIdx; static constexpr int contiFoamEqIdx = Indices::contiFoamEqIdx;
static const int contiFoamEqIdx = Indices::contiFoamEqIdx; static constexpr int contiBrineEqIdx = Indices::contiBrineEqIdx;
static const int contiBrineEqIdx = Indices::contiBrineEqIdx; static constexpr int contiMicrobialEqIdx = Indices::contiMicrobialEqIdx;
static const int contiMicrobialEqIdx = Indices::contiMicrobialEqIdx; static constexpr int contiOxygenEqIdx = Indices::contiOxygenEqIdx;
static const int contiOxygenEqIdx = Indices::contiOxygenEqIdx; static constexpr int contiUreaEqIdx = Indices::contiUreaEqIdx;
static const int contiUreaEqIdx = Indices::contiUreaEqIdx; static constexpr int contiBiofilmEqIdx = Indices::contiBiofilmEqIdx;
static const int contiBiofilmEqIdx = Indices::contiBiofilmEqIdx; static constexpr int contiCalciteEqIdx = Indices::contiCalciteEqIdx;
static const int contiCalciteEqIdx = Indices::contiCalciteEqIdx; static constexpr int solventSaturationIdx = Indices::solventSaturationIdx;
static const int solventSaturationIdx = Indices::solventSaturationIdx; static constexpr int zFractionIdx = Indices::zFractionIdx;
static const int zFractionIdx = Indices::zFractionIdx; static constexpr int polymerConcentrationIdx = Indices::polymerConcentrationIdx;
static const int polymerConcentrationIdx = Indices::polymerConcentrationIdx; static constexpr int polymerMoleWeightIdx = Indices::polymerMoleWeightIdx;
static const int polymerMoleWeightIdx = Indices::polymerMoleWeightIdx; static constexpr int temperatureIdx = Indices::temperatureIdx;
static const int temperatureIdx = Indices::temperatureIdx; static constexpr int foamConcentrationIdx = Indices::foamConcentrationIdx;
static const int foamConcentrationIdx = Indices::foamConcentrationIdx; static constexpr int saltConcentrationIdx = Indices::saltConcentrationIdx;
static const int saltConcentrationIdx = Indices::saltConcentrationIdx; static constexpr int microbialConcentrationIdx = Indices::microbialConcentrationIdx;
static const int microbialConcentrationIdx = Indices::microbialConcentrationIdx; static constexpr int oxygenConcentrationIdx = Indices::oxygenConcentrationIdx;
static const int oxygenConcentrationIdx = Indices::oxygenConcentrationIdx; static constexpr int ureaConcentrationIdx = Indices::ureaConcentrationIdx;
static const int ureaConcentrationIdx = Indices::ureaConcentrationIdx; static constexpr int biofilmConcentrationIdx = Indices::biofilmConcentrationIdx;
static const int biofilmConcentrationIdx = Indices::biofilmConcentrationIdx; static constexpr int calciteConcentrationIdx = Indices::calciteConcentrationIdx;
static const int calciteConcentrationIdx = Indices::calciteConcentrationIdx;
typedef Dune::FieldVector<Scalar, numEq > VectorBlockType; using VectorBlockType = Dune::FieldVector<Scalar, numEq>;
typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType; using MatrixBlockType = typename SparseMatrixAdapter::MatrixBlock;
typedef typename SparseMatrixAdapter::IstlMatrix Mat; using Mat = typename SparseMatrixAdapter::IstlMatrix;
typedef Dune::BlockVector<VectorBlockType> BVector; using BVector = Dune::BlockVector<VectorBlockType>;
using Domain = SubDomain<Grid>; using Domain = SubDomain<Grid>;
typedef ISTLSolverEbos<TypeTag> ISTLSolverType; using ISTLSolverType = ISTLSolverEbos<TypeTag>;
class ComponentName class ComponentName
{ {
@ -273,8 +270,6 @@ namespace Opm {
std::vector<std::string> names_{}; std::vector<std::string> names_{};
}; };
//typedef typename SolutionVector :: value_type PrimaryVariables ;
// --------- Public methods --------- // --------- Public methods ---------
/// Construct the model. It will retain references to the /// Construct the model. It will retain references to the
@ -437,7 +432,7 @@ namespace Opm {
std::fill(wasSwitched_.begin(), wasSwitched_.end(), false); std::fill(wasSwitched_.begin(), wasSwitched_.end(), false);
if (param_.update_equations_scaling_) { if (param_.update_equations_scaling_) {
std::cout << "equation scaling not supported yet" << std::endl; OpmLog::error("Equation scaling not supported");
//updateEquationsScaling(); //updateEquationsScaling();
} }
@ -934,15 +929,6 @@ namespace Opm {
void printIf(int c, double x, double y, double eps, std::string type) {
if (std::abs(x-y) > eps) {
std::cout << type << " " <<c << ": "<<x << " " << y << std::endl;
}
}
/// Called once after each time step. /// Called once after each time step.
/// In this class, this function does nothing. /// In this class, this function does nothing.
/// \param[in] timer simulation timer /// \param[in] timer simulation timer
@ -1171,8 +1157,7 @@ namespace Opm {
return terminal_output_; return terminal_output_;
} }
template <class CollectiveCommunication> std::tuple<double,double> convergenceReduction(Parallel::Communication comm,
std::tuple<double,double> convergenceReduction(const CollectiveCommunication& comm,
const double pvSumLocal, const double pvSumLocal,
const double numAquiferPvSumLocal, const double numAquiferPvSumLocal,
std::vector< Scalar >& R_sum, std::vector< Scalar >& R_sum,
@ -1711,7 +1696,7 @@ namespace Opm {
std::vector<Scalar>& residual_norms) std::vector<Scalar>& residual_norms)
{ {
OPM_TIMEBLOCK(getReservoirConvergence); OPM_TIMEBLOCK(getReservoirConvergence);
typedef std::vector< Scalar > Vector; using Vector = std::vector<Scalar>;
const int numComp = numEq; const int numComp = numEq;
Vector R_sum(numComp, 0.0 ); Vector R_sum(numComp, 0.0 );

2
opm/simulators/flow/FlowMainEbos.hpp
View File

@ -29,6 +29,8 @@
#include <opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp> #include <opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp>
#include <opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp> #include <opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/models/utils/start.hh>
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh> #include <dune/fem/misc/mpimanager.hh>
#else #else