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/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2011-11-22 16:02:01 +00:00
parent 9bd358f0a7 6b52dce0fc
commit 6286b2e679
7 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/parallelProcessing/redistributeMeshPar/Make/files
View File

@ -1,3 +0,0 @@
redistributeMeshPar.C
EXE = $(FOAM_APPBIN)/redistributeMeshPar

3
applications/utilities/parallelProcessing/redistributePar/Make/files Normal file
View File

@ -0,0 +1,3 @@
redistributePar.C
EXE = $(FOAM_APPBIN)/redistributePar

0
applications/utilities/parallelProcessing/redistributeMeshPar/Make/options → applications/utilities/parallelProcessing/redistributePar/Make/options
View File

4
applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C → applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application Application
redistributeMeshPar redistributePar
Description Description
Redistributes existing decomposed mesh and fields according to the current Redistributes existing decomposed mesh and fields according to the current
@ -42,7 +42,7 @@ Description
cp -r constant processor0 cp -r constant processor0
# Distribute # Distribute
mpirun -np ddd redistributeMeshPar -parallel mpirun -np ddd redistributePar -parallel
\endverbatim \endverbatim
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/

6
src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
View File

@ -235,7 +235,11 @@ tmp<Field<Type> > volPointInterpolation::flatBoundaryField
{ {
label bFaceI = bm[patchI].patch().start() - mesh.nInternalFaces(); label bFaceI = bm[patchI].patch().start() - mesh.nInternalFaces();
if (!isA<emptyFvPatch>(bm[patchI]) && !bm[patchI].coupled()) if
(
!isA<emptyFvPatch>(bm[patchI])
&& !vf.boundaryField()[patchI].coupled()
)
{ {
SubList<Type> SubList<Type>
( (

12
src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
View File

@ -31,6 +31,8 @@ License
#include "coupledPointPatchFields.H" #include "coupledPointPatchFields.H"
#include "pointConstraint.H" #include "pointConstraint.H"
#include "surfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
@ -75,11 +77,19 @@ void volPointInterpolation::calcBoundaryAddressing()
const polyBoundaryMesh& pbm = mesh().boundaryMesh(); const polyBoundaryMesh& pbm = mesh().boundaryMesh();
// Get precalculated volField only so we can use coupled() tests for
// cyclicAMI
const surfaceScalarField& magSf = mesh().magSf();
forAll(pbm, patchI) forAll(pbm, patchI)
{ {
const polyPatch& pp = pbm[patchI]; const polyPatch& pp = pbm[patchI];
if (!isA<emptyPolyPatch>(pp) && !pp.coupled()) if
(
!isA<emptyPolyPatch>(pp)
&& !magSf.boundaryField()[patchI].coupled()
)
{ {
label bFaceI = pp.start()-mesh().nInternalFaces(); label bFaceI = pp.start()-mesh().nInternalFaces();

2
tutorials/incompressible/simpleFoam/turbineSiting/Allrun
View File

@ -25,7 +25,7 @@ cp system/decomposeParDict-4proc system/decomposeParDict
# Unset floating point trapping since creating processor directories # Unset floating point trapping since creating processor directories
unset FOAM_SIGFPE unset FOAM_SIGFPE
unset FOAM_SETNAN unset FOAM_SETNAN
runParallel redistributeMeshPar 4 -overwrite runParallel redistributePar 4 -overwrite
runParallel renumberMesh 4 -overwrite runParallel renumberMesh 4 -overwrite
# Add wildcard entries for meshes patches since not preserved # Add wildcard entries for meshes patches since not preserved