diff --git a/dumux/common/properties/propertysystemmacros.hh b/dumux/common/properties/propertysystemmacros.hh
index 6a887dc7f964f36f075c46e70adbcb9ab285ab56..650b445355a92c17b015b912466b145bf4f04676 100644
--- a/dumux/common/properties/propertysystemmacros.hh
+++ b/dumux/common/properties/propertysystemmacros.hh
@@ -45,6 +45,8 @@ DUMUX_ENABLE_OLD_PROPERTY_MACROS defaults to 1 (true) until release 3.1. \
After release 3.1 it will default to 0 (false) so you will have to manually \
enable property macros in order to use them."
+#include <cstddef>
+
#include <dumux/common/properties/propertysystem.hh>
namespace Dumux {
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index 8500c684ea15f90a082fcc1fa260bdf485be61b9..bbd5e1981277bc3b39973cbc79608c72b1fa8246 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -25,7 +25,7 @@
#define DUMUX_NAVIERSTOKES_STAGGERED_FLUXVARIABLES_HH
#include <array>
-#include <dune/common/std/optional.hh>
+#include <optional>
#include <dumux/common/math.hh>
#include <dumux/common/exceptions.hh>
@@ -278,7 +278,7 @@ public:
// If the current scvf is on a boundary, check if there is a Neumann BC for the stress in tangential direction.
// Create a boundaryTypes object (will be empty if not at a boundary).
- Dune::Std::optional<BoundaryTypes> currentScvfBoundaryTypes;
+ std::optional<BoundaryTypes> currentScvfBoundaryTypes;
if (scvf.boundary())
currentScvfBoundaryTypes.emplace(problem.boundaryTypes(element, scvf));
@@ -290,7 +290,7 @@ public:
const auto& lateralScvf = fvGeometry.scvf(eIdx, scvf.pairData(localSubFaceIdx).localLateralFaceIdx);
// Create a boundaryTypes object (will be empty if not at a boundary).
- Dune::Std::optional<BoundaryTypes> lateralFaceBoundaryTypes;
+ std::optional<BoundaryTypes> lateralFaceBoundaryTypes;
// Check if there is face/element parallel to our face of interest where the dof lives on. If there is no parallel neighbor,
// we are on a boundary where we have to check for boundary conditions.
@@ -477,8 +477,8 @@ private:
const ElementVolumeVariables& elemVolVars,
const FaceVariables& faceVars,
const GridFluxVariablesCache& gridFluxVarsCache,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
const int localSubFaceIdx)
{
const auto eIdx = scvf.insideScvIdx();
@@ -545,8 +545,8 @@ private:
const SubControlVolumeFace& scvf,
const ElementVolumeVariables& elemVolVars,
const FaceVariables& faceVars,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
const int localSubFaceIdx)
{
const auto eIdx = scvf.insideScvIdx();
diff --git a/dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh b/dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh
index fbdb57c2daf7cf0ee77055bdfcc505ca090acdca..bcae100b68b201298423b08b28f74d0c2b5c3cbb 100644
--- a/dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh
@@ -25,6 +25,7 @@
#define DUMUX_NAVIERSTOKES_STAGGERED_UPWINDVARIABLES_HH
#include <array>
+#include <optional>
#include <dumux/common/math.hh>
#include <dumux/common/exceptions.hh>
@@ -123,8 +124,8 @@ public:
const FaceVariables& faceVars,
const GridFluxVariablesCache& gridFluxVarsCache,
const int localSubFaceIdx,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes)
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes)
{
const auto eIdx = scvf.insideScvIdx();
const auto& lateralFace = fvGeometry.scvf(eIdx, scvf.pairData(localSubFaceIdx).localLateralFaceIdx);
@@ -368,8 +369,8 @@ private:
const FaceVariables& faceVars,
const Scalar transportingVelocity,
const int localSubFaceIdx,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
std::true_type)
{
const SubControlVolumeFace& lateralFace = fvGeometry.scvf(ownScvf.insideScvIdx(), ownScvf.pairData(localSubFaceIdx).localLateralFaceIdx);
@@ -451,8 +452,8 @@ private:
const FaceVariables& faceVars,
const Scalar transportingVelocity,
const int localSubFaceIdx,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
std::false_type)
{
// Check whether the own or the neighboring element is upstream.
@@ -575,8 +576,8 @@ private:
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const FaceVariables& faceVars,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
const int localSubFaceIdx)
{
// Find out what boundary type is set on the lateral face
@@ -630,7 +631,7 @@ private:
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const FaceVariables& faceVars,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
const int localOppositeSubFaceIdx)
{
// A ghost subface at the boundary is created, featuring the location of the sub face's center
diff --git a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
index 014a98b7e7b84b2608a87a818877813503991363..a9c3c452b31e9d5ed9ba383d29cf3a592bd87986 100644
--- a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
+++ b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_NAVIERSTOKES_STAGGERED_VELOCITYGRADIENTS_HH
#define DUMUX_NAVIERSTOKES_STAGGERED_VELOCITYGRADIENTS_HH
-#include <dune/common/std/optional.hh>
+#include <optional>
#include <dumux/common/exceptions.hh>
#include <dumux/common/parameters.hh>
@@ -100,8 +100,8 @@ public:
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const FaceVariables& faceVars,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
const std::size_t localSubFaceIdx)
{
const auto eIdx = scvf.insideScvIdx();
@@ -174,8 +174,8 @@ public:
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const FaceVariables& faceVars,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
const std::size_t localSubFaceIdx)
{
const auto eIdx = scvf.insideScvIdx();
@@ -243,8 +243,8 @@ public:
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const FaceVariables& faceVars,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
const std::size_t localSubFaceIdx)
{
const auto eIdx = scvf.insideScvIdx();
@@ -303,8 +303,8 @@ public:
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const FaceVariables& faceVars,
- const Dune::Std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
- const Dune::Std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
+ const std::optional<BoundaryTypes>& currentScvfBoundaryTypes,
+ const std::optional<BoundaryTypes>& lateralFaceBoundaryTypes,
const std::size_t localSubFaceIdx)
{
const auto eIdx = scvf.insideScvIdx();
diff --git a/dumux/porousmediumflow/velocityoutput.hh b/dumux/porousmediumflow/velocityoutput.hh
index 2cd756269b402a61509c5fd99c76e92ae4a3b889..aec441d3951470c8abcb40466ee7b62751ee1351 100644
--- a/dumux/porousmediumflow/velocityoutput.hh
+++ b/dumux/porousmediumflow/velocityoutput.hh
@@ -30,7 +30,6 @@
#include <dune/geometry/referenceelements.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/deprecated.hh>
#include <dumux/io/velocityoutput.hh>
#include <dumux/discretization/method.hh>
#include <dumux/discretization/elementsolution.hh>