Skip to content
Snippets Groups Projects

BUG: 2022-1: Various bug fixes

Merged Kutalmış Berçin requested to merge issues-2022-1.kbc into develop
Files
17
@@ -6,7 +6,7 @@
@@ -6,7 +6,7 @@
\\/ M anipulation |
\\/ M anipulation |
-------------------------------------------------------------------------------
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2015-2021 OpenCFD Ltd.
Copyright (C) 2015-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
-------------------------------------------------------------------------------
License
License
This file is part of OpenFOAM.
This file is part of OpenFOAM.
@@ -226,32 +226,60 @@ class DEShybrid
@@ -226,32 +226,60 @@ class DEShybrid
)
)
);
);
const volScalarField factor
 
const word factorName(IOobject::scopedName(typeName, "Factor"));
 
const fvMesh& mesh = this->mesh();
 
 
const IOobject factorIO
(
(
IOobject
factorName,
(
mesh.time().timeName(),
typeName + ":Factor",
mesh,
this->mesh().time().timeName(),
IOobject::NO_READ,
this->mesh(),
IOobject::NO_WRITE
IOobject::NO_READ,
IOobject::NO_WRITE
),
max(sigmaMax_*tanh(pow(A, CH1_)), sigmaMin_)
);
);
if (blendedSchemeBaseName::debug)
if (blendedSchemeBaseName::debug)
{
{
factor.write();
auto* factorPtr = mesh.getObjectPtr<volScalarField>(factorName);
 
 
if (!factorPtr)
 
{
 
factorPtr =
 
new volScalarField
 
(
 
factorIO,
 
mesh,
 
dimensionedScalar(dimless, Zero)
 
);
 
 
const_cast<fvMesh&>(mesh).objectRegistry::store(factorPtr);
 
}
 
 
auto& factor = *factorPtr;
 
 
factor = max(sigmaMax_*tanh(pow(A, CH1_)), sigmaMin_);
 
 
return tmp<surfaceScalarField>::New
 
(
 
vf.name() + "BlendingFactor",
 
fvc::interpolate(factor)
 
);
}
}
 
else
 
{
 
const volScalarField factor
 
(
 
factorIO,
 
max(sigmaMax_*tanh(pow(A, CH1_)), sigmaMin_)
 
);
return tmp<surfaceScalarField>
return tmp<surfaceScalarField>::New
(
new surfaceScalarField
(
(
vf.name() + "BlendingFactor",
vf.name() + "BlendingFactor",
fvc::interpolate(factor)
fvc::interpolate(factor)
)
);
);
}
}
}
Loading