Merge branch 'update-ci-to-use-precice-2.2.1' into 'develop'

Fix CI and improve compatibility with DuMuX 3.4

Closes #22 and #17

See merge request !12

.gitlab-ci.yml

 #image: dumux-precice:3.3git-iterative-pr-2.2.0
-image: dumux-precice:3.3git-iterative-pr-2.2.0
+#image: dumux-precice:3.3-2.2.1
+image: ub2004-style-check:clang-10
 
 
 stages:
@@ -7,7 +8,7 @@ stages:
     - build
     - test
 
-check-style:
+check-style-clang-10:
     stage: check
     script:
         - ./scripts/format/run-clang-format.sh
@@ -15,6 +16,7 @@ check-style:
         - if [ -s style-patch.diff ]; then echo "Download the style patch as artifact and apply it or run ./scripts/format/run-clang-format.sh and commit again."; false; fi
     needs: []
     artifacts:
+        when: on_failure
         paths:
             - style-patch.diff
         expire_in: 7 day
@@ -39,22 +41,16 @@ check-style:
       - build-cmake/appl/coupling-ff-pm/fvca-iterative/Makefile
       - build-cmake/appl/coupling-ff-pm/fvca-iterative/CTestTestfile.cmake
 
-build-iterative-coupling:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
+build-iterative-coupling:3.3-2.2.1:
+  image: ub2004-dumux-precice:3.3-2.2.1
   <<: *build-iterative-coupling
 
-#build-iterative-coupling:3.3-1.6.1:
-#  image: dumux-precice:3.3-1.6.1
-#  <<: *build-iterative-coupling
-
-build-iterative-coupling:3.3-1.6.1:
-  image: ub2004-dumux-precice:3.3-2.2.1
+build-iterative-coupling:3.4-2.2.1:
+  image: ub2004-dumux-precice:3.4-2.2.1
   <<: *build-iterative-coupling
 
-build-iterative-coupling:master-1.6.1:
-  image: dumux-precice:master-1.6.1
+build-iterative-coupling:master-2.2.1:
+  image: dumux-precice:master-2.2.1
   rules:
   - if: '$CI_NIGHTLY_BUILD == "TRUE"'
   <<: *build-iterative-coupling
@@ -79,28 +75,16 @@ build-iterative-coupling:master-1.6.1:
       - build-cmake/appl/coupling-ff-pm/fvca-monolithic/Makefile
       - build-cmake/appl/coupling-ff-pm/fvca-monolithic/CTestTestfile.cmake
 
-build-monolithic-coupling:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
-  <<: *build-monolithic-coupling
-
-#build-monolithic-coupling:3.3-1.6.1:
-#  image: dumux-precice:3.3-1.6.1
-#  <<: *build-monolithic-coupling
-
-build-monolithic-coupling:3.3-1.6.1:
+build-monolithic-coupling:3.3-2.2.1:
   image: ub2004-dumux-precice:3.3-2.2.1
   <<: *build-monolithic-coupling
 
-build-monolithic-coupling:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
+build-monolithic-coupling:3.4-2.2.1:
+  image: ub2004-dumux-precice:3.4-2.2.1
   <<: *build-monolithic-coupling
 
-build-monolithic-coupling:master-1.6.1:
-  image: dumux-precice:master-1.6.1
+build-monolithic-coupling:master-2.2.1:
+  image: dumux-precice:master-2.2.1
   rules:
   - if: '$CI_NIGHTLY_BUILD == "TRUE"'
   <<: *build-monolithic-coupling
@@ -110,36 +94,29 @@ build-monolithic-coupling:master-1.6.1:
   stage: test
   script:
     - cd build-cmake/appl/coupling-ff-pm/fvca-iterative/
-    - CTEST_OUTPUT_ON_FAILURE=1 ctest
+    - CTEST_OUTPUT_ON_FAILURE=1 ctest --verbose
   artifacts:
