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 #5630 from ElyesAhmed/fix_sfc_order_alugrid

Browse Source 
add changes to fix the order
This commit is contained in:
Atgeirr Flø Rasmussen 2024-10-01 10:06:17 +02:00 committed by GitHub
commit 47e7c7c5a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flow/flow_blackoil_alugrid.cpp
View File

@ -17,6 +17,15 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <config.h> #include <config.h>
// By default, dune-ALUGrid uses Space-Filling Curve (SFC) ordering
// for cells to optimize data access patterns for adaptive mesh refinements/coarsening.
// However, if you want to use Cartesian ordering, as is used in OPM, you
// can switch to it by defining the macro #define DISABLE_SFC_ORDERING 1.
// This will change the default cell order to Cartesian.
// Note that this option is not available for pre-built or installed versions of dune-ALUGrid.
// To enable changig to Cartesian ordering, you will need to rebuild dune-ALUGrid from source, ensuring
// the build configuration allows disabling SFC ordering from OPM.
// For more details, refer to the files gridfactory.hh and aluinline.hh located in the dune-alugrid/3d/
#include <dune/alugrid/grid.hh> #include <dune/alugrid/grid.hh>
#include <opm/simulators/flow/Main.hpp> #include <opm/simulators/flow/Main.hpp>

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

@ -325,7 +325,7 @@ protected:
factory_ = std::make_unique<Factory>(); factory_ = std::make_unique<Factory>();
grid_ = factory_->convert(*equilGrid_, cartesianCellId_, ordering_); grid_ = factory_->convert(*equilGrid_, cartesianCellId_, ordering_);
OpmLog::warning("Space Filling Curve Ordering is not yet supported: DISABLE_ALUGRID_SFC_ORDERING is enabled"); OpmLog::warning("Space Filling Curve (SFC) ordering is enabled: see flow_blackoil_alugrid for more informations on disabling/enabling SFC reordering");
equilGridToGrid_.resize(ordering_.size()); equilGridToGrid_.resize(ordering_.size());
for (std::size_t index = 0; index < ordering_.size(); ++index) { for (std::size_t index = 0; index < ordering_.size(); ++index) {
equilGridToGrid_[ordering_[index]] = index; equilGridToGrid_[ordering_[index]] = index;

10
opm/simulators/flow/FlowProblem.hpp
View File

@ -451,10 +451,11 @@ public:
const auto& residual = this->model().linearizer().residual(); const auto& residual = this->model().linearizer().residual();
for (unsigned globalDofIdx = 0; globalDofIdx < residual.size(); globalDofIdx ++) { for (unsigned globalDofIdx = 0; globalDofIdx < residual.size(); globalDofIdx ++) {
this->drift_[globalDofIdx] = residual[globalDofIdx] * simulator.timeStepSize(); int sfcdofIdx = simulator.vanguard().gridEquilIdxToGridIdx(globalDofIdx);
this->drift_[sfcdofIdx] = residual[sfcdofIdx] * simulator.timeStepSize();
if constexpr (getPropValue<TypeTag, Properties::UseVolumetricResidual>()) { if constexpr (getPropValue<TypeTag, Properties::UseVolumetricResidual>()) {
this->drift_[globalDofIdx] *= this->model().dofTotalVolume(globalDofIdx); this->drift_[sfcdofIdx] *= this->model().dofTotalVolume(sfcdofIdx);
} }
} }
} }
@ -1375,14 +1376,15 @@ protected:
const auto& fp = eclState.fieldProps(); const auto& fp = eclState.fieldProps();
const std::vector<double> porvData = this -> fieldPropDoubleOnLeafAssigner_()(fp, "PORV"); const std::vector<double> porvData = this -> fieldPropDoubleOnLeafAssigner_()(fp, "PORV");
for (std::size_t dofIdx = 0; dofIdx < numDof; ++dofIdx) { for (std::size_t dofIdx = 0; dofIdx < numDof; ++dofIdx) {
int sfcdofIdx = simulator.vanguard().gridEquilIdxToGridIdx(dofIdx);
Scalar poreVolume = porvData[dofIdx]; Scalar poreVolume = porvData[dofIdx];
// we define the porosity as the accumulated pore volume divided by the // we define the porosity as the accumulated pore volume divided by the
// geometric volume of the element. Note that -- in pathetic cases -- it can // geometric volume of the element. Note that -- in pathetic cases -- it can
// be larger than 1.0! // be larger than 1.0!
Scalar dofVolume = simulator.model().dofTotalVolume(dofIdx); Scalar dofVolume = simulator.model().dofTotalVolume(sfcdofIdx);
assert(dofVolume > 0.0); assert(dofVolume > 0.0);
this->referencePorosity_[/*timeIdx=*/0][dofIdx] = poreVolume/dofVolume; this->referencePorosity_[/*timeIdx=*/0][sfcdofIdx] = poreVolume/dofVolume;
} }
} }

2
opm/simulators/wells/RateConverter.hpp
View File

@ -134,7 +134,7 @@ namespace Opm {
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
// use pore volume weighted averages. // use pore volume weighted averages.
const Scalar pv_cell = const Scalar pv_cell =
simulator.model().dofTotalVolume(cellIdx) simulator.model().dofTotalVolume(simulator.vanguard().gridEquilIdxToGridIdx(cellIdx))
* intQuants.porosity().value(); * intQuants.porosity().value();
// only count oil and gas filled parts of the domain // only count oil and gas filled parts of the domain

10
regressionTests.cmake
View File

@ -1496,19 +1496,13 @@ if(BUILD_FLOW_POLY_GRID)
DIR spe1) DIR spe1)
endif() endif()
if(dune-alugrid_FOUND AND BUILD_FLOW_ALU_GRID) if(dune-alugrid_FOUND AND BUILD_FLOW_ALU_GRID AND MPI_FOUND)
add_test_compareECLFiles(CASENAME spe12_alugrid add_test_compareECLFiles(CASENAME spe12_alugrid
FILENAME SPE1CASE2 FILENAME SPE1CASE2
SIMULATOR flow_blackoil_alugrid SIMULATOR flow_blackoil_alugrid
ABS_TOL ${abs_tol} ABS_TOL ${abs_tol}
REL_TOL ${coarse_rel_tol} REL_TOL ${coarse_rel_tol}
DIR spe1 DIR spe1)
TEST_ARGS --linear-solver=ilu0
--tolerance-mb=1e-6
--min-strict-cnv-iter=0
--local-well-solve-control-switching=false
--use-implicit-ipr=false
--enable-drift-compensation=true)
endif() endif()
if(BUILD_FLOW_FLOAT_VARIANTS) if(BUILD_FLOW_FLOAT_VARIANTS)