From ef9e81ff9b89d03a5fd61540eb28992f0ec880fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= <Bard.Skaflestad@sintef.no>
Date: Mon, 4 Aug 2014 19:06:12 +0200
Subject: [PATCH] swatInitScaling(): Rename array size parameter

This commit renames the 'np' parameter used to allocate small arrays
for saturations and capillary pressures to 'max_np' to better
reflect its purpose.

Suggested by: [at] atgeirr
---
 opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
index 7faa8526e..f9fb10526 100644
--- a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
+++ b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
@@ -430,10 +430,10 @@ namespace Opm
                 swat = eps_transf_[cell].wat.smax;
             } else {
                 const int wpos = phase_usage_.phase_pos[BlackoilPhases::Aqua];
-                const int np = BlackoilPhases::MaxNumPhases;
-                double s[np] = { 0.0 };
+                const int max_np = BlackoilPhases::MaxNumPhases;
+                double s[max_np] = { 0.0 };
                 s[wpos] = swat; 
-                double pc[np] = { 0.0 };
+                double pc[max_np] = { 0.0 };
                 funcForCell(cell).evalPc(s, pc, &(eps_transf_[cell]));          
                 if (pc[wpos] > 1.0e-8) {
                     eps_transf_[cell].wat.pcFactor *= pcow/pc[wpos];