OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-23 07:53:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixing grid_index for AquiferFetkovich

Browse Source
This commit is contained in:
WesselDeZeeuw 2019-01-03 13:50:18 +01:00
parent 73445a3055
commit 1b5e65eedd
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/autodiff/AquiferFetkovich.hpp
View File

@ -33,6 +33,7 @@ along with OPM. If not, see <http://www.gnu.org/licenses/>.
#include <vector>
#include <algorithm>
#include <unordered_map>
namespace Opm
{
@ -64,9 +65,11 @@ namespace Opm
AquiferFetkovich( const Aquifetp::AQUFETP_data& aqufetp_data,
const Aquancon::AquanconOutput& connection,
const std::unordered_map<int, int>& cartesian_to_compressed,
const Simulator& ebosSimulator)
: ebos_simulator_ (ebosSimulator)
, aqufetp_data_ (aqufetp_data)
, cartesian_to_compressed_(cartesian_to_compressed)
, connection_ (connection)
{}
@ -125,6 +128,7 @@ namespace Opm
}
private:
const Simulator& ebos_simulator_;
const std::unordered_map<int, int>& cartesian_to_compressed_;
// Grid variables
std::vector<size_t> cell_idx_;
@ -263,9 +267,9 @@ namespace Opm
cellToConnectionIdx_.resize(ebos_simulator_.gridView().size(/*codim=*/0), -1);
for (size_t idx = 0; idx < cell_idx_.size(); ++idx)
{
cellToConnectionIdx_[cell_idx_[idx]] = idx;
auto cellFacesRange = cell2Faces[cell_idx_.at(idx)];
const int cell_index = cartesian_to_compressed_.at(cell_idx_[idx]);
cellToConnectionIdx_[cell_index] = idx;
const auto cellFacesRange = cell2Faces[cell_index];
for(auto cellFaceIter = cellFacesRange.begin(); cellFaceIter != cellFacesRange.end(); ++cellFaceIter)
{
// The index of the face in the compressed grid

9
opm/autodiff/BlackoilAquiferModel_impl.hpp
View File

@ -151,10 +151,17 @@ namespace Opm {
std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput();
assert( aquifersData.size() == aquifer_connection.size() );
const auto& ugrid = simulator_.vanguard().grid();
const auto& gridView = simulator_.gridView();
const int number_of_cells = gridView.size(0);
cartesian_to_compressed_ = cartesianToCompressed(number_of_cells,
Opm::UgGridHelpers::globalCell(ugrid));
for (size_t i = 0; i < aquifersData.size(); ++i)
{
aquifers_Fetkovich.push_back(
AquiferFetkovich<TypeTag> (aquifersData.at(i), aquifer_connection.at(i), this->simulator_)
AquiferFetkovich<TypeTag> (aquifersData.at(i), aquifer_connection.at(i),cartesian_to_compressed_, this->simulator_)
);
}
}