diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C index 5e5e2f16be..03ea26cb1f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C @@ -122,6 +122,7 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::LuoSvendsen "gamma2by11", Function1s::tableBase::boundsHandling::clamp, linearInterpolationWeights::typeName, + autoPtr>(nullptr), gammaUpperReg2by11Table ); @@ -131,6 +132,7 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::LuoSvendsen "gamma5by11", Function1s::tableBase::boundsHandling::clamp, linearInterpolationWeights::typeName, + autoPtr>(nullptr), gammaUpperReg5by11Table ); @@ -140,6 +142,7 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::LuoSvendsen "gamma8by11", Function1s::tableBase::boundsHandling::clamp, linearInterpolationWeights::typeName, + autoPtr>(nullptr), gammaUpperReg8by11Table ); } diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C index 3d4a1394c7..d5b716d463 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C +++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -138,13 +138,15 @@ Foam::Function1s::Table::Table const word& name, const tableBase::boundsHandling boundsHandling, const word& interpolationScheme, + const autoPtr>& reader, const List>& table ) : FieldFunction1>(name), boundsHandling_(boundsHandling), interpolationScheme_(interpolationScheme), - values_(table) + values_(table), + reader_(reader, false) {} diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H index d2259fd378..d93df0be5c 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H +++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -127,7 +127,7 @@ class Table //- Enumeration for handling out-of-bound values const tableBase::boundsHandling boundsHandling_; - //- Interpolation type + //- Interpolation scheme const word interpolationScheme_; //- Table data @@ -177,6 +177,7 @@ public: const word& name, const tableBase::boundsHandling boundsHandling, const word& interpolationScheme, + const autoPtr>& reader, const List>& table ); @@ -193,6 +194,30 @@ public: // Member Functions + //- Return the handling out-of-bound values + const tableBase::boundsHandling& boundsHandling() const + { + return boundsHandling_; + } + + //- Return the interpolation scheme + const word& interpolationScheme() const + { + return interpolationScheme_; + } + + //- Return the reader + const autoPtr>& reader() const + { + return reader_; + } + + //- Return table data + const List>& values() const + { + return values_; + } + //- Return Table value as a function of scalar x virtual Type value(const scalar x) const; diff --git a/src/radiationModels/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/radiationModels/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C index f8912183b9..e303d416f4 100644 --- a/src/radiationModels/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C +++ b/src/radiationModels/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -149,6 +149,7 @@ Foam::radiationModels::blackBodyEmission::blackBodyEmission "blackBodyEmissivePower", Function1s::tableBase::boundsHandling::clamp, linearInterpolationWeights::typeName, + autoPtr>(nullptr), emissivePowerTable ), C1_("C1", dimensionSet(1, 4, 3, 0, 0, 0, 0), 3.7419e-16),