From 6980e724d9feaf8ac2d4051b92711611e6180a7d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 25 Jul 2011 15:26:27 +0100
Subject: [PATCH] linearUpwind: Corrected warning messages
---
.../schemes/linearUpwind/linearUpwind.H | 9 ++++--
.../schemes/linearUpwind/linearUpwindV.H | 30 ++++++++++++-------
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
index 13b98512df6..d180be69edf 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
@@ -141,10 +141,15 @@ public:
)
)
{
+
if (!schemeData.eof())
{
- IOWarningIn("linearUpwind(const fvMesh&, Istream&)", schemeData)
- << "unexpected additional entries in stream." << nl
+ IOWarningIn
+ (
+ "linearUpwind(const fvMesh&, "
+ "const surfaceScalarField& faceFlux, Istream&)",
+ schemeData
+ ) << "unexpected additional entries in stream." << nl
<< " Only the name of the gradient scheme in the"
" 'gradSchemes' dictionary should be specified."
<< endl;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
index ce07b1017bf..d97ea2cbb5a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
@@ -111,11 +111,14 @@ public:
)
)
{
- IOWarningIn("linearUpwindV(const fvMesh&, Istream&)", schemeData)
- << "unexpected additional entries in stream." << nl
- << " Only the name of the gradient scheme in the"
- " 'gradSchemes' dictionary should be specified."
- << endl;
+ if (!schemeData.eof())
+ {
+ IOWarningIn("linearUpwindV(const fvMesh&, Istream&)", schemeData)
+ << "unexpected additional entries in stream." << nl
+ << " Only the name of the gradient scheme in the"
+ " 'gradSchemes' dictionary should be specified."
+ << endl;
+ }
}
//- Construct from faceFlux and Istream
@@ -137,11 +140,18 @@ public:
)
)
{
- IOWarningIn("linearUpwindV(const fvMesh&, Istream&)", schemeData)
- << "unexpected additional entries in stream." << nl
- << " Only the name of the gradient scheme in the"
- " 'gradSchemes' dictionary should be specified."
- << endl;
+ if (!schemeData.eof())
+ {
+ IOWarningIn
+ (
+ "linearUpwindV(const fvMesh&, "
+ "const surfaceScalarField& faceFlux, Istream&)",
+ schemeData
+ ) << "unexpected additional entries in stream." << nl
+ << " Only the name of the gradient scheme in the"
+ " 'gradSchemes' dictionary should be specified."
+ << endl;
+ }
}
--
GitLab