From bf665c347254fd7d6a23f65cafbeab026235b32e Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Thu, 4 Oct 2012 13:43:42 +0000
Subject: [PATCH] Fix various warnings emitted by clang. Use wPhase instead of
lPhase in CO2 files. (reviewed by vishal)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9189 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/co2/co2volumevariables.hh | 4 ++--
dumux/decoupled/2p2c/2p2cadaptiveproperties.hh | 2 +-
dumux/freeflow/stokes/stokesmodel.hh | 3 ---
test/boxmodels/co2/heterogeneousproblem.hh | 2 +-
test/boxmodels/co2ni/heterogeneousproblemni.hh | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dumux/boxmodels/co2/co2volumevariables.hh b/dumux/boxmodels/co2/co2volumevariables.hh
index b6a654ece4..7a3de6f12e 100644
--- a/dumux/boxmodels/co2/co2volumevariables.hh
+++ b/dumux/boxmodels/co2/co2volumevariables.hh
@@ -60,8 +60,8 @@ class CO2VolumeVariables: public TwoPTwoCVolumeVariables<TypeTag>
// present phases
enum {
- wPhaseOnly = Indices::lPhaseOnly,
- nPhaseOnly = Indices::gPhaseOnly,
+ wPhaseOnly = Indices::wPhaseOnly,
+ nPhaseOnly = Indices::nPhaseOnly,
bothPhases = Indices::bothPhases
};
diff --git a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
index 87c3966de0..7ee1a32a03 100644
--- a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
@@ -35,7 +35,7 @@ namespace Dumux
//****** forward declarations ******//
template<class TypeTag>
-class DecoupledTwoPTwoCIndicesAdaptive;
+struct DecoupledTwoPTwoCIndicesAdaptive;
////////////////////////////////
// properties
diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh
index 228eb2a5e7..586fb1486f 100644
--- a/dumux/freeflow/stokes/stokesmodel.hh
+++ b/dumux/freeflow/stokes/stokesmodel.hh
@@ -99,7 +99,6 @@ public:
{
GlobalPosition globalI, globalJ;
PrimaryVariables tmpFlux(0.0);
- int sign;
FVElementGeometry fvGeometry;
ElementVolumeVariables elemVolVars;
@@ -129,8 +128,6 @@ public:
continue;
for (int i = 0; i < fvGeometry.numVertices; i++) {
- const int &globalIdx =
- this->vertexMapper().map(*elemIt, i, dim);
const GlobalPosition &global = fvGeometry.subContVol[i].global;
if (globalI[axis] < coordVal)
flux += this->localResidual().residual(i);
diff --git a/test/boxmodels/co2/heterogeneousproblem.hh b/test/boxmodels/co2/heterogeneousproblem.hh
index dd5313acd9..667a009c70 100644
--- a/test/boxmodels/co2/heterogeneousproblem.hh
+++ b/test/boxmodels/co2/heterogeneousproblem.hh
@@ -469,7 +469,7 @@ public:
int initialPhasePresence(const Vertex &vert,
int &globalIdx,
const GlobalPosition &globalPos) const
- { return Indices::lPhaseOnly; }
+ { return Indices::wPhaseOnly; }
// \}
diff --git a/test/boxmodels/co2ni/heterogeneousproblemni.hh b/test/boxmodels/co2ni/heterogeneousproblemni.hh
index c1a331bca0..66dbb08c09 100644
--- a/test/boxmodels/co2ni/heterogeneousproblemni.hh
+++ b/test/boxmodels/co2ni/heterogeneousproblemni.hh
@@ -475,7 +475,7 @@ public:
int initialPhasePresence(const Vertex &vert,
int &globalIdx,
const GlobalPosition &globalPos) const
- { return Indices::lPhaseOnly; }
+ { return Indices::wPhaseOnly; }
// \}
--
GitLab