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 #3031 from totto82/relperm_diag

Browse Source 
Removing explicit usage of the Grid in the relperm diagnostics
This commit is contained in:
Bård Skaflestad
2021-01-27 09:18:16 +01:00
committed by GitHub
parent 358620120e d4f5398af6
commit 27a11508ae
7 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -407,7 +407,6 @@ namespace Opm
setupParallelism();
setupEbosSimulator();
runDiagnostics();
createSimulator();
// if run, do the actual work, else just initialize
@@ -545,35 +544,6 @@ namespace Opm
const Schedule& schedule() const
{ return ebosSimulator_->vanguard().schedule(); }
// Run diagnostics.
// Writes to:
// OpmLog singleton.
void runDiagnostics()
{
if (!this->output_cout_) {
return;
}
// Run relperm diagnostics if we have more than one phase.
if (FluidSystem::numActivePhases() > 1) {
RelpermDiagnostics diagnostic;
if (mpi_size_ > 1) {
#if HAVE_MPI
this->grid().switchToGlobalView();
static_cast<ParallelEclipseState&>(this->eclState()).switchToGlobalProps();
#endif
}
diagnostic.diagnosis(eclState(), this->grid());
if (mpi_size_ > 1) {
#if HAVE_MPI
this->grid().switchToDistributedView();
static_cast<ParallelEclipseState&>(this->eclState()).switchToDistributedProps();
#endif
}
}
}
// Run the simulator.
int runSimulator()
{