Commit 2a436f7a authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge remote-tracking branch 'origin/master' into develop

parents 6c8b60cf 48fd04e3
......@@ -70,6 +70,12 @@ makeLaminarModel(Stokes);
#include "kEpsilon.H"
makeRASModel(kEpsilon);
#include "realizableKE.H"
makeRASModel(realizableKE);
#include "kOmegaSST.H"
makeRASModel(kOmegaSST);
#include "Smagorinsky.H"
makeLESModel(Smagorinsky);
......
......@@ -58,6 +58,8 @@ externalWallHeatFluxTemperatureFvPatchScalarField
temperatureCoupledBase(patch(), "undefined", "undefined", "undefined-K"),
mode_(fixedHeatFlux),
Q_(0),
q_(),
h_(),
Ta_(),
relaxation_(1),
emissivity_(0),
......@@ -84,7 +86,9 @@ externalWallHeatFluxTemperatureFvPatchScalarField
temperatureCoupledBase(patch(), dict),
mode_(operationModeNames.lookup("mode", dict)),
Q_(0),
Ta_(Function1<scalar>::New("Ta", dict)),
q_(),
h_(),
Ta_(),
relaxation_(dict.lookupOrDefault<scalar>("relaxation", 1)),
emissivity_(dict.lookupOrDefault<scalar>("emissivity", 0)),
qrRelaxation_(dict.lookupOrDefault<scalar>("qrRelaxation", 1)),
......@@ -109,6 +113,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
case fixedHeatTransferCoeff:
{
h_ = scalarField("h", dict, p.size());
Ta_ = Function1<scalar>::New("Ta", dict);
if (dict.found("thicknessLayers"))
{
......@@ -175,12 +180,12 @@ externalWallHeatFluxTemperatureFvPatchScalarField
temperatureCoupledBase(patch(), ptf),
mode_(ptf.mode_),
Q_(ptf.Q_),
q_(ptf.q_, mapper),
h_(ptf.h_, mapper),
q_(),
h_(),
Ta_(ptf.Ta_.clone()),
relaxation_(ptf.relaxation_),
emissivity_(ptf.emissivity_),
qrPrevious_(ptf.qrPrevious_, mapper),
qrPrevious_(),
qrRelaxation_(ptf.qrRelaxation_),
qrName_(ptf.qrName_),
thicknessLayers_(ptf.thicknessLayers_),
......@@ -194,12 +199,14 @@ externalWallHeatFluxTemperatureFvPatchScalarField
}
case fixedHeatFlux:
{
q_.setSize(mapper.size());
q_.map(ptf.q_, mapper);
break;
}
case fixedHeatTransferCoeff:
{
h_.setSize(mapper.size());
h_.map(ptf.h_, mapper);
break;
......
......@@ -192,7 +192,7 @@ realizableKE<BasicTurbulenceModel>::realizableKE
(
IOobject
(
"k",
IOobject::groupName("k", U.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
......@@ -204,7 +204,7 @@ realizableKE<BasicTurbulenceModel>::realizableKE
(
IOobject
(
"epsilon",
IOobject::groupName("epsilon", U.group()),
this->runTime_.timeName(),
this->mesh_,
IOobject::MUST_READ,
......
......@@ -281,13 +281,6 @@ Foam::tmp<Foam::vectorField> Foam::cyclicFaPatch::delta() const
}
Foam::label Foam::cyclicPolyPatch::neighbPatchID() const
{
NotImplemented;
return -1;
}
Foam::tmp<Foam::labelField> Foam::cyclicFaPatch::interfaceInternalField
(
const labelUList& internalData
......
......@@ -312,7 +312,7 @@ void Foam::fileFormats::AC3DsurfaceFormat<Face>::write
const pointField& pointLst = surf.points();
const UList<Face>& faceLst = surf.surfFaces();
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().size()
? surf.surfZones()
......@@ -393,7 +393,7 @@ void Foam::fileFormats::AC3DsurfaceFormat<Face>::write
if (zoneLst.size() <= 1)
{
const List<surfZone>& zones =
const surfZoneList zones =
(
zoneLst.size()
? zoneLst
......
......@@ -169,7 +169,7 @@ void Foam::fileFormats::FLMAsurfaceFormat<Face>::write
const UList<label>& faceMap = surf.faceMap();
// for no zones, suppress the group name
const List<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst, word::null)
......
......@@ -253,7 +253,7 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
const UList<point>& pointLst = surf.points();
const UList<Face>& faceLst = surf.surfFaces();
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().size()
? surf.surfZones()
......
......@@ -422,7 +422,7 @@ void Foam::fileFormats::NASsurfaceFormat<Face>::write
const UList<label>& faceMap = surf.faceMap();
// for no zones, suppress the group name
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst, "")
......
......@@ -226,7 +226,7 @@ void Foam::fileFormats::OBJsurfaceFormat<Face>::write
const UList<label>& faceMap = surf.faceMap();
// for no zones, suppress the group name
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst, "")
......
......@@ -41,7 +41,7 @@ void Foam::fileFormats::SMESHsurfaceFormat<Face>::write
const UList<Face>& faceLst = surf.surfFaces();
const UList<label>& faceMap = surf.faceMap();
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst)
......
......@@ -242,7 +242,7 @@ void Foam::fileFormats::STARCDsurfaceFormat<Face>::write
const UList<Face>& faceLst = surf.surfFaces();
const UList<label>& faceMap = surf.faceMap();
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst)
......
......@@ -215,7 +215,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeAscii
const UList<Face>& faceLst = surf.surfFaces();
const UList<label>& faceMap = surf.faceMap();
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst)
......@@ -269,7 +269,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeBinary
const UList<Face>& faceLst = surf.surfFaces();
const UList<label>& faceMap = surf.faceMap();
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().size() > 1
? surf.surfZones()
......
......@@ -161,7 +161,7 @@ void Foam::fileFormats::TRIsurfaceFormat<Face>::write
const UList<Face>& faceLst = surf.surfFaces();
const UList<label>& faceMap = surf.faceMap();
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst)
......
......@@ -269,7 +269,7 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
const UList<Face>& faceLst = surf.surfFaces();
const UList<label>& faceMap = surf.faceMap();
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst)
......
......@@ -118,7 +118,7 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::write
const UList<Face>& faceLst = surf.surfFaces();
const UList<label>& faceMap = surf.faceMap();
const List<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst)
......
......@@ -41,7 +41,7 @@ void Foam::fileFormats::X3DsurfaceFormat<Face>::write
const UList<label>& faceMap = surf.faceMap();
// for no zones, suppress the group name
const UList<surfZone>& zones =
const surfZoneList zones =
(
surf.surfZones().empty()
? surfaceFormatsCore::oneZone(faceLst, word::null)
......
......@@ -25,7 +25,7 @@ LES
kEqnCoeffs
{
Ce 1.048;
Ck 0.07; // 0.094;
Ck 0.02654; // set to approximate a Cs of 0.065
}
printCoeffs on;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment