zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2013-10-29 10:03:33 +00:00
parent 412432a975 41650787b1
commit 5b4b2fbd56
24 changed files with 83 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View File

@ -540,7 +540,7 @@ void subsetMesh
Info<< "Writing refined mesh to time " << runTime.timeName() << nl
<< endl;
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
refLevel.write();
}
@ -909,7 +909,7 @@ int main(int argc, char *argv[])
Info<< " Writing refined mesh to time " << runTime.timeName()
<< nl << endl;
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
refLevel.write();
}
@ -980,7 +980,7 @@ int main(int argc, char *argv[])
<< endl;
// Write final mesh
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
refLevel.write();
@ -991,7 +991,7 @@ int main(int argc, char *argv[])
<< endl;
// Write final mesh. (will have been written already if writeMesh=true)
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
refLevel.write();
}

4
applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
View File

@ -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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -696,7 +696,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();

2
applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
View File

@ -747,7 +747,7 @@ int main(int argc, char *argv[])
);
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();

4
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -1417,7 +1417,7 @@ int main(int argc, char *argv[])
mesh.setInstance(runTime.constant());
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< nl << "Writing mesh to " << mesh.objectPath() << endl;
mesh.write();

4
applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
View File

@ -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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -1543,7 +1543,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
// Zones

4
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
View File

@ -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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -862,7 +862,7 @@ int main(int argc, char *argv[])
);
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();

2
applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
View File

@ -256,7 +256,7 @@ int main(int argc, char *argv[])
);
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();

2
applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
View File

@ -60,7 +60,7 @@ int main(int argc, char *argv[])
sammMesh makeMesh(args[1], runTime, scaleFactor);
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing mesh" << endl;
makeMesh.writeMesh();

2
applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
View File

@ -65,7 +65,7 @@ int main(int argc, char *argv[])
starMesh makeMesh(args[1], runTime, scaleFactor);
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing mesh" << endl;
makeMesh.writeMesh();

2
applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
View File

@ -102,7 +102,7 @@ int main(int argc, char *argv[])
}
// increase the precision of the points data
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
// remove extensions and/or trailing '.'
const fileName prefix = fileName(args[1]).lessExt();

2
applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
View File

@ -316,7 +316,7 @@ int main(int argc, char *argv[])
}
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< nl << "Writing polyMesh" << endl;
mesh.removeFiles();

5
applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
View File

@ -248,8 +248,11 @@ int main(int argc, char *argv[])
{
mesh.setInstance(oldInstance);
}
mesh.write();
// Set the precision of the points data to 10
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
Info<< "End\n" << endl;

2
applications/utilities/mesh/manipulation/createPatch/createPatch.C
View File

@ -872,7 +872,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
if (!overwrite)
{

2
applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
View File

@ -91,7 +91,7 @@ int main(int argc, char *argv[])
twoDCorr.correctPoints(points);
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();

2
applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
View File

@ -62,7 +62,7 @@ int main(int argc, char *argv[])
);
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing mirrored mesh" << endl;
mesh.mirrorMesh().write();

4
applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
View File

@ -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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -100,7 +100,7 @@ int main(int argc, char *argv[])
points = transform(T, points);
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();

2
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View File

@ -472,7 +472,7 @@ int main(int argc, char *argv[])
}
Info<< nl << "Writing polyMesh to time " << runTime.timeName() << endl;
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
// Bypass runTime write (since only writes at outputTime)
if

2
applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
View File

@ -303,7 +303,7 @@ int main(int argc, char *argv[])
}
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();

2
applications/utilities/preProcessing/mapFields/mapFieldsDict
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// List of pairs of source/target patches for mapping
// List of pairs of target/source patches for mapping
patchMap
(
lid movingWall

49
src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -74,11 +74,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Find the point and cell instance
fileName pointsInst(time().findInstance(meshDir(), "points"));
fileName facesInst(time().findInstance(meshDir(), "faces"));
//fileName boundaryInst(time().findInstance(meshDir(), "boundary"));
if (debug)
{
Info<< "Faces instance: old = " << facesInstance()
<< " new = " << facesInst << nl
//<< "Boundary instance: old = " << boundary_.instance()
//<< " new = " << boundaryInst << nl
<< "Points instance: old = " << pointsInstance()
<< " new = " << pointsInst << endl;
}
@ -447,6 +450,50 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
geometricD_ = Vector<label>::zero;
solutionD_ = Vector<label>::zero;
//if (boundaryInst != boundary_.instance())
//{
// // Boundary file but no topology change
// if (debug)
// {
// Info<< "Boundary state change" << endl;
// }
//
// // Reset the boundary patches
// polyBoundaryMesh newBoundary
// (
// IOobject
// (
// "boundary",
// facesInst,
// meshSubDir,
// *this,
// IOobject::MUST_READ,
// IOobject::NO_WRITE,
// false
// ),
// *this
// );
//
//
//
//
// boundary_.clear();
// boundary_.setSize(newBoundary.size());
//
// forAll(newBoundary, patchI)
// {
// boundary_.set(patchI, newBoundary[patchI].clone(boundary_));
// }
// // Calculate topology for the patches (processor-processor comms
// // etc.)
// boundary_.updateMesh();
//
// // Calculate the geometry for the patches (transformation tensors
// // etc.)
// boundary_.calcGeometry();
//}
return polyMesh::POINTS_MOVED;
}
else

3
src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -237,7 +237,6 @@ void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
os.writeKeyword("Ceps2") << Ceps2_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}

5
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
View File

@ -2459,8 +2459,9 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
const dictionary& motionDict
)
{
// Clip to 30 degrees
scalar planarAngle = min(30.0, layerParams.featureAngle());
// Clip to 30 degrees. Not helpful!
//scalar planarAngle = min(30.0, layerParams.featureAngle());
scalar planarAngle = layerParams.featureAngle();
scalar minCos = Foam::cos(degToRad(planarAngle));
scalar concaveCos = Foam::cos(degToRad(layerParams.concaveAngle()));

1
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
View File

@ -235,7 +235,6 @@ void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
os.writeKeyword("Ceps2") << Ceps2_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}

3
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -233,7 +233,6 @@ void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
os.writeKeyword("Ceps2") << Ceps2_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}