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 /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2014-02-03 14:15:10 +00:00
parent e976c1d8dd 7c350b0f6d
commit 037852d649
8 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -177,22 +177,26 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
scalar totProfile = returnReduce(profile, sumOp<scalar>()); scalar totProfile = returnReduce(profile, sumOp<scalar>());
int oldPrecision = Info().precision(4);
Info<< setw(8) << levelI Info<< setw(8) << levelI
<< setw(8) << totNprocs << setw(8) << totNprocs
<< " " << " "
<< setw(8) << totNCells/totNprocs << setw(8) << totNCells/totNprocs
<< setw(8) << maxNCells << setw(8) << maxNCells
<< " " << " "
<< setw(8) << setprecision(4) << totFaceCellRatio/totNprocs << setw(8) << totFaceCellRatio/totNprocs
<< setw(8) << setprecision(4) << maxFaceCellRatio << setw(8) << maxFaceCellRatio
<< " " << " "
<< setw(8) << scalar(totNInt)/totNprocs << setw(8) << scalar(totNInt)/totNprocs
<< setw(8) << maxNInt << setw(8) << maxNInt
<< " " << " "
<< setw(8) << setprecision(4) << totRatio/totNprocs << setw(8) << totRatio/totNprocs
<< setw(8) << setprecision(4) << maxRatio << setw(8) << maxRatio
<< setw(12) << setprecision(4) << totProfile/totNprocs << setw(12) << totProfile/totNprocs
<< nl; << nl;
Info().precision(oldPrecision);
} }
Info<< endl; Info<< endl;
} }

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

@ -1262,6 +1262,8 @@ void Foam::autoLayerDriver::calculateLayerThickness
{ {
const polyBoundaryMesh& patches = mesh.boundaryMesh(); const polyBoundaryMesh& patches = mesh.boundaryMesh();
int oldPrecision = Info().precision();
// Find maximum length of a patch name, for a nicer output // Find maximum length of a patch name, for a nicer output
label maxPatchNameLen = 0; label maxPatchNameLen = 0;
forAll(patchIDs, i) forAll(patchIDs, i)
@ -1337,7 +1339,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
<< " " << setw(8) << avgThickness << " " << setw(8) << avgThickness
<< endl; << endl;
} }
Info<< endl; Info<< setprecision(oldPrecision) << endl;
} }
} }
@ -2476,6 +2478,8 @@ void Foam::autoLayerDriver::printLayerData
{ {
const polyBoundaryMesh& pbm = mesh.boundaryMesh(); const polyBoundaryMesh& pbm = mesh.boundaryMesh();
int oldPrecision = Info().precision();
// Find maximum length of a patch name, for a nicer output // Find maximum length of a patch name, for a nicer output
label maxPatchNameLen = 0; label maxPatchNameLen = 0;
forAll(patchIDs, i) forAll(patchIDs, i)
@ -2554,7 +2558,7 @@ void Foam::autoLayerDriver::printLayerData
<< " " << setw(8) << 100*avgFraction << " " << setw(8) << 100*avgFraction
<< endl; << endl;
} }
Info<< endl; Info<< setprecision(oldPrecision) << endl;
} }

1
tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
View File

@ -64,6 +64,7 @@ functions
( 0 9.95 19.77 ) ( 0 9.95 19.77 )
( 0 -9.95 19.77 ) ( 0 -9.95 19.77 )
); );
fixedLocations false;
fields fields
( (
p p

1
tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
View File

@ -64,6 +64,7 @@ functions
( 0 9.95 19.77 ) ( 0 9.95 19.77 )
( 0 -9.95 19.77 ) ( 0 -9.95 19.77 )
); );
fixedLocations false;
fields fields
( (
p p

1
tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
View File

@ -63,6 +63,7 @@ functions
( 0 9.95 19.77 ) ( 0 9.95 19.77 )
( 0 -9.95 19.77 ) ( 0 -9.95 19.77 )
); );
fixedLocations false;
fields fields
( (
p p

1
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
View File

@ -64,6 +64,7 @@ functions
( 0 9.95 19.77 ) ( 0 9.95 19.77 )
( 0 -9.95 19.77 ) ( 0 -9.95 19.77 )
); );
fixedLocations false;
fields fields
( (
p p

1
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
View File

@ -64,6 +64,7 @@ functions
( 0 9.95 19.77 ) ( 0 9.95 19.77 )
( 0 -9.95 19.77 ) ( 0 -9.95 19.77 )
); );
fixedLocations false;
fields fields
( (
p p

1
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
View File

@ -64,6 +64,7 @@ functions
( 0 9.95 19.77 ) ( 0 9.95 19.77 )
( 0 -9.95 19.77 ) ( 0 -9.95 19.77 )
); );
fixedLocations false;
fields fields
( (
p p