From a50878a4364895edb6ef6087afff2db0856b1a9f Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Thu, 4 Oct 2012 07:02:36 +0000
Subject: [PATCH] Some pedantic fixes for the new CO2 files.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9176 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/material/fluidsystems/brineco2fluidsystem.hh | 6 +++---
test/boxmodels/co2/heterogeneousco2tables.hh | 3 ++-
test/boxmodels/co2/heterogeneousspatialparameters.hh | 1 -
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dumux/material/fluidsystems/brineco2fluidsystem.hh b/dumux/material/fluidsystems/brineco2fluidsystem.hh
index a85cbca0e3..c9e4163a04 100644
--- a/dumux/material/fluidsystems/brineco2fluidsystem.hh
+++ b/dumux/material/fluidsystems/brineco2fluidsystem.hh
@@ -459,7 +459,7 @@ public:
{
// TODO!
DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
- };
+ }
/*!
* \brief Given the phase compositions, return the binary
@@ -498,7 +498,7 @@ public:
Valgrind::CheckDefined(result);
return result;
}
- };
+ }
/*!
* \brief Given the phase composition, return the specific
@@ -728,7 +728,7 @@ NEW_PROP_TAG(Salinity);
SET_TYPE_PROP(NumericModel, CO2Table, Dumux::CO2Tables);
// Set salinity defaults
SET_SCALAR_PROP(NumericModel, Salinity, 1e-3);
-};
+}
/*!
* \brief A compositional fluid with brine and carbon as
diff --git a/test/boxmodels/co2/heterogeneousco2tables.hh b/test/boxmodels/co2/heterogeneousco2tables.hh
index 49b6cfc775..022e8d1fd3 100644
--- a/test/boxmodels/co2/heterogeneousco2tables.hh
+++ b/test/boxmodels/co2/heterogeneousco2tables.hh
@@ -27,7 +27,8 @@
#ifndef DUMUX_HETEROGENEOUS_CO2TABLES_HH
#define DUMUX_HETEROGENEOUS_CO2TABLES_HH
-#include <assert.h>
+#include <cassert>
+#include <dumux/material/components/co2tablereader.hh>
namespace Dumux
{
diff --git a/test/boxmodels/co2/heterogeneousspatialparameters.hh b/test/boxmodels/co2/heterogeneousspatialparameters.hh
index 8705fdbaf8..168eaebd83 100644
--- a/test/boxmodels/co2/heterogeneousspatialparameters.hh
+++ b/test/boxmodels/co2/heterogeneousspatialparameters.hh
@@ -35,7 +35,6 @@
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-
namespace Dumux
{
--
GitLab