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 commit 'origin/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2008-06-23 14:22:37 +02:00
parent eb69b16d3e 59a744ad27
commit 2c2be499a9
4 changed files with 98 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,64 +405,71 @@ bool doCommand
backup(mesh, setName, currentSet, setName + "_old"); backup(mesh, setName, currentSet, setName + "_old");
} }
if (action == topoSetSource::CLEAR) switch (action)
{ {
// Already handled above by not reading case topoSetSource::CLEAR:
}
else if (action == topoSetSource::INVERT)
{
currentSet.invert(currentSet.maxSize(mesh));
}
else if (action == topoSetSource::LIST)
{
currentSet.writeDebug(Pout, mesh, 100);
Pout<< endl;
}
else if (action == topoSetSource::SUBSET)
{
if (is >> sourceType)
{ {
autoPtr<topoSetSource> setSource // Already handled above by not reading
( break;
topoSetSource::New
(
sourceType,
mesh,
is
)
);
// Backup current set.
topoSet oldSet
(
mesh,
currentSet.name() + "_old2",
currentSet
);
currentSet.clear();
currentSet.resize(oldSet.size());
setSource().applyToSet(topoSetSource::NEW, currentSet);
// Combine new value of currentSet with old one.
currentSet.subset(oldSet);
} }
} case topoSetSource::INVERT:
else
{
if (is >> sourceType)
{ {
autoPtr<topoSetSource> setSource currentSet.invert(currentSet.maxSize(mesh));
( break;
topoSetSource::New }
case topoSetSource::LIST:
{
currentSet.writeDebug(Pout, mesh, 100);
Pout<< endl;
break;
}
case topoSetSource::SUBSET:
{
if (is >> sourceType)
{
autoPtr<topoSetSource> setSource
( (
sourceType, topoSetSource::New
mesh, (
is sourceType,
) mesh,
); is
)
);
setSource().applyToSet(action, currentSet); // Backup current set.
topoSet oldSet
(
mesh,
currentSet.name() + "_old2",
currentSet
);
currentSet.clear();
currentSet.resize(oldSet.size());
setSource().applyToSet(topoSetSource::NEW, currentSet);
// Combine new value of currentSet with old one.
currentSet.subset(oldSet);
}
break;
}
default:
{
if (is >> sourceType)
{
autoPtr<topoSetSource> setSource
(
topoSetSource::New
(
sourceType,
mesh,
is
)
);
setSource().applyToSet(action, currentSet);
}
} }
} }
@ -532,7 +539,7 @@ bool doCommand
} }
} }
return error; return !error;
} }
@ -612,31 +619,36 @@ commandStatus parseType
switch(stat) switch(stat)
{ {
case polyMesh::UNCHANGED: case polyMesh::UNCHANGED:
{
Pout<< " mesh not changed." << endl; Pout<< " mesh not changed." << endl;
break; break;
}
case polyMesh::POINTS_MOVED: case polyMesh::POINTS_MOVED:
{
Pout<< " points moved; topology unchanged." << endl; Pout<< " points moved; topology unchanged." << endl;
break; break;
}
case polyMesh::TOPO_CHANGE: case polyMesh::TOPO_CHANGE:
{
Pout<< " topology changed; patches unchanged." << nl Pout<< " topology changed; patches unchanged." << nl
<< " "; << " ";
printMesh(runTime, mesh); printMesh(runTime, mesh);
break;
break; }
case polyMesh::TOPO_PATCH_CHANGE: case polyMesh::TOPO_PATCH_CHANGE:
{
Pout<< " topology changed and patches changed." << nl Pout<< " topology changed and patches changed." << nl
<< " "; << " ";
printMesh(runTime, mesh); printMesh(runTime, mesh);
break; break;
}
default: default:
{
FatalErrorIn("parseType") << "Illegal mesh update state " FatalErrorIn("parseType") << "Illegal mesh update state "
<< stat << abort(FatalError); << stat << abort(FatalError);
break; break;
}
} }
return INVALID; return INVALID;

7
src/postProcessing/foamCalcFunctions/field/components/components.C
View File

@ -112,6 +112,13 @@ void Foam::calcTypes::components::calc
processed processed
); );
writeComponentFields<symmTensor>
(
fieldHeader,
mesh,
processed
);
if (!processed) if (!processed)
{ {
FatalError FatalError

12
tutorials/rhoSonicFoam/shockTube/system/sampleDict
View File

@ -25,13 +25,14 @@ FoamFile
interpolationScheme cellPoint; interpolationScheme cellPoint;
writeFormat raw; setFormat raw;
sampleSets sets
( (
uniform data
{ {
name data; type uniform;
axis x; axis x;
start (-4.995 0 0); start (-4.995 0 0);
end (4.995 0 0); end (4.995 0 0);
@ -39,6 +40,9 @@ sampleSets
} }
); );
surfaces
();
fields fields
( (
T T

14
tutorials/solidDisplacementFoam/plateHole/system/sampleDict
View File

@ -25,13 +25,13 @@ FoamFile
interpolationScheme cellPoint; interpolationScheme cellPoint;
writeFormat raw; setFormat raw;
sampleSets sets
( (
uniform leftPatch
{ {
name leftPatch; type uniform;
axis y; axis y;
start (0 0.5 0.25); start (0 0.5 0.25);
end (0 2 0.25); end (0 2 0.25);
@ -39,10 +39,12 @@ sampleSets
} }
); );
fields surfaces
();
fields
( (
sigmaxx sigmaxx
); );
// ************************************************************************* // // ************************************************************************* //