Commit 26409a96 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'feature/remove-warnings-deprecations' into 'master'

Fix some compiler warnings

See merge request !3103
parents e8280a71 017e443b
Pipeline #16694 passed with stages
in 0 seconds
......@@ -53,7 +53,6 @@ class FaceCenteredStaggeredLocalIntersectionIndexMapper<GridView, false>
using Element = typename GridView::template Codim<0>::Entity;
static constexpr auto numElementFaces = GridView::Grid::dimension * 2;
public:
void update(const GridView& gv, const Element& element)
{
static const bool makeConsistentlyOriented = getParam<bool>("Grid.MakeConsistentlyOriented", true);
......@@ -85,8 +84,8 @@ public:
{ return refToRealMap_[localIsIdx]; }
private:
std::array<SmallLocalIndexType, numElementFaces> realToRefMap_;
std::array<SmallLocalIndexType, numElementFaces> refToRealMap_;
std::array<SmallLocalIndexType, numElementFaces> realToRefMap_ = {};
std::array<SmallLocalIndexType, numElementFaces> refToRealMap_ = {};
};
/*!
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* See the file COPYING for full copying permissions. *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
* \file
* \ingroup PoromechanicsTests
* \brief Provides the class with the tabulated values of CO2
*/
#ifndef DUMUX_EL2P_CO2TABLES_HH
#define DUMUX_EL2P_CO2TABLES_HH
#include <cassert>
#include <dumux/material/components/co2tablereader.hh>
namespace Dumux {
namespace El2P {
// Class providing the tabulated values of CO2 for density and enthalpy
// the real work is done by some external program which provides
// ready-to-use tables.
#ifndef DOXYGEN // hide tables from doxygen
#include "co2values.inc"
#endif
} // end namespace El2P
} // end namespace Dumux
#endif
This diff is collapsed.
......@@ -46,7 +46,7 @@
#include "problem_2p.hh"
#include "problem_poroelastic.hh"
#include "co2tables_el2p.hh"
#include "test/porousmediumflow/co2/co2tables.hh"
namespace Dumux::Properties {
......@@ -60,7 +60,7 @@ template<class TypeTag>
struct FluidSystem<TypeTag, TTag::TwoPSub>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = FluidSystems::BrineCO2<Scalar, El2P::CO2Tables>;
using type = FluidSystems::BrineCO2<Scalar, GeneratedCO2Tables::CO2Tables>;
};
// Set the grid type
......@@ -95,7 +95,7 @@ template<class TypeTag>
struct FluidSystem<TypeTag, TTag::PoroElasticSub>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = FluidSystems::BrineCO2<Scalar, El2P::CO2Tables>;
using type = FluidSystems::BrineCO2<Scalar, GeneratedCO2Tables::CO2Tables>;
};
// The spatial parameters property
......
......@@ -25,7 +25,7 @@
#define DUMUX_TEST_2P3C_SURFACTANT_MATERIALLAW_HH
#include <algorithm>
#include <dune/common/power.hh>
#include <dune/common/math.hh>
namespace Dumux::FluidMatrix {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment