diff --git a/ebos/equil/initstateequil.cc b/ebos/equil/initstateequil.cc index adc7bf058..3e23a3f24 100644 --- a/ebos/equil/initstateequil.cc +++ b/ebos/equil/initstateequil.cc @@ -58,6 +58,11 @@ #include #endif +#if HAVE_DUNE_ALUGRID +#include +#include +#endif // HAVE_DUNE_ALUGRID + namespace Opm { namespace EQUIL { @@ -1920,7 +1925,35 @@ template InitialStateComputer, const GridView&, const Dune::CartesianIndexMapper&, const double, + const bool); +#if HAVE_DUNE_ALUGRID +#if HAVE_MPI +using ALUGridComm = Dune::ALUGridMPIComm; +#else +using ALUGridComm = Dune::ALUGridNoComm; +#endif //HAVE_MPI +using ALUGrid3CN = Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming, ALUGridComm>; +using ALUGridView = Dune::GridView>; +using ALUGridMapper = Dune::MultipleCodimMultipleGeomTypeMapper; +template class InitialStateComputer, + ALUGrid3CN, + ALUGridView, + ALUGridMapper, + Dune::CartesianIndexMapper>; + +template InitialStateComputer, + ALUGrid3CN, + ALUGridView, + ALUGridMapper, + Dune::CartesianIndexMapper>:: + InitialStateComputer(MatLaw&, + const EclipseState&, + const ALUGrid3CN&, + const ALUGridView&, + const Dune::CartesianIndexMapper&, + const double, const bool); +#endif //HAVE_DUNE_ALUGRID } // namespace DeckDependent diff --git a/flow/flow_blackoil_alugrid.cpp b/flow/flow_blackoil_alugrid.cpp index ded026168..db6885b17 100644 --- a/flow/flow_blackoil_alugrid.cpp +++ b/flow/flow_blackoil_alugrid.cpp @@ -19,26 +19,19 @@ #include "config.h" #include -namespace Opm::Properties { - namespace TTag { - struct EclFlowProblemAlugrid { - using InheritsFrom = std::tuple; - }; - } - - -// by default use the dummy aquifer "model" -template -struct EclAquiferModel { - using type = Opm::EclBaseAquiferModel; +namespace Opm { +namespace Properties { +namespace TTag { +struct EclFlowProblemAlugrid { + using InheritsFrom = std::tuple; }; -// Enable aquifers by default in experimental mode +} template struct EclEnableAquifers { static constexpr bool value = false; }; } - +} int main(int argc, char** argv) { using TypeTag = Opm::Properties::TTag::EclFlowProblemAlugrid;