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-16 12:37:24 +00:00
parent bf589e0fcd 2142331e40
commit 68a87d891b
13 changed files with 184 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
View File

@ -157,7 +157,7 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
surfaceScalarField phi("phi", aphiv_pos*rho_pos + aphiv_neg*rho_neg);
phi = aphiv_pos*rho_pos + aphiv_neg*rho_neg;
surfaceVectorField phiUp
(

2
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
View File

@ -212,7 +212,7 @@ snapControls
//- Maximum relative distance for points to be attracted by surface.
// True distance is this factor times local maximum edge length.
// Note: changed(corrected) w.r.t 17x! (17x used 2* tolerance)
tolerance 1.0;
tolerance 2.0;
//- Number of mesh displacement relaxation iterations.
nSolveIter 30;

2
applications/utilities/mesh/manipulation/setSet/setSet.C
View File

@ -1018,7 +1018,7 @@ int main(int argc, char *argv[])
is
);
if (!ok)
if (!ok && batch)
{
// Exit with error.
quit = true;

100
applications/utilities/mesh/manipulation/topoSet/topoSet.C
View File

@ -35,6 +35,10 @@ Description
#include "pointSet.H"
#include "globalMeshData.H"
#include "timeSelector.H"
#include "IOobjectList.H"
#include "cellZoneSet.H"
#include "faceZoneSet.H"
#include "pointZoneSet.H"
using namespace Foam;
@ -51,6 +55,96 @@ void printMesh(const Time& runTime, const polyMesh& mesh)
}
template<class ZoneType>
void removeZone
(
ZoneMesh<ZoneType, polyMesh>& zones,
const word& setName
)
{
label zoneID = zones.findZoneID(setName);
if (zoneID != -1)
{
Info<< "Removing zone " << setName << " at index " << zoneID << endl;
// Shuffle to last position
labelList oldToNew(zones.size());
label newI = 0;
forAll(oldToNew, i)
{
if (i != zoneID)
{
oldToNew[i] = newI++;
}
}
oldToNew[zoneID] = newI;
zones.reorder(oldToNew);
// Remove last element
zones.setSize(zones.size()-1);
zones.clearAddressing();
zones.write();
}
}
// Physically remove a set
void removeSet
(
const polyMesh& mesh,
const word& setType,
const word& setName
)
{
// Remove the file
IOobjectList objects
(
mesh,
mesh.time().findInstance
(
polyMesh::meshSubDir/"sets",
word::null,
IOobject::READ_IF_PRESENT,
mesh.facesInstance()
),
polyMesh::meshSubDir/"sets"
);
if (objects.found(setName))
{
// Remove file
fileName object = objects[setName]->objectPath();
Info<< "Removing file " << object << endl;
rm(object);
}
// See if zone
if (setType == cellZoneSet::typeName)
{
removeZone
(
const_cast<cellZoneMesh&>(mesh.cellZones()),
setName
);
}
else if (setType == faceZoneSet::typeName)
{
removeZone
(
const_cast<faceZoneMesh&>(mesh.faceZones()),
setName
);
}
else if (setType == pointZoneSet::typeName)
{
removeZone
(
const_cast<pointZoneMesh&>(mesh.pointZones()),
setName
);
}
}
polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
{
polyMesh::readUpdateState stat = mesh.readUpdate();
@ -284,6 +378,12 @@ int main(int argc, char *argv[])
currentSet().write();
break;
case topoSetSource::REMOVE:
Info<< " Removing set" << endl;
removeSet(mesh, setType, setName);
break;
default:
WarningIn(args.executable())
<< "Unhandled action " << action << endl;

10
applications/utilities/mesh/manipulation/topoSet/topoSetDict
View File

@ -22,8 +22,15 @@ FoamFile
// type cellSet;
//
// // action to perform on set. Two types:
// // - require no source : clear/invert
// // - require no source : clear/invert/remove
// // clear : clears set or zone
// // invert : select all currently non-selected elements
// // remove : removes set or zone
// // - require source : new/add/delete/subset
// // new : create new set or zone from source
// // add : add source to contents
// // delete : deletes source from contents
// // subset : keeps elements both in contents and source
// action new;
//
// The source entry varies according to the type of set:
@ -329,6 +336,7 @@ FoamFile
// faceSet f0; // name of faceSet
// cellSet c0; // name of cellSet of slave side
// }
//
actions
(

6
bin/foamCheckJobs
View File

@ -236,9 +236,9 @@ rm -f $TMPFILE; touch $TMPFILE
RUNJOBS=`getAllJobs $FOAM_JOB_DIR/runningJobs`
for f in $RUNJOBS
do
machinePid=`basename $f`
machine=`echo $machinePid | sed -e 's/\.[0-9][0-9]*$//'`
pid=`echo $machinePid | sed -e 's/.*\.\([0-9][0-9]*\)$/\1/'`
machinePid=`basename $f | sed -e 's/^"//' -e 's/"$//'`
machine=`echo "$machinePid" | sed -e 's/\.[0-9][0-9]*$//'`
pid=`echo "$machinePid" | sed -e 's/.*\.\([0-9][0-9]*\)$/\1/'`
fgrep "$machine" $TMPFILE >/dev/null 2>&1
if [ $? -ne 0 ]

4
bin/foamPrintJobs
View File

@ -214,7 +214,7 @@ then
fi
nProcs=`rightStr 3 "$nProcs"`
user=`getEntry $f 'username'`
user=`getEntry $f 'userName'`
user=${user:-'---'}
user=`leftStr 8 "$user"`
@ -273,7 +273,7 @@ then
fi
nProcs=`rightStr 3 "$nProcs"`
user=`getEntry $f 'username'`
user=`getEntry $f 'userName'`
user=${user:-'---'}
user=`leftStr 8 "$user"`

12
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
View File

@ -77,6 +77,18 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
zoneID_(-1),
pointIDs_()
{
if (undisplacedPoints_.size() != nPoints())
{
FatalIOErrorIn
(
"solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject&)",
dynamicMeshCoeffs_
) << "Read " << undisplacedPoints_.size()
<< " undisplaced points from " << undisplacedPoints_.objectPath()
<< " but the current mesh has " << nPoints()
<< exit(FatalError);
}
word cellZoneName =
dynamicMeshCoeffs_.lookupOrDefault<word>("cellZone", "none");

15
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
View File

@ -650,6 +650,9 @@ void Foam::addPatchCellLayer::calcSidePatch
// ------------------------------------------------------
const labelListList& edgeFaces = pp.edgeFaces();
DynamicList<label> dynMeshEdgeFaces;
forAll(edgeFaces, edgeI)
{
if (edgeFaces[edgeI].size() == 1 && sidePatchID[edgeI] == -1)
@ -660,7 +663,11 @@ void Foam::addPatchCellLayer::calcSidePatch
// Pick up any boundary face on this edge and use its properties
label meshEdgeI = meshEdges[edgeI];
const labelList& meshFaces = mesh.edgeFaces()[meshEdgeI];
const labelList& meshFaces = mesh.edgeFaces
(
meshEdgeI,
dynMeshEdgeFaces
);
forAll(meshFaces, k)
{
@ -716,7 +723,11 @@ void Foam::addPatchCellLayer::calcSidePatch
// Pick up any boundary face on this edge and use its properties
label meshEdgeI = meshEdges[edgeI];
const labelList& meshFaces = mesh.edgeFaces()[meshEdgeI];
const labelList& meshFaces = mesh.edgeFaces
(
meshEdgeI,
dynMeshEdgeFaces
);
forAll(meshFaces, k)
{

3
src/meshTools/cellDist/cellDistFuncs.C
View File

@ -330,7 +330,6 @@ void Foam::cellDistFuncs::correctBoundaryPointCells
{
// Correct all (non-visited) cells with point on wall
const labelListList& pointCells = mesh().pointCells();
const vectorField& cellCentres = mesh().cellCentres();
forAll(mesh().boundaryMesh(), patchI)
@ -346,7 +345,7 @@ void Foam::cellDistFuncs::correctBoundaryPointCells
{
label vertI = meshPoints[meshPointI];
const labelList& neighbours = pointCells[vertI];
const labelList& neighbours = mesh().pointCells(vertI);
forAll(neighbours, neighbourI)
{

15
src/meshTools/sets/topoSets/cellZoneSet.C
View File

@ -136,8 +136,21 @@ cellZoneSet::~cellZoneSet()
void cellZoneSet::invert(const label maxLen)
{
// Count
label n = 0;
for (label cellI = 0; cellI < maxLen; cellI++)
{
if (!found(cellI))
{
n++;
}
}
// Fill
addressing_.setSize(n);
n = 0;
for (label cellI = 0; cellI < maxLen; cellI++)
{
if (!found(cellI))
@ -146,7 +159,7 @@ void cellZoneSet::invert(const label maxLen)
n++;
}
}
addressing_.setSize(n);
updateSet();
}

16
src/meshTools/sets/topoSets/faceZoneSet.C
View File

@ -141,8 +141,22 @@ faceZoneSet::~faceZoneSet()
void faceZoneSet::invert(const label maxLen)
{
// Count
label n = 0;
for (label faceI = 0; faceI < maxLen; faceI++)
{
if (!found(faceI))
{
n++;
}
}
// Fill
addressing_.setSize(n);
flipMap_.setSize(n);
n = 0;
for (label faceI = 0; faceI < maxLen; faceI++)
{
if (!found(faceI))
@ -152,8 +166,6 @@ void faceZoneSet::invert(const label maxLen)
n++;
}
}
addressing_.setSize(n);
flipMap_.setSize(n);
updateSet();
}

14
src/meshTools/sets/topoSets/pointZoneSet.C
View File

@ -138,8 +138,21 @@ pointZoneSet::~pointZoneSet()
void pointZoneSet::invert(const label maxLen)
{
// Count
label n = 0;
for (label pointI = 0; pointI < maxLen; pointI++)
{
if (!found(pointI))
{
n++;
}
}
// Fill
addressing_.setSize(n);
n = 0;
for (label pointI = 0; pointI < maxLen; pointI++)
{
if (!found(pointI))
@ -148,7 +161,6 @@ void pointZoneSet::invert(const label maxLen)
n++;
}
}
addressing_.setSize(n);
updateSet();
}