Merge commit 'origin/master' into olesenm

This commit is contained in:
Mark Olesen
2008-06-23 14:22:37 +02:00
4 changed files with 98 additions and 73 deletions

View File

@ -405,20 +405,25 @@ bool doCommand
backup(mesh, setName, currentSet, setName + "_old"); backup(mesh, setName, currentSet, setName + "_old");
} }
if (action == topoSetSource::CLEAR) switch (action)
{
case topoSetSource::CLEAR:
{ {
// Already handled above by not reading // Already handled above by not reading
break;
} }
else if (action == topoSetSource::INVERT) case topoSetSource::INVERT:
{ {
currentSet.invert(currentSet.maxSize(mesh)); currentSet.invert(currentSet.maxSize(mesh));
break;
} }
else if (action == topoSetSource::LIST) case topoSetSource::LIST:
{ {
currentSet.writeDebug(Pout, mesh, 100); currentSet.writeDebug(Pout, mesh, 100);
Pout<< endl; Pout<< endl;
break;
} }
else if (action == topoSetSource::SUBSET) case topoSetSource::SUBSET:
{ {
if (is >> sourceType) if (is >> sourceType)
{ {
@ -447,8 +452,9 @@ bool doCommand
// Combine new value of currentSet with old one. // Combine new value of currentSet with old one.
currentSet.subset(oldSet); currentSet.subset(oldSet);
} }
break;
} }
else default:
{ {
if (is >> sourceType) if (is >> sourceType)
{ {
@ -465,6 +471,7 @@ bool doCommand
setSource().applyToSet(action, currentSet); setSource().applyToSet(action, currentSet);
} }
} }
}
if (action != topoSetSource::LIST) if (action != topoSetSource::LIST)
@ -532,7 +539,7 @@ bool doCommand
} }
} }
return error; return !error;
} }
@ -612,32 +619,37 @@ 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;
} }

View File

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

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

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
} }
); );
surfaces
();
fields fields
( (
sigmaxx sigmaxx
); );
// ************************************************************************* // // ************************************************************************* //