-    expire_in: 5 days
+    expire_in: 2 days
+    when: on_failure
     paths:
       - build-cmake/appl/coupling-ff-pm/fvca-iterative/Testing/Temporary/LastTest.log
       - build-cmake/appl/coupling-ff-pm/fvca-iterative/Testing/Temporary/LastTestsFailed.log
       - build-cmake/appl/coupling-ff-pm/fvca-iterative/*.log
       - build-cmake/appl/coupling-ff-pm/fvca-iterative/*.txt
-#  needs:
-#    - build-iterative-coupling
+      - build-cmake/appl/coupling-ff-pm/fvca-iterative/CTestTestfile.cmake
 
-test-iterative-coupling:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
+
+test-iterative-coupling:3.3-2.2.1:
+  image: ub2004-dumux-precice:3.3-2.2.1
   <<: *test-iterative-coupling
   needs:
-    - build-iterative-coupling:3.3git-iterative-pr-1.6.1
-
-#test-iterative-coupling:3.3-1.6.1:
-#  image: dumux-precice:3.3-1.6.1
-#  <<: *test-iterative-coupling
-#  needs:
-#    - build-iterative-coupling:3.3-1.6.1
+    - build-iterative-coupling:3.3-2.2.1
 
-test-iterative-coupling:3.3-1.6.1:
-  image: ub2004-dumux-precice:3.3-2.2.1
+test-iterative-coupling:3.4-2.2.1:
+  image: ub2004-dumux-precice:3.4-2.2.1
   <<: *test-iterative-coupling
   needs:
-    - build-iterative-coupling:3.3-1.6.1
+    - build-iterative-coupling:3.4-2.2.1
 
 .test_template: &test-monolithic-coupling
   stage: test
@@ -151,29 +128,18 @@ test-iterative-coupling:3.3-1.6.1:
     paths:
       - build-cmake/appl/coupling-ff-pm/fvca-monolithic/Testing/Temporary/LastTest.log
       - build-cmake/appl/coupling-ff-pm/fvca-monolithic/Testing/Temporary/LastTestsFailed.log
-#  needs:
-#    - build-monolithic-coupling
-
 
-test-monolithic-coupling:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
+test-monolithic-coupling:3.3-2.2.1:
+  image: ub2004-dumux-precice:3.3-2.2.1
   <<: *test-monolithic-coupling
   needs:
-    - build-monolithic-coupling:3.3git-iterative-pr-1.6.1
-
-#test-monolithic-coupling:3.3-1.6.1:
-#  image: dumux-precice:3.3-1.6.1
-#  <<: *test-monolithic-coupling
-#  needs:
-#    - build-monolithic-coupling:3.3-1.6.1
+    - build-monolithic-coupling:3.3-2.2.1
 
-test-monolithic-coupling:3.3-1.6.1:
-  image: ub2004-dumux-precice:3.3-2.2.1
+test-monolithic-coupling:3.4-2.2.1:
+  image: ub2004-dumux-precice:3.4-2.2.1
   <<: *test-monolithic-coupling
   needs:
-    - build-monolithic-coupling:3.3-1.6.1
+    - build-monolithic-coupling:3.4-2.2.1
 
 .build_template: &build-monolithic-flow-over-step-2d
   stage: build
@@ -195,22 +161,16 @@ test-monolithic-coupling:3.3-1.6.1:
       - build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Makefile
       - build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/CTestTestfile.cmake
 
-build-monolithic-flow-over-step-2d:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
+build-monolithic-flow-over-step-2d:3.3-2.2.1:
+  image: ub2004-dumux-precice:3.3-2.2.1
   <<: *build-monolithic-flow-over-step-2d
 
-#build-monolithic-flow-over-step-2d:3.3-1.6.1:
-#  image: dumux-precice:3.3-1.6.1
-#  <<: *build-monolithic-flow-over-step-2d
-
-build-monolithic-flow-over-step-2d:3.3-1.6.1:
-  image: ub2004-dumux-precice:3.3-2.2.1
+build-monolithic-flow-over-step-2d:3.4-2.2.1:
+  image: ub2004-dumux-precice:3.4-2.2.1
   <<: *build-monolithic-flow-over-step-2d
 
-build-monolithic-flow-over-step-2d:master-1.6.1:
-  image: dumux-precice:master-1.6.1
+build-monolithic-flow-over-step-2d:master-2.2.1:
+  image: dumux-precice:master-2.2.1
   rules:
   - if: '$CI_NIGHTLY_BUILD == "TRUE"'
   <<: *build-monolithic-flow-over-step-2d
@@ -221,30 +181,23 @@ build-monolithic-flow-over-step-2d:master-1.6.1:
     - cd build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/
     - - CTEST_OUTPUT_ON_FAILURE=1 ctest
   artifacts:
-    expire_in: 5 days
+    when: on_failure
+    expire_in: 2 days
     paths:
       - build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Testing/Temporary/LastTest.log
       - build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Testing/Temporary/LastTestsFailed.log
 
-test-monolithic-flow-over-step-2d:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
+test-monolithic-flow-over-step-2d:3.3-2.2.1:
+  image: ub2004-dumux-precice:3.3-2.2.1
   <<: *test-monolithic-flow-over-step-2d
   needs:
-    - build-monolithic-flow-over-step-2d:3.3git-iterative-pr-1.6.1
+    - build-monolithic-flow-over-step-2d:3.3-2.2.1
 
-#test-monolithic-flow-over-step-2d:3.3-1.6.1:
-#  image: dumux-precice:3.3-1.6.1
-#  <<: *test-monolithic-flow-over-step-2d
-#  needs:
-#    - build-monolithic-flow-over-step-2d:3.3-1.6.1
-
-test-monolithic-flow-over-step-2d:3.3-1.6.1:
-  image: ub2004-dumux-precice:3.3-2.2.1
+test-monolithic-flow-over-step-2d:3.4-2.2.1:
+  image: ub2004-dumux-precice:3.4-2.2.1
   <<: *test-monolithic-flow-over-step-2d
   needs:
-    - build-monolithic-flow-over-step-2d:3.3-1.6.1
+    - build-monolithic-flow-over-step-2d:3.4-2.2.1
 
 .build_template: &build-monolithic-ff-pm-3d
   stage: build
@@ -266,22 +219,16 @@ test-monolithic-flow-over-step-2d:3.3-1.6.1:
       - build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/Makefile
       - build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/CTestTestfile.cmake
 
-build-monolithic-ff-pm-3d:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
+build-monolithic-ff-pm-3d:3.3-2.2.1:
+  image: ub2004-dumux-precice:3.3-2.2.1
   <<: *build-monolithic-ff-pm-3d
 
-#build-monolithic-ff-pm-3d:3.3-1.6.1:
-#  image: dumux-precice:3.3-1.6.1
-#  <<: *build-monolithic-ff-pm-3d
-
-build-monolithic-ff-pm-3d:3.3-1.6.1:
-  image: ub2004-dumux-precice:3.3-2.2.1
+build-monolithic-ff-pm-3d:3.4-2.2.1:
+  image: ub2004-dumux-precice:3.4-2.2.1
   <<: *build-monolithic-ff-pm-3d
 
-build-monolithic-ff-pm-3d:master-1.6.1:
-  image: dumux-precice:master-1.6.1
+build-monolithic-ff-pm-3d:master-2.2.1:
+  image: dumux-precice:master-2.2.1
   rules:
   - if: '$CI_NIGHTLY_BUILD == "TRUE"'
   <<: *build-monolithic-ff-pm-3d
@@ -293,31 +240,22 @@ build-monolithic-ff-pm-3d:master-1.6.1:
     - cd build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/
     - - CTEST_OUTPUT_ON_FAILURE=1 ctest
   artifacts:
-    expire_in: 5 days
+    expire_in: 2 days
+    when: on_failure
     paths:
       - build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/Testing/Temporary/LastTest.log
       - build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/Testing/Temporary/LastTestsFailed.log
   needs:
     - build:monolithic:ff-pm-3d
 
-
-test-monolithic-ff-pm-3d:3.3git-iterative-pr-1.6.1:
-  image: dumux-precice:3.3git-iterative-pr-1.6.1
-  rules:
-  - if: '$CI_NIGHTLY_BUILD == "TRUE"'
+test-monolithic-ff-pm-3d:3.3-2.2.1:
+  image: ub2004-dumux-precice:3.3-2.2.1
   <<: *test-monolithic-ff-pm-3d
   needs:
-    - build-monolithic-ff-pm-3d:3.3git-iterative-pr-1.6.1
+    - build-monolithic-ff-pm-3d:3.3-2.2.1
 
-#test-monolithic-ff-pm-3d:3.3-1.6.1:
-#  image: dumux-precice:3.3-1.6.1
-#  <<: *test-monolithic-ff-pm-3d
-#  needs:
-#    - build-monolithic-ff-pm-3d:3.3-1.6.1
-
-test-monolithic-ff-pm-3d:3.3-1.6.1:
-  image: ub2004-dumux-precice:3.3-2.2.1
+test-monolithic-ff-pm-3d:3.4-2.2.1:
+  image: ub2004-dumux-precice:3.4-2.2.1
   <<: *test-monolithic-ff-pm-3d
   needs:
-    - build-monolithic-ff-pm-3d:3.3-1.6.1
-
+    - build-monolithic-ff-pm-3d:3.4-2.2.1
\ No newline at end of file

appl/coupling-ff-pm/fvca-iterative/ffproblem-reversed.hh

@@ -28,6 +28,9 @@
 #endif
 
 #include <dune/grid/yaspgrid.hh>
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
 
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
@@ -105,7 +108,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
     using Indices =
         typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
 
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<
+        GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
 
     using FVElementGeometry = typename GridGeometry::LocalView;
     using SubControlVolumeFace =
@@ -115,7 +119,13 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+#endif
+
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 #if ENABLEMONOLITHIC

appl/coupling-ff-pm/fvca-iterative/main_fvca-iterative-pm.cc

@@ -41,7 +41,6 @@ bool printstuff = false;
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/common/valgrind.hh>
 
 #include <dumux/linear/amgbackend.hh>
 #include <dumux/nonlinear/newtonsolver.hh>

appl/coupling-ff-pm/fvca-iterative/pmproblem-reversed.hh

@@ -30,6 +30,9 @@
 
 #include <dune/grid/yaspgrid.hh>
 
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
 #include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
@@ -96,8 +99,15 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
         typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+#endif
+
+    using BoundaryTypes = Dumux::BoundaryTypes<
+        GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using FVElementGeometry =
         typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;

appl/coupling-ff-pm/fvca-monolithic/problem_darcy.hh

@@ -27,6 +27,10 @@
 
 #include <dune/grid/yaspgrid.hh>
 
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
+
 #include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
@@ -88,8 +92,13 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
         typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+#endif
+    using BoundaryTypes = Dumux::BoundaryTypes<
+        GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using FVElementGeometry =
         typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;

appl/coupling-ff-pm/fvca-monolithic/problem_stokes.hh

@@ -27,6 +27,10 @@
 
 #include <dune/grid/yaspgrid.hh>
 
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
+
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
@@ -108,7 +112,11 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+#endif
     using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
 
     using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;

appl/coupling-ff-pm/monolithic/ff-pm-3d/problem_darcy_3d.hh

@@ -27,6 +27,10 @@
 
 #include <dune/grid/yaspgrid.hh>
 
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
+
 #include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
@@ -88,8 +92,13 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
         typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+#endif
+    using BoundaryTypes = Dumux::BoundaryTypes<
+        GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using FVElementGeometry =
         typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;

appl/coupling-ff-pm/monolithic/ff-pm-3d/problem_stokes_3d.hh

@@ -27,6 +27,10 @@
 
 #include <dune/grid/yaspgrid.hh>
 
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
+
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
@@ -108,7 +112,11 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+#endif
     using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
 
     using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;

appl/coupling-ff-pm/monolithic/flow-over-step-2d/freeflowsubproblem.hh

@@ -24,6 +24,9 @@
 #define DUMUX_STOKES_SUBPROBLEM_HH
 
 #include <dumux/common/boundarytypes.hh>
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
 #include <dumux/common/properties.hh>
 #include <dumux/common/timeloop.hh>
 
@@ -58,7 +61,11 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+#endif
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;

appl/coupling-ff-pm/monolithic/flow-over-step-2d/main.cc

@@ -154,7 +154,6 @@ int main(int argc, char **argv)
     sol[darcyIdx].resize(darcyFvGridGeometry->numDofs());
 
     auto stokesSol = partial(sol, stokesFaceIdx, stokesCellCenterIdx);
-    auto stokesSolOld = stokesSol;
 
     stokesProblem->applyInitialSolution(stokesSol);
     darcyProblem->applyInitialSolution(sol[darcyIdx]);

appl/coupling-ff-pm/monolithic/flow-over-step-2d/porousmediumsubproblem.hh

@@ -25,6 +25,9 @@
 #define DUMUX_DARCY_SUBPROBLEM_HH
 
 #include <dumux/common/boundarytypes.hh>
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
 #include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
@@ -41,7 +44,11 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
         typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+#endif
     using BoundaryTypes = Dumux::BoundaryTypes<
         GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;

appl/coupling-ff-pm/partitioned/ff-pm-3d/ffproblem-reversed.hh

@@ -29,6 +29,10 @@
 
 #include <dune/grid/yaspgrid.hh>
 
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
+
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
@@ -105,7 +109,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
     using Indices =
         typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
 
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<
+        GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
 
     using FVElementGeometry = typename GridGeometry::LocalView;
     using SubControlVolumeFace =
@@ -115,7 +120,11 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+#endif
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 #if ENABLEMONOLITHIC

appl/coupling-ff-pm/partitioned/ff-pm-3d/main_pm-reversed.cc

@@ -41,7 +41,6 @@ bool printstuff = false;
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/common/valgrind.hh>
 
 #include <dumux/linear/amgbackend.hh>
 #include <dumux/nonlinear/newtonsolver.hh>

appl/coupling-ff-pm/partitioned/ff-pm-3d/pmproblem-reversed.hh

@@ -30,6 +30,9 @@
 
 #include <dune/grid/yaspgrid.hh>
 
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
 //****** uncomment for the last exercise *****//
 // #include <dumux/io/grid/subgridgridcreator.hh>
 
@@ -100,8 +103,13 @@ class DarcySubProblem : public PorousMediumFlowProblemWithGravity<TypeTag>
         typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+#else
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+#endif
+    using BoundaryTypes = Dumux::BoundaryTypes<
+        GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using FVElementGeometry =
         typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;

dumux-precice/dumux-addon/multidomain/boundary/stokesdarcy/couplingmanager.hh

@@ -31,6 +31,9 @@
 
 #include <dune/common/float_cmp.hh>
 #include <dune/common/exceptions.hh>
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+#include <dumux/common/numeqvector.hh>
+#endif
 #include <dumux/common/properties.hh>
 #include <dumux/multidomain/staggeredcouplingmanager.hh>
 #include <dumux/discretization/staggered/elementsolution.hh>
@@ -76,7 +79,12 @@ private:
 
     template<std::size_t id> using GridView = typename GetPropType<SubDomainTypeTag<id>, Properties::GridGeometry>::GridView;
     template<std::size_t id> using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
+    template<std::size_t id> using PrimaryVariables = typename MDTraits::template SubDomain<id>::PrimaryVariables;
+#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
+    template<std::size_t id> using NumEqVect