Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry
2010-10-12 14:50:30 +01:00
2 changed files with 1288 additions and 1276 deletions

View File

@ -153,6 +153,12 @@ int main(int argc, char *argv[])
"internalFacesOnly", "internalFacesOnly",
"do not convert boundary faces" "do not convert boundary faces"
); );
argList::addBoolOption
(
"updateFields",
"update fields to include new patches:"
" NOTE: updated field values may need to be edited"
);
#include "setRootCase.H" #include "setRootCase.H"
#include "createTime.H" #include "createTime.H"
@ -235,39 +241,45 @@ int main(int argc, char *argv[])
IOobjectList objects(mesh, runTime.timeName()); IOobjectList objects(mesh, runTime.timeName());
// Read vol fields. // Read vol fields.
if (args.optionFound("updateFields"))
{
Info<< "Reading geometric fields" << nl << endl;
PtrList<volScalarField> vsFlds;
ReadFields(mesh, objects, vsFlds);
PtrList<volScalarField> vsFlds; PtrList<volVectorField> vvFlds;
ReadFields(mesh, objects, vsFlds); ReadFields(mesh, objects, vvFlds);
PtrList<volVectorField> vvFlds; PtrList<volSphericalTensorField> vstFlds;
ReadFields(mesh, objects, vvFlds); ReadFields(mesh, objects, vstFlds);
PtrList<volSphericalTensorField> vstFlds; PtrList<volSymmTensorField> vsymtFlds;
ReadFields(mesh, objects, vstFlds); ReadFields(mesh, objects, vsymtFlds);
PtrList<volSymmTensorField> vsymtFlds; PtrList<volTensorField> vtFlds;
ReadFields(mesh, objects, vsymtFlds); ReadFields(mesh, objects, vtFlds);
PtrList<volTensorField> vtFlds; // Read surface fields.
ReadFields(mesh, objects, vtFlds);
// Read surface fields. PtrList<surfaceScalarField> ssFlds;
ReadFields(mesh, objects, ssFlds);
PtrList<surfaceScalarField> ssFlds; PtrList<surfaceVectorField> svFlds;
ReadFields(mesh, objects, ssFlds); ReadFields(mesh, objects, svFlds);
PtrList<surfaceVectorField> svFlds; PtrList<surfaceSphericalTensorField> sstFlds;
ReadFields(mesh, objects, svFlds); ReadFields(mesh, objects, sstFlds);
PtrList<surfaceSphericalTensorField> sstFlds; PtrList<surfaceSymmTensorField> ssymtFlds;
ReadFields(mesh, objects, sstFlds); ReadFields(mesh, objects, ssymtFlds);
PtrList<surfaceSymmTensorField> ssymtFlds;
ReadFields(mesh, objects, ssymtFlds);
PtrList<surfaceTensorField> stFlds;
ReadFields(mesh, objects, stFlds);
PtrList<surfaceTensorField> stFlds;
ReadFields(mesh, objects, stFlds);
}
else
{
Info<< "Not updating geometric fields" << nl << endl;
}
// Mesh change container // Mesh change container
polyTopoChange meshMod(mesh); polyTopoChange meshMod(mesh);