diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index f050d82a79023582d9cd2165726e84d57aa0f48f..e607080a66d3fb34b541b507823b929cd679f391 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -37,15 +37,24 @@ using namespace Foam;
int main(int argc, char *argv[])
{
+
+# include "addOverwriteOption.H"
# include "setRootCase.H"
# include "createTime.H"
+ const bool overwrite = args.optionFound("overwrite");
+
+ if (!overwrite)
+ {
+ runTime++;
+ }
+
mirrorFvMesh mesh
(
IOobject
(
mirrorFvMesh::defaultRegion,
- runTime.timeName(),
+ runTime.constant(),
runTime
)
);
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 5f724095ca4a36b58dc5e1ca7314b54962c71e10..395ee77cbebfeac6951b6e8cf86a9c78e706e5ad 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -1036,6 +1036,22 @@ int main(int argc, char *argv[])
(
UIndirectList<label>(faceProcAddressing, map().faceMap())
);
+
+ // Detect any flips.
+ const labelHashSet& fff = map().flipFaceFlux();
+ forAllConstIter(labelHashSet, fff, iter)
+ {
+ label faceI = iter.key();
+ label masterFaceI = faceProcAddressing[faceI];
+
+ faceProcAddressing[faceI] = -masterFaceI;
+
+ if (masterFaceI == 0)
+ {
+ FatalErrorIn(args.executable()) << "problem faceI:" << faceI
+ << " masterFaceI:" << masterFaceI << exit(FatalError);
+ }
+ }
}
if (pointProcAddressing.headerOk())
{
@@ -1083,9 +1099,13 @@ int main(int argc, char *argv[])
);
Info<< "After renumbering :" << nl
<< " band : " << band << nl
- << " profile : " << profile << nl
- << " rms frontwidth : " << rmsFrontwidth << nl
- << endl;
+ << " profile : " << profile << nl;
+ if (doFrontWidth)
+ {
+
+ Info<< " rms frontwidth : " << rmsFrontwidth << nl;
+ }
+ Info<< endl;
}
if (orderPoints)
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
index 33105892ce685436b15d5364686cb0746558fac5..58c74f4c4b55ce3f81a6ed3e8407d4bbe4d219e0 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -377,18 +377,24 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
// take care of the face direction offset trick.
//
{
- labelList curAddr(faceProcAddressing_[procI]);
+ const labelList& faceMap = faceProcAddressing_[procI];
- forAll(curAddr, addrI)
+ // Addressing into original field
+ labelList curAddr(faceMap.size());
+ // Correctly oriented copy of internal field
+ Field<Type> procInternalField(procField.internalField());
+
+ forAll(faceMap, addrI)
{
- curAddr[addrI] -= 1;
+ curAddr[addrI] = mag(faceMap[addrI])-1;
+ if (faceMap[addrI] < 0)
+ {
+ procInternalField[addrI] = -procInternalField[addrI];
+ }
}
- internalField.rmap
- (
- procField.internalField(),
- curAddr
- );
+ // Map
+ internalField.rmap(procInternalField, curAddr);
}
// Set the boundary patch values in the reconstructed field
diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index 57acb8153366f45b4ac83f642d81fb380b58a811..02637c203a1de3474f2d59a7ebd761933b2f7733 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -102,8 +102,10 @@ greyDiffusiveRadiationMixedFvPatchScalarField
const scalarField& Tp =
patch().lookupPatchField<volScalarField, scalar>(TName_);
+ //NOTE: Assumes emissivity = 1 as the solidThermo might
+ // not be constructed yet
refValue() =
- 4.0*physicoChemical::sigma.value()*pow4(Tp)*emissivity()/pi;
+ 4.0*physicoChemical::sigma.value()*pow4(Tp)/pi;
refGrad() = 0.0;
valueFraction() = 1.0;
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index ff459f8006147357dd3c19a8be9c2e4a1278d113..d5943dda5e118d5b3158b4c64ba3da1220072f0c 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -174,7 +174,7 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::updateCoeffs()
void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- zGround_.writeEntry("z0", os) ;
+ z0_.writeEntry("z0", os) ;
os.writeKeyword("n")
<< n_ << token::END_STATEMENT << nl;
os.writeKeyword("z")
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index 7fc53289cc8fba7129b758ef806409660e87cc7c..f08a1ebff825d2d924506dbf969acd6e7f9b68f0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -174,7 +174,6 @@ dictionaryReplacement
type greyDiffusiveRadiation;
T T;
emissivityMode lookup;
- Qro uniform 0;
emissivity uniform 1.0;
value uniform 0;
}
@@ -184,7 +183,6 @@ dictionaryReplacement
type greyDiffusiveRadiation;
T T;
emissivityMode solidThermo;
- Qro uniform 0;
value uniform 0;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index 6647732e8f732cfaaeedd68505b671e43f29d830..4c78380972a483f8db32196a70ba41df408f3cf1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -221,7 +221,6 @@ dictionaryReplacement
type greyDiffusiveRadiation;
T T;
emissivityMode lookup;
- Qro uniform 0;
emissivity uniform 1.0;
value uniform 0;
}
@@ -231,7 +230,6 @@ dictionaryReplacement
type greyDiffusiveRadiation;
T T;
emissivityMode solidThermo;
- Qro uniform 0;
value uniform 0;
}
}
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
index 213da0de109463e68173277f9235bc6c5077a544..a25fd5e1c4ebf83bd5a8b6afb5eab93ed8f7bceb 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
@@ -5,6 +5,5 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-rm -rf 0/polyMesh
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
index 612446c68e786925944e8cf69febec30186206e7..fd85f49a951d0ded2fad152f116e272f97164bad 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
@@ -10,17 +10,14 @@ application=`getApplication`
runApplication blockMesh
transformPoints -scale '(1.6666 1 1)'
-#cp system/changeDictionaryDict.X system/changeDictionaryDict
runApplication changeDictionary -instance system -dict system/changeDictionaryDict.X
-runApplication mirrorMesh
+runApplication mirrorMesh -overwrite
rm log.mirrorMesh
rm log.changeDictionary
-#cp system/changeDictionaryDict.Y system/changeDictionaryDict
runApplication changeDictionary -instance system -dict system/changeDictionaryDict.Y
-runApplication mirrorMesh
-cp -rf 0/polyMesh constant/
+runApplication mirrorMesh -overwrite
runApplication topoSet
runApplication createPatch -overwrite
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
deleted file mode 100644
index ff3254a0cb60dfcc732d8651e9cc43f1738c5533..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class polyBoundaryMesh;
- location "0/polyMesh";
- object boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
- outlet
- {
- type patch;
- nFaces 320;
- startFace 99370;
- }
- up
- {
- type symmetryPlane;
- nFaces 380;
- startFace 99690;
- }
- hole
- {
- type wall;
- nFaces 560;
- startFace 100070;
- }
- frontAndBack
- {
- type empty;
- nFaces 100000;
- startFace 100630;
- }
-)
-
-// ************************************************************************* //