From 08680b8b3547c14c97df483e2c2489bb202a45c6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 28 Jan 2011 16:32:08 +0100
Subject: [PATCH] STYLE: rename Polynomial method evaluate() to value() for
consistency with DataEntry
STYLE: move DataEntry to OpenFOAM/primitives/functions
---
applications/test/dataEntry/Test-DataEntry.C | 4 ++--
src/OpenFOAM/Make/files | 6 ++++++
.../functions}/DataEntry/Constant/Constant.C | 2 +-
.../functions}/DataEntry/Constant/Constant.H | 2 +-
.../functions}/DataEntry/Constant/ConstantIO.C | 2 +-
.../functions}/DataEntry/DataEntry/DataEntry.C | 2 +-
.../functions}/DataEntry/DataEntry/DataEntry.H | 2 +-
.../functions}/DataEntry/DataEntry/DataEntryIO.C | 2 +-
.../functions}/DataEntry/DataEntry/DataEntryNew.C | 2 +-
.../primitives/functions}/DataEntry/Table/Table.C | 2 +-
.../primitives/functions}/DataEntry/Table/Table.H | 2 +-
.../primitives/functions}/DataEntry/Table/TableIO.C | 2 +-
.../primitives/functions}/DataEntry/makeDataEntries.C | 2 +-
.../functions}/DataEntry/polynomial/polynomial.C | 2 +-
.../functions}/DataEntry/polynomial/polynomial.H | 2 +-
.../functions}/DataEntry/polynomial/polynomialIO.C | 2 +-
.../primitives/functions/Polynomial/Polynomial.C | 6 +++---
.../primitives/functions/Polynomial/Polynomial.H | 6 +++---
.../primitives/functions/Polynomial/PolynomialIO.C | 2 +-
src/lagrangian/intermediate/Make/files | 6 ------
.../equationOfState/icoPolynomial/icoPolynomialI.H | 4 ++--
.../specie/thermo/hPolynomial/hPolynomialThermo.C | 10 +++++-----
.../specie/thermo/hPolynomial/hPolynomialThermoI.H | 8 ++++----
.../specie/transport/polynomial/polynomialTransportI.H | 6 +++---
24 files changed, 43 insertions(+), 43 deletions(-)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Constant/Constant.C (97%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Constant/Constant.H (98%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Constant/ConstantIO.C (96%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/DataEntry/DataEntry.C (97%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/DataEntry/DataEntry.H (98%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/DataEntry/DataEntryIO.C (95%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/DataEntry/DataEntryNew.C (97%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Table/Table.C (98%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Table/Table.H (98%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Table/TableIO.C (96%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/makeDataEntries.C (96%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/polynomial/polynomial.C (97%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/polynomial/polynomial.H (98%)
rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/polynomial/polynomialIO.C (96%)
diff --git a/applications/test/dataEntry/Test-DataEntry.C b/applications/test/dataEntry/Test-DataEntry.C
index f9b76db9f1c..631cc03e029 100644
--- a/applications/test/dataEntry/Test-DataEntry.C
+++ b/applications/test/dataEntry/Test-DataEntry.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,7 +25,7 @@ Application
testDataEntry
Description
- Tests lagrangian/intermediate/submodels/IO/DataEntry
+ Tests DataEntry
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 372ce59ff26..8f5966e927a 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -47,6 +47,12 @@ primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
primitives/quaternion/quaternion.C
primitives/septernion/septernion.C
+/* functions, data entries */
+primitives/functions/DataEntry/makeDataEntries.C
+primitives/functions/DataEntry/polynomial/polynomial.C
+primitives/functions/DataEntry/polynomial/polynomialIO.C
+
+
strings = primitives/strings
$(strings)/string/string.C
$(strings)/string/stringIO.C
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
similarity index 97%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
rename to src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
index 789c6a5d48d..6eeafc583ba 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
similarity index 98%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
rename to src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index f58739afc75..f7a1bb902e8 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
similarity index 96%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
rename to src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
index de383f97071..eca4a677a26 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
similarity index 97%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
rename to src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
index 7e13f4bddd1..825d8c84003 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
similarity index 98%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
rename to src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
index 4cb66725a68..405b8889a40 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C
similarity index 95%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
rename to src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C
index cbe3fe87cff..99a781a937c 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
similarity index 97%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C
rename to src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
index 947d86753f9..fac7d6c4def 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
similarity index 98%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
rename to src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
index 3e14479f35e..71212250ffb 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
similarity index 98%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
rename to src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
index ef58482c80c..5fe73deccbf 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableIO.C
similarity index 96%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
rename to src/OpenFOAM/primitives/functions/DataEntry/Table/TableIO.C
index c32e673f388..b312469b6bb 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
similarity index 96%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C
rename to src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
index 39d164a6812..114658753ac 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
similarity index 97%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
rename to src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
index f1424583975..859440c6dcb 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
similarity index 98%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
rename to src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
index 78c55c78704..0b4d18a4bb4 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomialIO.C
similarity index 96%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
rename to src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomialIO.C
index e50f08bb1ee..ab5c0c2e903 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomialIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
index d8569a536c4..7f9ae731f6b 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -149,7 +149,7 @@ Foam::scalar& Foam::Polynomial<PolySize>::logCoeff()
template<int PolySize>
-Foam::scalar Foam::Polynomial<PolySize>::evaluate(const scalar x) const
+Foam::scalar Foam::Polynomial<PolySize>::value(const scalar x) const
{
scalar y = this->v_[0];
@@ -192,7 +192,7 @@ Foam::scalar Foam::Polynomial<PolySize>::integrateLimits
intPolyType poly = this->integrate();
- return poly.evaluate(x2) - poly.evaluate(x1);
+ return poly.value(x2) - poly.value(x1);
}
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
index ace90a0bc8d..06511b0003e 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ Description
where 0 \<= i \<= n
- integer powers, starting at zero
- - evaluate(x) to evaluate the poly for a given value
+ - value(x) to evaluate the poly for a given value
- integrate(x1, x2) between two scalar values
- integrate() to return a new, intergated coeff polynomial
- increases the size (order)
@@ -134,7 +134,7 @@ public:
// Evaluation
//- Return polynomial value
- scalar evaluate(const scalar x) const;
+ scalar value(const scalar x) const;
//- Return integrated polynomial coefficients
// argument becomes zeroth element (constant of integration)
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
index f3fad20edd6..9b99c7a483f 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 068400f0d7e..63fa90db0d1 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -74,12 +74,6 @@ $(REACTINGMPINJECTION)/ReactingMultiphaseLookupTableInjection/reactingMultiphase
$(REACTINGMPINJECTION)/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.C
-/* data entries */
-submodels/IO/DataEntry/makeDataEntries.C
-submodels/IO/DataEntry/polynomial/polynomial.C
-submodels/IO/DataEntry/polynomial/polynomialIO.C
-
-
/* integration schemes */
IntegrationScheme/makeIntegrationSchemes.C
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
index f1eeacef9ec..b81ab6f80d1 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -99,7 +99,7 @@ Foam::icoPolynomial<PolySize>::New(const dictionary& dict)
template<int PolySize>
inline Foam::scalar Foam::icoPolynomial<PolySize>::rho(scalar, scalar T) const
{
- return rhoCoeffs_.evaluate(T)/this->W();
+ return rhoCoeffs_.value(T)/this->W();
}
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 1b04a9d47c1..15269f6ce2c 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -49,10 +49,10 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
sCoeffs_ = CpCoeffs_.integrateMinus1();
// Offset h poly so that it is relative to the enthalpy at Tstd
- hCoeffs_[0] += Hf_ - hCoeffs_.evaluate(specie::Tstd);
+ hCoeffs_[0] += Hf_ - hCoeffs_.value(specie::Tstd);
// Offset s poly so that it is relative to the entropy at Tstd
- sCoeffs_[0] += Sf_ - sCoeffs_.evaluate(specie::Tstd);
+ sCoeffs_[0] += Sf_ - sCoeffs_.value(specie::Tstd);
}
@@ -77,10 +77,10 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
sCoeffs_ = CpCoeffs_.integrateMinus1();
// Offset h poly so that it is relative to the enthalpy at Tstd
- hCoeffs_[0] += Hf_ - hCoeffs_.evaluate(specie::Tstd);
+ hCoeffs_[0] += Hf_ - hCoeffs_.value(specie::Tstd);
// Offset s poly so that it is relative to the entropy at Tstd
- sCoeffs_[0] += Sf_ - sCoeffs_.evaluate(specie::Tstd);
+ sCoeffs_[0] += Sf_ - sCoeffs_.value(specie::Tstd);
}
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
index 1576c646d0b..b41de9b877f 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -88,7 +88,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::cp
const scalar T
) const
{
- return CpCoeffs_.evaluate(T);
+ return CpCoeffs_.value(T);
}
@@ -98,7 +98,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::h
const scalar T
) const
{
- return hCoeffs_.evaluate(T);
+ return hCoeffs_.value(T);
}
@@ -126,7 +126,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
const scalar T
) const
{
- return sCoeffs_.evaluate(T);
+ return sCoeffs_.value(T);
}
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index 52094247fb7..d87dcd5657e 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -107,7 +107,7 @@ inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::mu
const scalar T
) const
{
- return muCoeffs_.evaluate(T)/this->W();
+ return muCoeffs_.value(T)/this->W();
}
@@ -117,7 +117,7 @@ inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::kappa
const scalar T
) const
{
- return kappaCoeffs_.evaluate(T)/this->W();
+ return kappaCoeffs_.value(T)/this->W();
}
--
GitLab