research/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DataEntry: Do not instantiate DataEntry<label> for DataEntry types which interpolate

Browse source 
// Polynomial functions and interpolation do evaluate to label
    // Instead evaluate a scalar and convert to label as appropriate
    // makeDataEntryType(PolynomialEntry, label);
    // makeDataEntryType(CSV, label);
    // makeDataEntryType(Table, label);
    // makeDataEntryType(TableFile, label);

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1987
This commit is contained in:
Henry Weller 2016-02-04 17:28:18 +00:00
parent 94046abbb6
commit 7265d90d0d
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
View file

@ -112,7 +112,6 @@ protected:
// Protected Member Functions // Protected Member Functions
//- Return (demand driven) interpolator //- Return (demand driven) interpolator
const interpolationWeights& interpolator() const; const interpolationWeights& interpolator() const;

13
src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,10 +43,13 @@ namespace Foam
makeDataEntry(label); makeDataEntry(label);
makeDataEntryType(CompatibilityConstant, label); makeDataEntryType(CompatibilityConstant, label);
makeDataEntryType(Constant, label); makeDataEntryType(Constant, label);
//makeDataEntryType(PolynomialEntry, label);
makeDataEntryType(CSV, label); // Polynomial functions and interpolation do evaluate to label
makeDataEntryType(Table, label); // Instead evaluate a scalar and convert to label as appropriate
makeDataEntryType(TableFile, label); // makeDataEntryType(PolynomialEntry, label);
// makeDataEntryType(CSV, label);
// makeDataEntryType(Table, label);
// makeDataEntryType(TableFile, label);
makeDataEntry(scalar); makeDataEntry(scalar);
makeDataEntryType(CompatibilityConstant, scalar); makeDataEntryType(CompatibilityConstant, scalar);