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

Merge pull request #1633 from akva2/rogue_and_unwanted

Browse Source 
Remove some rogue includes and unwanted opm/autodiff/GridHelpers.hpp usage
This commit is contained in:
Andreas Lauser 2018-11-14 16:00:30 +01:00 committed by GitHub
commit e110fac52a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/AquiferCarterTracy.hpp
View File

@ -257,7 +257,7 @@ namespace Opm
Scalar faceArea;
auto cell2Faces = Opm::UgGridHelpers::cell2Faces(ugrid);
auto faceCells = Opm::AutoDiffGrid::faceCells(ugrid);
auto faceCells = Opm::UgGridHelpers::faceCells(ugrid);
// Translate the C face tag into the enum used by opm-parser's TransMult class
Opm::FaceDir::DirEnum faceDirection;

2
opm/autodiff/BlackoilWellModel.hpp
View File

@ -42,8 +42,6 @@
#include <opm/core/simulator/SimulatorReport.hpp>
#include <opm/autodiff/VFPInjProperties.hpp>
#include <opm/autodiff/VFPProdProperties.hpp>
#include <opm/autodiff/WellHelpers.hpp>
#include <opm/autodiff/WellDensitySegmented.hpp>
#include <opm/autodiff/BlackoilDetails.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/autodiff/RateConverter.hpp>

1
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -27,7 +27,6 @@
#include <opm/autodiff/BlackoilModelEbos.hpp>
#include <opm/autodiff/BlackoilModelParametersEbos.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/autodiff/BlackoilWellModel.hpp>
#include <opm/autodiff/BlackoilAquiferModel.hpp>
#include <opm/autodiff/moduleVersion.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>

2
opm/autodiff/createGlobalCellArray.hpp
View File

@ -19,7 +19,7 @@
#ifndef OPM_CREATE_GLOBAL_CELL_ARRAY_HPP
#define OPM_CREATE_GLOBAL_CELL_ARRAY_HPP
#include <opm/autodiff/GridHelpers.hpp>
#include <opm/grid/GridHelpers.hpp>
namespace Opm
{

5
tests/test_wellmodel.cpp
View File

@ -36,21 +36,18 @@
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/grid/UnstructuredGrid.h>
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/wells.h>
#include <opm/core/wells/DynamicListEconLimited.hpp>
#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
#include <opm/autodiff/GridHelpers.hpp>
#include <opm/grid/GridHelpers.hpp>
#include <opm/autodiff/FlowMainEbos.hpp>
#include <opm/autodiff/BlackoilModelEbos.hpp>
#include <opm/autodiff/createGlobalCellArray.hpp>
#include <opm/autodiff/GridInit.hpp>
#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
#include <ebos/eclproblem.hh>
#include <ewoms/common/start.hh>