From e0527f896676ccef66bea033ed5bba4d08cb60e5 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Fri, 20 Apr 2012 17:55:40 +0000
Subject: [PATCH] fix errors related to switch SpatialParameters ->
 SpatialParams

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8106 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh | 6 +++---
 dumux/boxmodels/mpnc/mpncpropertydefaults.hh  | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
index 54d49e5250..2d2828062c 100644
--- a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
@@ -108,7 +108,7 @@ protected:
         // gradients
         temperatureGrad_ = 0;
         Vector tmp(0.0);
-        for (int vertIdx = 0; vertIdx < this->fvGeom_.numVertices; vertIdx++)
+        for (int vertIdx = 0; vertIdx < this->fvGeometry_.numVertices; vertIdx++)
         {
             tmp = this->face().grad[vertIdx];
             tmp *= elemVolVars[vertIdx].temperature();
@@ -122,7 +122,7 @@ protected:
                                                        elemVolVars,
                                                        temperatureGrad_,
                                                        element,
-                                                       this->fvGeom_,
+                                                       this->fvGeometry_,
                                                        scvfIdx_);
         else // heat flux at outflow boundaries
             problem.spatialParameters().boundaryMatrixHeatFlux(tmp,
@@ -130,7 +130,7 @@ protected:
                                                        elemVolVars,
                                                        this->face(),
                                                        element,
-                                                       this->fvGeom_);
+                                                       this->fvGeometry_);
 
         // project the heat flux vector on the face's normal vector
         normalMatrixHeatFlux_ = tmp*this->face().normal;
diff --git a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
index d4637061a7..ddc83898eb 100644
--- a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
+++ b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
@@ -172,6 +172,9 @@ SET_PROP(BoxMPNC, Indices)
 //! DEPRECATED MPNCIndices property
 SET_TYPE_PROP(BoxMPNC, MPNCIndices, typename GET_PROP_TYPE(TypeTag, Indices));
 
+//! DEPRECATED SpatialParameters property
+SET_TYPE_PROP(BoxMPNC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+
 //! The VTK writer module for common quantities
 SET_PROP(BoxMPNC, MPNCVtkCommonModule)
 {
-- 
GitLab