Commit 2c2be499 authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge commit 'origin/master' into olesenm

parents eb69b16d 59a744ad
......@@ -405,64 +405,71 @@ bool doCommand
backup(mesh, setName, currentSet, setName + "_old");
}
if (action == topoSetSource::CLEAR)
switch (action)
{
// Already handled above by not reading
}
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)
case topoSetSource::CLEAR:
{
autoPtr<topoSetSource> setSource
(
topoSetSource::New
// Already handled above by not reading
break;
}
case topoSetSource::INVERT:
{
currentSet.invert(currentSet.maxSize(mesh));
break;
}
case topoSetSource::LIST:
{
currentSet.writeDebug(Pout, mesh, 100);
Pout<< endl;
break;
}
case topoSetSource::SUBSET:
{
if (is >> sourceType)
{
autoPtr<topoSetSource> setSource
(
topoSetSource::New
(
sourceType,
mesh,
is
)
);
// Backup current set.
topoSet oldSet
(
sourceType,
mesh,
is
)
);
currentSet.name() + "_old2",
currentSet
);
// Backup current set.
topoSet oldSet
(
mesh,
currentSet.name() + "_old2",
currentSet
);
currentSet.clear();
currentSet.resize(oldSet.size());
setSource().applyToSet(topoSetSource::NEW, currentSet);
currentSet.clear();
currentSet.resize(oldSet.size());
setSource().applyToSet(topoSetSource::NEW, currentSet);
// Combine new value of currentSet with old one.
currentSet.subset(oldSet);
// Combine new value of currentSet with old one.
currentSet.subset(oldSet);
}
break;
}
}
else
{
if (is >> sourceType)
default:
{
autoPtr<topoSetSource> setSource
(
topoSetSource::New
if (is >> sourceType)
{
autoPtr<topoSetSource> setSource
(
sourceType,
mesh,
is
)
);
setSource().applyToSet(action, currentSet);
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)
{
case polyMesh::UNCHANGED:
{
Pout<< " mesh not changed." << endl;
break;
break;
}
case polyMesh::POINTS_MOVED:
{
Pout<< " points moved; topology unchanged." << endl;
break;
break;
}
case polyMesh::TOPO_CHANGE:
{
Pout<< " topology changed; patches unchanged." << nl
<< " ";
printMesh(runTime, mesh);
break;
break;
}
case polyMesh::TOPO_PATCH_CHANGE:
{
Pout<< " topology changed and patches changed." << nl
<< " ";
printMesh(runTime, mesh);
break;
break;
}
default:
{
FatalErrorIn("parseType") << "Illegal mesh update state "
<< stat << abort(FatalError);
break;
break;
}
}
return INVALID;
......
......@@ -112,6 +112,13 @@ void Foam::calcTypes::components::calc
processed
);
writeComponentFields<symmTensor>
(
fieldHeader,
mesh,
processed
);
if (!processed)
{
FatalError
......
......@@ -25,13 +25,14 @@ FoamFile
interpolationScheme cellPoint;
writeFormat raw;
setFormat raw;
sampleSets
sets
(
uniform
data
{
name data;
type uniform;
axis x;
start (-4.995 0 0);
end (4.995 0 0);
......@@ -39,6 +40,9 @@ sampleSets
}
);
surfaces
();
fields
(
T
......
......@@ -25,13 +25,13 @@ FoamFile
interpolationScheme cellPoint;
writeFormat raw;
setFormat raw;
sampleSets
sets
(
uniform
leftPatch
{
name leftPatch;
type uniform;
axis y;
start (0 0.5 0.25);
end (0 2 0.25);
......@@ -39,10 +39,12 @@ sampleSets
}
);
fields
surfaces
();
fields
(
sigmaxx
);
// ************************************************************************* //
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