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

2025-11-28 03:28:01 +00:00 · 2018-03-16 23:38:29 +01:00
parent 6a541ccc92 fae1ba0f63
commit f0435beb9c
17 changed files with 34 additions and 28 deletions
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
@ -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);

--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@ -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;
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
@ -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,
--- a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
@ -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
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@ -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
--- a/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C
@ -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)
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@ -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()
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@ -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, "")
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@ -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, "")
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
@ -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)
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@ -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)
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@ -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()
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@ -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)
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@ -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)
--- a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C
@ -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)
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
@ -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)
--- a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/turbulenceProperties
@ -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;