Fix Build in Reduced Environment

In particular, include <config.h> to make the Dune Version macros do the right thing. Add some missing parameters, and relax requirement that dune-pdelab is available.
hnil · Dec 17, 2024 · c38827a · c38827a
1 parent 69de69a
commit c38827a
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -283,15 +283,17 @@ if(USE_TRACY_PROFILER AND Tracy_FOUND)
 	target_link_libraries(test_vem_assembly Tracy::TracyClient)
 endif()
 
-opm_add_test(testpdelab
-	 ONLY_COMPILE
-	 ALWAYS_ENABLE
-	 DEPENDS opmsimulators opmupscaling
-	 LIBRARIES opmsimulators opmupscaling
-	 SOURCES
-	 examples/testpdelab.cpp
-	 $<TARGET_OBJECTS:moduleVersionGeoMech>
-)
+
+#opm_add_test(testpdelab
+#	 ONLY_COMPILE
+#	 ALWAYS_ENABLE
+#	 DEPENDS opmsimulators opmupscaling
+#	 LIBRARIES opmsimulators opmupscaling
+#	 SOURCES
+#	 examples/testpdelab.cpp
+#	 $<TARGET_OBJECTS:moduleVersionGeoMech>
+#)
+
 
 opm_add_test(test_foamgrid
 	 ONLY_COMPILE
@@ -304,15 +306,15 @@ opm_add_test(test_foamgrid
 	 )
 
 
-opm_add_test(test_fracture
-	 ONLY_COMPILE
-	 ALWAYS_ENABLE
-	 DEPENDS opmsimulators opmupscaling
-	 LIBRARIES opmsimulators opmupscaling
-	 SOURCES
-	 examples/test_fracture.cpp
-	 $<TARGET_OBJECTS:moduleVersionGeoMech>
-)
+#opm_add_test(test_fracture
+#	 ONLY_COMPILE
+#	 ALWAYS_ENABLE
+#	 DEPENDS opmsimulators opmupscaling
+#	 LIBRARIES opmsimulators opmupscaling
+#	 SOURCES
+#	 examples/test_fracture.cpp
+#	 $<TARGET_OBJECTS:moduleVersionGeoMech>
+#)
 
 opm_add_test(plot_reservoir_vtk
 	 ONLY_COMPILE

diff --git a/examples/coupled_standalone_test.cpp b/examples/coupled_standalone_test.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <iostream>
 #include <fstream>
 #include <vector>

diff --git a/examples/flow_energy_geomech_polygrid.cpp b/examples/flow_energy_geomech_polygrid.cpp
@@ -43,7 +43,6 @@
 #include <opm/simulators/flow/GenericThresholdPressure_impl.hpp>
 #include <opm/simulators/flow/GenericTracerModel_impl.hpp>
 #include <opm/simulators/flow/Transmissibility_impl.hpp>
-#include <opm/simulators/utils/GridDataOutput_impl.hpp>
 
 #include "MechTypeTag.hpp"
 

diff --git a/examples/paramtest.cpp b/examples/paramtest.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include "opm/geomech/param_interior.hpp"
 #include "opm/geomech/GridStretcher.hpp"
 

diff --git a/examples/single_fracture_sim.cpp b/examples/single_fracture_sim.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <iostream>
 #include <fstream>
 

diff --git a/examples/standalone_sim_test.cpp b/examples/standalone_sim_test.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <cstddef>
 #include <dune/common/exceptions.hh>
 #include <dune/istl/solvercategory.hh>

diff --git a/examples/test_elasticity.cpp b/examples/test_elasticity.cpp
@@ -265,11 +265,12 @@ int run(Params& p, const std::string& name)
     }else{
         esolver.setBodyForce(0.0);
     }
+    const auto reduce_boundary = true;
     bool do_matrix = true;//assemble matrix
     bool do_vector = true;//assemble matrix
     esolver.fixNodes(bc_nodes);
     esolver.initForAssembly();
-    esolver.assemble(pressforce, do_matrix, do_vector);
+    esolver.assemble(pressforce, do_matrix, do_vector, reduce_boundary);
     esolver.updateRhsWithGrad(pressforce);
     Opm::PropertyTree prm("mechsolver.json");
     esolver.setupSolver(prm);

diff --git a/examples/test_gridstretch.cpp b/examples/test_gridstretch.cpp
@@ -1,14 +1,11 @@
+#include <config.h>
+
 #include "opm/geomech/GridStretcher.hpp"
 
 #include <dune/grid/io/file/gmshreader.hh>
 #include <dune/foamgrid/foamgrid.hh>
 #include <dune/grid/io/file/vtk/vtkwriter.hh>
 
-#include <vector>
-#include <string>
-#include <iostream>
-#include <iterator>
-
 #include "opm/geomech/param_interior.hpp"
 #include "opm/geomech/GridStretcher.hpp"
 
@@ -21,7 +18,10 @@
 
 #include <dune/grid/io/file/vtk/vtkwriter.hh>
 
-
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace Opm;

diff --git a/examples/test_parallelgrid_grdecl.cpp b/examples/test_parallelgrid_grdecl.cpp
@@ -12,11 +12,14 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
 # define DISABLE_ALUGRID_SFC_ORDERING 1
+
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 
 #include <dune/common/exceptions.hh> // We use exceptions
 #include <dune/common/version.hh>
+
 #include <dune/grid/utility/structuredgridfactory.hh>
 #include <dune/grid/io/file/vtk/vtkwriter.hh>
 //#include <dune/grid/io/file/vtk/subsampleingvtkwriter.hh>
@@ -30,19 +33,25 @@
 
 #include <dune/common/version.hh>
 #include <dune/common/parallel/mpihelper.hh>
+
 #include <opm/grid/polyhedralgrid.hh>
+
 #include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/Parser/Parser.hpp>
 #include <opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.hpp>
+
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
+
 #include <opm/input/eclipse/Python/Python.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
+
 #if HAVE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #include <dune/alugrid/common/fromtogridfactory.hh>
 #endif
+
 #include <opm/grid/utility/StopWatch.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 
@@ -52,13 +61,12 @@
 #include <opm/elasticity/matrixops.hpp>
 #include <dune/grid/utility/globalindexset.hh>
 
+#include "vectorfunctions.hh"
 #include <cstring>
 #include <iostream>
-#include "vectorfunctions.hh"
-#include <unistd.h>
-#include <opm/geomech/boundaryutils.hh>
 #include <unistd.h>
 
+#include <opm/geomech/boundaryutils.hh>
 #include <opm/geomech/dune_utilities.hpp>
 #include <opm/geomech/DuneCommunicationHelpers.hpp>
 

diff --git a/examples/test_vem_assembly.cpp b/examples/test_vem_assembly.cpp
@@ -131,14 +131,16 @@ int main(int argc, char** argv)
   const int num_neumann_faces = 0;
 
   // assemble the mechanical system
+  const auto reduce_boundary = true;
+
   vector<tuple<int, int, double>> A_entries;
   vector<double> b;
   const int numdof =
     vem::assemble_mech_system_3D(&coords[0], num_cells, &num_cell_faces[0], &num_face_corners[0],
                                  &face_corners[0], &young[0], &poisson[0], &body_force[0],
                                  num_fixed_dofs, &fixed_dof_ixs[0], &fixed_dof_values[0],
                                  num_neumann_faces, nullptr, nullptr,
-                                 A_entries, b);
+                                 A_entries, b, reduce_boundary);
 
   // view matrix
 

diff --git a/opm-flowgeomechanics-prereqs.cmake b/opm-flowgeomechanics-prereqs.cmake
@@ -27,7 +27,7 @@ set (opm-flowgeomechanics_DEPS
   # DUNE prerequisites
   "dune-common REQUIRED"
   "dune-istl REQUIRED"
-  "dune-pdelab REQUIRED"
+  "dune-pdelab"
   "dune-foamgrid REQUIRED"
   # matrix library
   "BLAS REQUIRED"

diff --git a/opm/geomech/eclproblemgeomech.hh b/opm/geomech/eclproblemgeomech.hh
@@ -340,9 +340,9 @@ namespace Opm{
             // alwas rebuild wells
             sim_update.well_structure_changed = true;
             this->actionHandler_.applySimulatorUpdate(reportStep,
-                                                      sim_update,                  
+                                                      sim_update,
                                                       updateTrans,
-						      commit_wellstate);
+                                                      commit_wellstate);
             if (commit_wellstate) {
                 this->wellModel().commitWGState();
             }