diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C index ae345c2066..d2c52d0204 100644 --- 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); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index 5fb7fffe50..3fac6847e7 100644 --- 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::New("Ta", dict)), + q_(), + h_(), + Ta_(), relaxation_(dict.lookupOrDefault("relaxation", 1)), emissivity_(dict.lookupOrDefault("emissivity", 0)), qrRelaxation_(dict.lookupOrDefault("qrRelaxation", 1)), @@ -109,6 +113,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField case fixedHeatTransferCoeff: { h_ = scalarField("h", dict, p.size()); + Ta_ = Function1::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; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C index 7bfeabc0ab..0c974ff84f 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C @@ -192,7 +192,7 @@ realizableKE::realizableKE ( IOobject ( - "k", + IOobject::groupName("k", U.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -204,7 +204,7 @@ realizableKE::realizableKE ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C index b8f362f457..0b6e933742 100644 --- 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::cyclicFaPatch::delta() const } -Foam::label Foam::cyclicPolyPatch::neighbPatchID() const -{ - NotImplemented; - return -1; -} - - Foam::tmp Foam::cyclicFaPatch::interfaceInternalField ( const labelUList& internalData diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C index 8db848a08c..a4b3d26587 100644 --- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C @@ -312,7 +312,7 @@ void Foam::fileFormats::AC3DsurfaceFormat::write const pointField& pointLst = surf.points(); const UList& faceLst = surf.surfFaces(); - const UList& zones = + const surfZoneList zones = ( surf.surfZones().size() ? surf.surfZones() @@ -393,7 +393,7 @@ void Foam::fileFormats::AC3DsurfaceFormat::write if (zoneLst.size() <= 1) { - const List& zones = + const surfZoneList zones = ( zoneLst.size() ? zoneLst diff --git a/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C b/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C index b834b4ae5f..7225a47cc4 100644 --- a/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C @@ -169,7 +169,7 @@ void Foam::fileFormats::FLMAsurfaceFormat::write const UList