Skip to content

Commit

Permalink
DataEntry: Do not instantiate DataEntry<label> for DataEntry types wh…
Browse files Browse the repository at this point in the history
…ich interpolate

    // 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
  • Loading branch information
Henry Weller committed Feb 4, 2016
1 parent 94046ab commit 7265d90
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
Expand Up @@ -112,7 +112,6 @@ protected:

// Protected Member Functions


//- Return (demand driven) interpolator
const interpolationWeights& interpolator() const;

Expand Down
13 changes: 8 additions & 5 deletions src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
Expand Up @@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
Expand Down Expand Up @@ -43,10 +43,13 @@ namespace Foam
makeDataEntry(label);
makeDataEntryType(CompatibilityConstant, label);
makeDataEntryType(Constant, label);
//makeDataEntryType(PolynomialEntry, label);
makeDataEntryType(CSV, label);
makeDataEntryType(Table, label);
makeDataEntryType(TableFile, label);

// 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);

makeDataEntry(scalar);
makeDataEntryType(CompatibilityConstant, scalar);
Expand Down

0 comments on commit 7265d90

Please sign in to comment.