exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'nextRelease' of ssh://git.code.sf.net/p/openfoam-extend/OpenFOAM-1.6-ext into nextRelease

Browse source 
Conflicts:
	tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
	tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/boundary
	tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/cellZones
	tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/faces
	tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/neighbour
	tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/owner
	tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/points
This commit is contained in:
Hrvoje Jasak 2013-11-04 10:14:41 +00:00
commit df769c0387
8 changed files with 5 additions and 329202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
View file

@ -4,6 +4,10 @@
. $WM_PROJECT_DIR/bin/tools/CleanFunctions . $WM_PROJECT_DIR/bin/tools/CleanFunctions
rm -rf 0 > /dev/null 2>&1 rm -rf 0 > /dev/null 2>&1
<<<<<<< HEAD
=======
rm -rf constant/setSubset > /dev/null 2>&1
>>>>>>> 3d822b2a7c2d40a5f1b828ca33762a1e3eaad27d
cleanCase cleanCase

34
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/boundary
View file

@ -1,34 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
2
(
atmosphere
{
type patch;
nFaces 1024;
startFace 93568;
}
walls
{
type wall;
nFaces 5376;
startFace 94592;
}
)
// ************************************************************************* //

21
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/cellZones
View file

@ -1,21 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class regIOobject;
location "constant/polyMesh";
object cellZones;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
0
()
// ************************************************************************* //

99992
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/faces
View file

File diff suppressed because it is too large Load diff

93593
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/neighbour
View file

File diff suppressed because it is too large Load diff

99993
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/owner
View file

File diff suppressed because it is too large Load diff

35569
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/setSubset/polyMesh/points
View file

File diff suppressed because it is too large Load diff

1
tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
View file

@ -5,6 +5,7 @@
rm system/cellSetDict > /dev/null 2>&1 rm system/cellSetDict > /dev/null 2>&1
rm -rf 0 > /dev/null 2>&1 rm -rf 0 > /dev/null 2>&1
rm -rf constant/setSubset > /dev/null 2>&1
cleanCase cleanCase