Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

Conflicts:
	tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
	tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
This commit is contained in:
Henry
2011-07-23 19:53:38 +01:00
4 changed files with 10 additions and 1 deletions

View File

@ -110,7 +110,7 @@ void Foam::porousBafflePressureFvPatchField<Foam::scalar>::updateCoeffs()
<< endl; << endl;
} }
jumpCyclicFvPatchField<scalar>::updateCoeffs(); fixedJumpFvPatchField<scalar>::updateCoeffs();
} }

View File

@ -23,6 +23,9 @@ setDamBreakFine ()
mv temp.$$ $controlDict mv temp.$$ $controlDict
} }
# Do damBreakPorousBaffle
(cd damBreakPorousBaffle && foamRunTutorials)
# Do damBreak # Do damBreak
(cd damBreak && foamRunTutorials) (cd damBreak && foamRunTutorials)

View File

@ -10,6 +10,9 @@ application=`getApplication`
runApplication blockMesh runApplication blockMesh
runApplication setFields runApplication setFields
unset FOAM_SIGFPE
unset FOAM_SETNAN
# Create faceZones for porous baffles # Create faceZones for porous baffles
runApplication topoSet runApplication topoSet

View File

@ -0,0 +1,3 @@
faceSet cyclicFaces new boxToFace (0.3015 0.0493 -1) (0.3069 0.2077 1);
cellSet cyclicFacesSlaveCells new boxToCell (-1 0 -1) (0.305 0.31 1)
faceZoneSet cyclicZoneFaces new setsToFaceZone cyclicFaces cyclicFacesSlaveCells