OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove Deck argument to RelpermDiagnostic

Browse Source
This commit is contained in:
Joakim Hove
2020-03-13 08:54:30 +01:00
parent 3c6c889623
commit 8473aa38e5
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebos/eclbasevanguard.hh
+1 -1
View File
@@ -552,7 +552,7 @@ protected:
if (enableExperiments) { if (enableExperiments) {
Opm::RelpermDiagnostics relpermDiagnostics; Opm::RelpermDiagnostics relpermDiagnostics;
relpermDiagnostics.diagnosis(*eclState_, *deck_, asImp_().grid()); relpermDiagnostics.diagnosis(*eclState_, asImp_().grid());
} }
} }
private: private:
opm/core/props/satfunc/RelpermDiagnostics.hpp
+1 -5
View File
@@ -29,7 +29,6 @@
#include <opm/common/utility/numeric/linearInterpolation.hpp> #include <opm/common/utility/numeric/linearInterpolation.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp>
@@ -52,11 +51,9 @@ namespace Opm {
///eclipse data file. Errors and warings will be ///eclipse data file. Errors and warings will be
///output if they're found. ///output if they're found.
///\param[in] eclState eclipse state. ///\param[in] eclState eclipse state.
///\param[in] deck ecliplise data file.
///\param[in] grid unstructured grid. ///\param[in] grid unstructured grid.
template <class GridT> template <class GridT>
void diagnosis(const EclipseState& eclState, void diagnosis(const EclipseState& eclState,
const Deck& deck,
const GridT& grid); const GridT& grid);
private: private:
@@ -95,8 +92,7 @@ namespace Opm {
void unscaledEndPointsCheck_(const EclipseState& eclState); void unscaledEndPointsCheck_(const EclipseState& eclState);
template <class GridT> template <class GridT>
void scaledEndPointsCheck_(const Deck& deck, void scaledEndPointsCheck_(const EclipseState& eclState,
const EclipseState& eclState,
const GridT& grid); const GridT& grid);
///For every table, need to deal with case by case. ///For every table, need to deal with case by case.
opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
+2 -4
View File
@@ -33,7 +33,6 @@ namespace Opm {
template <class GridT> template <class GridT>
void RelpermDiagnostics::diagnosis(const Opm::EclipseState& eclState, void RelpermDiagnostics::diagnosis(const Opm::EclipseState& eclState,
const Opm::Deck& deck,
const GridT& grid) const GridT& grid)
{ {
OpmLog::info("\n===============Saturation Functions Diagnostics===============\n"); OpmLog::info("\n===============Saturation Functions Diagnostics===============\n");
@@ -41,12 +40,11 @@ namespace Opm {
satFamilyCheck_(eclState); satFamilyCheck_(eclState);
tableCheck_(eclState); tableCheck_(eclState);
unscaledEndPointsCheck_(eclState); unscaledEndPointsCheck_(eclState);
scaledEndPointsCheck_(deck, eclState, grid); scaledEndPointsCheck_(eclState, grid);
} }
template <class GridT> template <class GridT>
void RelpermDiagnostics::scaledEndPointsCheck_(const Deck& deck, void RelpermDiagnostics::scaledEndPointsCheck_(const EclipseState& eclState,
const EclipseState& eclState,
const GridT& grid) const GridT& grid)
{ {
// All end points are subject to round-off errors, checks should account for it // All end points are subject to round-off errors, checks should account for it
opm/simulators/flow/FlowMainEbos.hpp
+1 -1
View File
@@ -454,7 +454,7 @@ namespace Opm
this->grid().switchToGlobalView(); this->grid().switchToGlobalView();
static_cast<ParallelEclipseState&>(this->eclState()).switchToGlobalProps(); static_cast<ParallelEclipseState&>(this->eclState()).switchToGlobalProps();
} }
diagnostic.diagnosis(eclState(), deck(), this->grid()); diagnostic.diagnosis(eclState(), this->grid());
if (mpi_size_ > 1) { if (mpi_size_ > 1) {
this->grid().switchToDistributedView(); this->grid().switchToDistributedView();
static_cast<ParallelEclipseState&>(this->eclState()).switchToDistributedProps(); static_cast<ParallelEclipseState&>(this->eclState()).switchToDistributedProps();
tests/test_relpermdiagnostics.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE(diagnosis)
std::shared_ptr<CounterLog> counterLog = std::make_shared<CounterLog>(Log::DefaultMessageTypes); std::shared_ptr<CounterLog> counterLog = std::make_shared<CounterLog>(Log::DefaultMessageTypes);
OpmLog::addBackend( "COUNTERLOG" , counterLog ); OpmLog::addBackend( "COUNTERLOG" , counterLog );
RelpermDiagnostics diagnostics; RelpermDiagnostics diagnostics;
diagnostics.diagnosis(eclState, deck, grid); diagnostics.diagnosis(eclState, grid);
BOOST_CHECK_EQUAL(1, counterLog->numMessages(Log::MessageType::Warning)); BOOST_CHECK_EQUAL(1, counterLog->numMessages(Log::MessageType::Warning));
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()