Commit 0ca515e3 authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge remote branch 'OpenCFD/master' into olesenm

parents 895a077c 0b6d0300
......@@ -12,6 +12,7 @@ bool Foam::checkSync(const wordList& names)
List<wordList> allNames(Pstream::nProcs());
allNames[Pstream::myProcNo()] = names;
Pstream::gatherList(allNames);
Pstream::scatterList(allNames);
bool hasError = false;
......@@ -72,8 +73,8 @@ Foam::label Foam::checkTopology
Info<< " ***FaceZone " << mesh.faceZones()[zoneI].name()
<< " is not correctly synchronised"
<< " across coupled boundaries."
<< " (coupled faces both"
<< " present in set but with opposite flipmap)" << endl;
<< " (coupled faces are either not both "
<< " present in set or have same flipmap)" << endl;
noFailedChecks++;
}
}
......
......@@ -49,7 +49,7 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
end
# set VERSION and MAJOR (version) variables if not already set
if ( ! $?ParaView_VERSION || "x$ParaView_VERSION" == "x" ) setenv ParaView_VERSION 3.6.1
if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1
if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
# if needed, set MAJOR version to correspond to VERSION
......
......@@ -726,6 +726,7 @@ DebugSwitches
shapeList 0;
shapeToCell 0;
simple 0;
sixDoFRigidBodyMotionConstraint 0;
skewCorrected 0;
skewCorrectionVectors 0;
sliced 0;
......
......@@ -85,6 +85,9 @@ void Foam::polyMesh::calcDirections() const
}
}
reduce(nEmptyPatches, maxOp<label>());
reduce(nWedgePatches, maxOp<label>());
if (nEmptyPatches)
{
reduce(emptyDirVec, sumOp<vector>());
......
......@@ -498,10 +498,9 @@ bool Foam::faceZone::checkParallelSync(const bool report) const
break;
}
}
// Flip state should be opposite.
if (myZoneFlip[bFaceI] == neiZoneFlip[bFaceI])
else if (myZoneFlip[bFaceI] == neiZoneFlip[bFaceI])
{
// Flip state should be opposite.
hasError = true;
if (report)
......
......@@ -349,7 +349,10 @@ Foam::label Foam::addPatchCellLayer::addSideFace
// Get my mesh face and its zone.
label meshFaceI = pp.addressing()[ownFaceI];
label zoneI = mesh_.faceZones().whichZone(meshFaceI);
// Zone info comes from any side patch face. Otherwise -1 since we
// don't know what to put it in - inherit from the extruded faces?
label zoneI = -1; //mesh_.faceZones().whichZone(meshFaceI);
bool flip = false;
label addedFaceI = -1;
......@@ -376,6 +379,12 @@ Foam::label Foam::addPatchCellLayer::addSideFace
)
{
otherPatchID = patches.whichPatch(faceI);
zoneI = mesh_.faceZones().whichZone(faceI);
if (zoneI != -1)
{
label index = mesh_.faceZones()[zoneI].whichFace(faceI);
flip = mesh_.faceZones()[zoneI].flipMap()[index];
}
break;
}
}
......@@ -422,7 +431,7 @@ Foam::label Foam::addPatchCellLayer::addSideFace
false, // flux flip
otherPatchID, // patch for face
zoneI, // zone for face
false // face zone flip
flip // face zone flip
)
);
}
......@@ -488,7 +497,7 @@ Foam::label Foam::addPatchCellLayer::addSideFace
false, // flux flip
-1, // patch for face
zoneI, // zone for face
false // face zone flip
flip // face zone flip
)
);
......@@ -1027,12 +1036,21 @@ void Foam::addPatchCellLayer::setRefinement
// Get new neighbour
label nei;
label patchI;
label zoneI = -1;
bool flip = false;
if (i == addedCells[patchFaceI].size()-1)
{
// Top layer so is patch face.
nei = -1;
patchI = patchID[patchFaceI];
zoneI = mesh_.faceZones().whichZone(meshFaceI);
if (zoneI != -1)
{
const faceZone& fz = mesh_.faceZones()[zoneI];
flip = fz.flipMap()[fz.whichFace(meshFaceI)];
}
}
else
{
......@@ -1055,7 +1073,7 @@ void Foam::addPatchCellLayer::setRefinement
false, // flux flip
patchI, // patch for face
zoneI, // zone for face
false // face zone flip
flip // face zone flip
)
);
}
......@@ -1076,8 +1094,6 @@ void Foam::addPatchCellLayer::setRefinement
layerFaces_[patchFaceI][0] = meshFaceI;
label zoneI = mesh_.faceZones().whichZone(meshFaceI);
meshMod.setAction
(
polyModifyFace
......@@ -1088,8 +1104,8 @@ void Foam::addPatchCellLayer::setRefinement
addedCells[patchFaceI][0], // neighbour
false, // face flip
-1, // patch for face
false, // remove from zone
zoneI, // zone for face
true, //false, // remove from zone
-1, //zoneI, // zone for face
false // face flip in zone
)
);
......
......@@ -322,7 +322,9 @@ void Foam::removeCells::setRefinement
if (zoneID >= 0)
{
const faceZone& fZone = faceZones[zoneID];
zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
// Note: we reverse the owner/neighbour of the face
// so should also select the other side of the zone
zoneFlip = !fZone.flipMap()[fZone.whichFace(faceI)];
}
//Pout<< "Putting exposed internal face " << faceI
......
......@@ -276,28 +276,50 @@ void Foam::fvMeshSubset::subsetZones()
{
const faceZone& fz = faceZones[i];
// Create list of mesh faces part of the new zone
labelList subAddressing
(
subset
(
baseMesh().nFaces(),
fz,
faceMap()
)
);
// Flipmap for all mesh faces
boolList fullFlipStatus(baseMesh().nFaces(), false);
// Expand faceZone to full mesh
// +1 : part of faceZone, flipped
// -1 : ,, , unflipped
// 0 : not part of faceZone
labelList zone(baseMesh().nFaces(), 0);
forAll(fz, j)
{
fullFlipStatus[fz[j]] = fz.flipMap()[j];
if (fz.flipMap()[j])
{
zone[fz[j]] = 1;
}
else
{
zone[fz[j]] = -1;
}
}
// Select faces
label nSub = 0;
forAll(faceMap(), j)
{
if (zone[faceMap()[j]] != 0)
{
nSub++;
}
}
// Extract sub part
boolList subFlipStatus(subAddressing.size(), false);
forAll(subAddressing, j)
labelList subAddressing(nSub);
boolList subFlipStatus(nSub);
nSub = 0;
forAll(faceMap(), subFaceI)
{
subFlipStatus[j] = fullFlipStatus[faceMap()[subAddressing[j]]];
label meshFaceI = faceMap()[subFaceI];
if (zone[meshFaceI] != 0)
{
subAddressing[nSub] = subFaceI;
label subOwner = subMesh().faceOwner()[subFaceI];
label baseOwner = baseMesh().faceOwner()[meshFaceI];
// If subowner is the same cell as the base keep the flip status
bool sameOwner = (cellMap()[subOwner] == baseOwner);
bool flip = (zone[meshFaceI] == 1);
subFlipStatus[nSub] = (sameOwner == flip);
nSub++;
}
}
fZonePtrs[i] = new faceZone
......
......@@ -19,6 +19,5 @@ streamLine/streamLine.C
streamLine/streamLineParticle.C
streamLine/streamLineParticleCloud.C
streamLine/streamLineFunctionObject.C
streamLine/vectorIOFieldField.C
LIB = $(FOAM_LIBBIN)/libfieldFunctionObjects
......@@ -32,14 +32,11 @@ License
defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>::
names[] =
{
"cellZone"
};
const char* NamedEnum<fieldValues::cellSource::sourceType, 2>::
names[] = {"cellZone", "all"};
const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>
Foam::fieldValues::cellSource::sourceTypeNames_;
const NamedEnum<fieldValues::cellSource::sourceType, 2>
fieldValues::cellSource::sourceTypeNames_;
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>::
......@@ -57,35 +54,43 @@ const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>
void Foam::fieldValues::cellSource::setCellZoneCells()
{
label zoneId = mesh().cellZones().findZoneID(sourceName_);
if (zoneId < 0)
switch (source_)
{
FatalErrorIn("cellSource::cellSource::setCellZoneCells()")
<< "Unknown cell zone name: " << sourceName_
<< ". Valid cell zones are: " << mesh().cellZones().names()
<< nl << exit(FatalError);
}
const cellZone& cZone = mesh().cellZones()[zoneId];
case stCellZone:
{
label zoneId = mesh().cellZones().findZoneID(sourceName_);
if (zoneId < 0)
{
FatalErrorIn("cellSource::cellSource::setCellZoneCells()")
<< "Unknown cell zone name: " << sourceName_
<< ". Valid cell zones are: " << mesh().cellZones().names()
<< nl << exit(FatalError);
}
cellId_ = mesh().cellZones()[zoneId];
nCells_ = returnReduce(cellId_.size(), sumOp<label>());
break;
}
cellId_.setSize(cZone.size());
case stAll:
{
cellId_ = identity(mesh().nCells());
nCells_ = returnReduce(cellId_.size(), sumOp<label>());
break;
}
label count = 0;
forAll(cZone, i)
{
label cellI = cZone[i];
cellId_[count] = cellI;
count++;
default:
{
FatalErrorIn("cellSource::setCellZoneCells()")
<< "Unknown source type. Valid source types are:"
<< sourceTypeNames_ << nl << exit(FatalError);
}
}
cellId_.setSize(count);
nCells_ = returnReduce(cellId_.size(), sumOp<label>());
if (debug)
{
Pout<< "Original cell zone size = " << cZone.size()
<< ", new size = " << count << endl;
Pout<< "Selected source size = " << cellId_.size() << endl;
}
}
......@@ -94,20 +99,7 @@ void Foam::fieldValues::cellSource::setCellZoneCells()
void Foam::fieldValues::cellSource::initialise(const dictionary& dict)
{
switch (source_)
{
case stCellZone:
{
setCellZoneCells();
break;
}
default:
{
FatalErrorIn("cellSource::initialise()")
<< "Unknown source type. Valid source types are:"
<< sourceTypeNames_ << nl << exit(FatalError);
}
}
setCellZoneCells();
Info<< type() << " " << name_ << ":" << nl
<< " total cells = " << nCells_ << nl
......
......@@ -89,7 +89,8 @@ public:
//- Source type enumeration
enum sourceType
{
stCellZone
stCellZone,
stAll
};
//- Source type names
......
......@@ -24,8 +24,7 @@ License
\*----------------------------------------------------------------------------*/
#include "streamLineParticle.H"
#include "vectorIOFieldField.H"
#include "vectorFieldIOField.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
......@@ -394,13 +393,13 @@ void Foam::streamLineParticle::readFields(Cloud<streamLineParticle>& c)
);
c.checkFieldIOobject(c, lifeTime);
vectorIOFieldField sampledPositions
vectorFieldIOField sampledPositions
(
c.fieldIOobject("sampledPositions", IOobject::MUST_READ)
);
c.checkFieldIOobject(c, sampledPositions);
// vectorIOFieldField sampleVelocity
// vectorFieldIOField sampleVelocity
// (
// c.fieldIOobject("sampleVelocity", IOobject::MUST_READ)
// );
......@@ -428,12 +427,12 @@ void Foam::streamLineParticle::writeFields(const Cloud<streamLineParticle>& c)
c.fieldIOobject("lifeTime", IOobject::NO_READ),
np
);
vectorIOFieldField sampledPositions
vectorFieldIOField sampledPositions
(
c.fieldIOobject("sampledPositions", IOobject::NO_READ),
np
);
// vectorIOFieldField sampleVelocity
// vectorFieldIOField sampleVelocity
// (
// c.fieldIOobject("sampleVelocity", IOobject::NO_READ),
// np
......
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
vectorFieldField with IO.
\*---------------------------------------------------------------------------*/
#include "vectorIOFieldField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
defineTemplateTypeNameAndDebugWithName
(
vectorIOFieldField,
"vectorFieldField",
0
);
}
// ************************************************************************* //
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
Foam::vectorIOFieldField
Description
vectorField with IO.
\*---------------------------------------------------------------------------*/
#ifndef vectorIOFieldField_H
#define vectorIOFieldField_H
#include "vectorField.H"
#include "IOField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
typedef IOField<vectorField> vectorIOFieldField;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //
......@@ -246,10 +246,13 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const
{
pointPatchField<vector>::write(os);
os.writeKeyword("rhoInf") << rhoInf_ << token::END_STATEMENT << nl;
os.writeKeyword("rhoName") << rhoName_ << token::END_STATEMENT << nl;
if (rhoName_ == "rhoInf")
{
os.writeKeyword("rhoInf") << rhoInf_ << token::END_STATEMENT << nl;
}
if (lookupGravity_ == 0 || lookupGravity_ == -2)
{
os.writeKeyword("g") << g_ << token::END_STATEMENT << nl;
......
......@@ -40,7 +40,7 @@ void Foam::sixDoFRigidBodyMotion::applyRestraints()
{
if (report_)
{
Info<< "Restraint " << restraintNames_[rI];
Info<< "Restraint " << restraintNames_[rI] << ": ";
}
// restraint position
......@@ -89,9 +89,9 @@ void Foam::sixDoFRigidBodyMotion::applyConstraints(scalar deltaT)
forAll(constraints_, cI)
{
if (report_)
if (sixDoFRigidBodyMotionConstraint::debug)
{
Info<< "Constraint " << constraintNames_[cI];
Info<< "Constraint " << constraintNames_[cI] << ": ";
}
// constraint position
......
......@@ -121,7 +121,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::constrain
bool converged(mag(theta) < tolerance_);
if (motion.report())
if (sixDoFRigidBodyMotionConstraint::debug)
{
Info<< " angle " << theta
<< " force " << constraintForceIncrement
......
......@@ -107,7 +107,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedLine::constrain
bool converged(mag(error) < tolerance_);
if (motion.report())
if (sixDoFRigidBodyMotionConstraint::debug)
{
Info<< " error " << error
<< " force " << constraintForceIncrement
......
......@@ -143,7 +143,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::constrain
bool converged(mag(maxTheta) < tolerance_);
if (motion.report())
if (sixDoFRigidBodyMotionConstraint::debug)
{
Info<< " max angle " << maxTheta
<< " force " << constraintForceIncrement
......
......@@ -107,7 +107,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::constrain
bool converged(mag(error) < tolerance_);
if (motion.report())
if (sixDoFRigidBodyMotionConstraint::debug)
{
Info<< " error " << error
<< " force " << constraintForceIncrement
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment