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

Merge branch 'HrvojeJasak'

Browse source
This commit is contained in:
Hrvoje Jasak 2010-11-12 16:31:57 +00:00
commit 12fc6ccb65
19 changed files with 561795 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
View file

@ -234,19 +234,22 @@ public:
// IOstream operators
// Write DynamicField to Ostream.
friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
(
Ostream&,
const DynamicField<T, SizeInc, SizeMult, SizeDiv>&
);
//HJ, this does not compile with Icc. Cannot figure it out
// HJ, 11/Nov/2010
//- Read from Istream, discarding contents of existing DynamicField.
friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
(
Istream&,
DynamicField<T, SizeInc, SizeMult, SizeDiv>&
);
// //- Write DynamicField to Ostream.
// friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
// (
// Ostream&,
// const DynamicField<T, SizeInc, SizeMult, SizeDiv>&
// );
// //- Read from Istream, discarding contents of existing DynamicField.
// friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
// (
// Istream&,
// DynamicField<T, SizeInc, SizeMult, SizeDiv>&
// );
};

1
src/dynamicMesh/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
View file

@ -201,7 +201,6 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
Info << "Adding mesh zones." << endl;
addZones(pz, fz, cz);
// Add layer addition/removal interfaces
topoChanger_.setSize(2);

6
src/dynamicMesh/topoChangerFvMesh/multiMixerFvMesh/multiMixerFvMesh.C
View file

@ -96,8 +96,7 @@ void Foam::multiMixerFvMesh::addZonesAndModifiers()
List<cellZone*> czList;
czList.transfer(cz.shrink());
Info << "pzList: " << pzList.size() << " fzList: " << fzList.size()
<< " czList: " << czList.size() << endl;
addZones(pzList, fzList, czList);
}
@ -118,6 +117,9 @@ void Foam::multiMixerFvMesh::addZonesAndModifiers()
topoChanger_.writeOpt() = IOobject::AUTO_WRITE;
topoChanger_.write();
}
// Write mesh with new zones
write();
}

46
tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/boundary Normal file
View file

@ -0,0 +1,46 @@
/*--------------------------------*- 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;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
inlet
{
type patch;
nFaces 20;
startFace 1540;
}
outlet
{
type patch;
nFaces 20;
startFace 1560;
}
fixedWalls
{
type wall;
nFaces 80;
startFace 1580;
}
defaultFaces
{
type empty;
nFaces 1600;
startFace 1660;
}
)
// ************************************************************************* //

24
tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/cloudProperties Normal file
View file

@ -0,0 +1,24 @@
/*--------------------------------*- 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 dictionary;
location "0/uniform/lagrangian/dsmc";
object cloudProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
processor0
{
particleCount 191934;
}
// ************************************************************************* //

24
tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/cloudProperties Normal file
View file

@ -0,0 +1,24 @@
/*--------------------------------*- 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 dictionary;
location "0/uniform/lagrangian/dsmc";
object cloudProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
processor0
{
particleCount 63978;
}
// ************************************************************************* //

24
tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/uniform/lagrangian/dsmc/cloudProperties Normal file
View file

@ -0,0 +1,24 @@
/*--------------------------------*- 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 dictionary;
location "0/uniform/lagrangian/dsmc";
object cloudProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
processor0
{
particleCount 810200;
}
// ************************************************************************* //

58
tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/boundary Normal file
View file

@ -0,0 +1,58 @@
/*--------------------------------*- 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 binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
maxX
{
type wall;
nFaces 1200;
startFace 210000;
}
minZ
{
type wall;
nFaces 3600;
startFace 211200;
}
maxZ
{
type wall;
nFaces 3600;
startFace 214800;
}
minX
{
type wall;
nFaces 1200;
startFace 218400;
}
minY
{
type wall;
nFaces 1200;
startFace 219600;
}
maxY
{
type wall;
nFaces 1200;
startFace 220800;
}
)
// ************************************************************************* //

34
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/boundary Normal file
View file

@ -0,0 +1,34 @@
/*--------------------------------*- 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 "0.001/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
2
(
atmosphere
{
type patch;
nFaces 1024;
startFace 93568;
}
walls
{
type wall;
nFaces 5376;
startFace 94592;
}
)
// ************************************************************************* //

32280
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/cellMap Normal file
View file

File diff suppressed because it is too large Load diff

99992
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/faceMap Normal file
View file

File diff suppressed because it is too large Load diff

99992
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/faces Normal file
View file

File diff suppressed because it is too large Load diff

93593
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/neighbour Normal file
View file

File diff suppressed because it is too large Load diff

99993
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/owner Normal file
View file

File diff suppressed because it is too large Load diff

20
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/patchMap Normal file
View file

@ -0,0 +1,20 @@
/*--------------------------------*- 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 labelList;
location "0.001/polyMesh";
object patchMap;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
2(0 1)
// ************************************************************************* //

35569
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/pointMap Normal file
View file

File diff suppressed because it is too large Load diff

35569
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/points Normal file
View file

File diff suppressed because it is too large Load diff

32279
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/sets/c0 Normal file
View file

File diff suppressed because it is too large Load diff

32279
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/polyMesh/sets/c0_old Normal file
View file

File diff suppressed because it is too large Load diff