From 709a90b67d66d5e75cc3b8e365c3528a0b21d3ce Mon Sep 17 00:00:00 2001
From: Elyes Ahmed <elyes.ahmed@sintef.no>
Date: Fri, 23 Sep 2022 11:59:01 +0200
Subject: [PATCH] some fixes for flow_alugrid

---
 ebos/equil/initstateequil.cc   | 37 +++++++++++++++++++++++++++++++++-
 flow/flow_blackoil_alugrid.cpp |  2 +-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ebos/equil/initstateequil.cc b/ebos/equil/initstateequil.cc
index adc7bf058..4a16dcb1e 100644
--- a/ebos/equil/initstateequil.cc
+++ b/ebos/equil/initstateequil.cc
@@ -58,6 +58,11 @@
 #include <ebos/femcpgridcompat.hh>
 #endif
 
+#if HAVE_DUNE_ALUGRID
+#include <dune/alugrid/grid.hh>
+#include <dune/alugrid/3d/gridview.hh>
+#endif // HAVE_DUNE_ALUGRID
+
 namespace Opm {
 namespace EQUIL {
 
@@ -1901,12 +1906,29 @@ using GridView = Dune::Fem::GridPart2GridViewImpl<
 using GridView = Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>;
 #endif
 
+#if HAVE_DUNE_ALUGRID
+
+#if HAVE_MPI
+    using ALUGrid3CN = Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming, Dune::ALUGridMPIComm>;
+#else
+    using ALUGrid3CN = Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming, Dune::ALUGridNoComm>;
+#endif //HAVE_MPI
+#endif //HAVE_DUNE_ALUGRID
 using Mapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
 template class InitialStateComputer<BlackOilFluidSystem<double>,
                                     Dune::CpGrid,
                                     GridView,
                                     Mapper,
                                     Dune::CartesianIndexMapper<Dune::CpGrid>>;
+#if HAVE_DUNE_ALUGRID
+using ALUGridView = Dune::GridView<Dune::ALU3dLeafGridViewTraits<const ALUGrid3CN, Dune::PartitionIteratorType(4)>>;
+using ALUGridMapper = Dune::MultipleCodimMultipleGeomTypeMapper<ALUGridView>;
+template class InitialStateComputer<BlackOilFluidSystem<double>,
+                                    ALUGrid3CN,
+                                    ALUGridView,
+                                    ALUGridMapper,
+                                    Dune::CartesianIndexMapper<ALUGrid3CN>>;
+#endif //HAVE_DUNE_ALUGRID
 
 using MatLaw = EclMaterialLawManager<ThreePhaseMaterialTraits<double,0,1,2>>;
 template InitialStateComputer<BlackOilFluidSystem<double>,
@@ -1922,7 +1944,20 @@ template InitialStateComputer<BlackOilFluidSystem<double>,
                          const double,
                          const bool);
 
-
+#if HAVE_DUNE_ALUGRID
+template InitialStateComputer<BlackOilFluidSystem<double>,
+                              ALUGrid3CN,
+                              ALUGridView,
+                              ALUGridMapper,
+                              Dune::CartesianIndexMapper<ALUGrid3CN>>::
+    InitialStateComputer(MatLaw&,
+                         const EclipseState&,
+                         const ALUGrid3CN&,
+                         const ALUGridView&,
+                         const Dune::CartesianIndexMapper<ALUGrid3CN>&,
+                         const double,
+                         const bool);
+#endif //HAVE_DUNE_ALUGRID
 } // namespace DeckDependent
 
 namespace Details {
diff --git a/flow/flow_blackoil_alugrid.cpp b/flow/flow_blackoil_alugrid.cpp
index ded026168..dd573f223 100644
--- a/flow/flow_blackoil_alugrid.cpp
+++ b/flow/flow_blackoil_alugrid.cpp
@@ -30,7 +30,7 @@ namespace Opm::Properties {
 // by default use the dummy aquifer "model"
 template<class TypeTag>
 struct EclAquiferModel<TypeTag, TTag::EclFlowProblemAlugrid> {
-    using type = Opm::EclBaseAquiferModel<TypeTag>;
+    using type = Opm::BlackoilAquiferModel<TypeTag>;
 };
 // Enable aquifers by default in experimental mode
 template<class TypeTag>