mesh manipulation utilities: Rationalized field handling and added -noFields option
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -62,17 +62,24 @@ int main(int argc, char *argv[])
|
||||
"remove cells from input cellSet to keep to 2:1 ratio"
|
||||
" (default is to extend set)"
|
||||
);
|
||||
argList::addBoolOption
|
||||
(
|
||||
"noFields",
|
||||
"do not update fields"
|
||||
);
|
||||
|
||||
#include "setRootCase.H"
|
||||
#include "createTime.H"
|
||||
runTime.functionObjects().off();
|
||||
|
||||
const bool overwrite = args.optionFound("overwrite");
|
||||
const bool minSet = args.optionFound("minSet");
|
||||
const bool fields = !args.optionFound("noFields");
|
||||
|
||||
#include "createNamedMesh.H"
|
||||
const word oldInstance = mesh.pointsInstance();
|
||||
|
||||
word cellSetName(args.args()[1]);
|
||||
const bool overwrite = args.optionFound("overwrite");
|
||||
|
||||
const bool minSet = args.optionFound("minSet");
|
||||
|
||||
Info<< "Reading cells to refine from cellSet " << cellSetName
|
||||
<< nl << endl;
|
||||
@ -87,46 +94,13 @@ int main(int argc, char *argv[])
|
||||
// Read objects in time directory
|
||||
IOobjectList objects(mesh, runTime.timeName());
|
||||
|
||||
// Read vol fields.
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
PtrList<volScalarField> vsFlds;
|
||||
ReadFields(mesh, objects, vsFlds);
|
||||
#include "readVolFields.H"
|
||||
#include "readSurfaceFields.H"
|
||||
#include "readPointFields.H"
|
||||
|
||||
PtrList<volVectorField> vvFlds;
|
||||
ReadFields(mesh, objects, vvFlds);
|
||||
|
||||
PtrList<volSphericalTensorField> vstFlds;
|
||||
ReadFields(mesh, objects, vstFlds);
|
||||
|
||||
PtrList<volSymmTensorField> vsymtFlds;
|
||||
ReadFields(mesh, objects, vsymtFlds);
|
||||
|
||||
PtrList<volTensorField> vtFlds;
|
||||
ReadFields(mesh, objects, vtFlds);
|
||||
|
||||
// Read surface fields.
|
||||
|
||||
PtrList<surfaceScalarField> ssFlds;
|
||||
ReadFields(mesh, objects, ssFlds);
|
||||
|
||||
PtrList<surfaceVectorField> svFlds;
|
||||
ReadFields(mesh, objects, svFlds);
|
||||
|
||||
PtrList<surfaceSphericalTensorField> sstFlds;
|
||||
ReadFields(mesh, objects, sstFlds);
|
||||
|
||||
PtrList<surfaceSymmTensorField> ssymtFlds;
|
||||
ReadFields(mesh, objects, ssymtFlds);
|
||||
|
||||
PtrList<surfaceTensorField> stFlds;
|
||||
ReadFields(mesh, objects, stFlds);
|
||||
|
||||
// Read point fields
|
||||
PtrList<pointScalarField> psFlds;
|
||||
ReadFields(pointMesh::New(mesh), objects, psFlds);
|
||||
|
||||
PtrList<pointVectorField> pvFlds;
|
||||
ReadFields(pointMesh::New(mesh), objects, pvFlds);
|
||||
Info<< endl;
|
||||
|
||||
|
||||
// Construct refiner without unrefinement. Read existing point/cell level.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -41,25 +41,34 @@ Description
|
||||
#include "ReadFields.H"
|
||||
#include "volFields.H"
|
||||
#include "surfaceFields.H"
|
||||
#include "pointFields.H"
|
||||
|
||||
using namespace Foam;
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
#include "addOverwriteOption.H"
|
||||
argList::validArgs.append("faceSet");
|
||||
argList::addBoolOption
|
||||
(
|
||||
"noFields",
|
||||
"do not update fields"
|
||||
);
|
||||
|
||||
|
||||
#include "setRootCase.H"
|
||||
#include "createTime.H"
|
||||
runTime.functionObjects().off();
|
||||
|
||||
const bool overwrite = args.optionFound("overwrite");
|
||||
const bool fields = !args.optionFound("noFields");
|
||||
|
||||
#include "createMesh.H"
|
||||
const word oldInstance = mesh.pointsInstance();
|
||||
|
||||
const word setName = args[1];
|
||||
const bool overwrite = args.optionFound("overwrite");
|
||||
|
||||
// Read faces
|
||||
faceSet candidateSet(mesh, setName);
|
||||
@ -106,37 +115,13 @@ int main(int argc, char *argv[])
|
||||
// Read objects in time directory
|
||||
IOobjectList objects(mesh, runTime.timeName());
|
||||
|
||||
// Read vol fields.
|
||||
PtrList<volScalarField> vsFlds;
|
||||
ReadFields(mesh, objects, vsFlds);
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
PtrList<volVectorField> vvFlds;
|
||||
ReadFields(mesh, objects, vvFlds);
|
||||
#include "readVolFields.H"
|
||||
#include "readSurfaceFields.H"
|
||||
#include "readPointFields.H"
|
||||
|
||||
PtrList<volSphericalTensorField> vstFlds;
|
||||
ReadFields(mesh, objects, vstFlds);
|
||||
|
||||
PtrList<volSymmTensorField> vsymtFlds;
|
||||
ReadFields(mesh, objects, vsymtFlds);
|
||||
|
||||
PtrList<volTensorField> vtFlds;
|
||||
ReadFields(mesh, objects, vtFlds);
|
||||
|
||||
// Read surface fields.
|
||||
PtrList<surfaceScalarField> ssFlds;
|
||||
ReadFields(mesh, objects, ssFlds);
|
||||
|
||||
PtrList<surfaceVectorField> svFlds;
|
||||
ReadFields(mesh, objects, svFlds);
|
||||
|
||||
PtrList<surfaceSphericalTensorField> sstFlds;
|
||||
ReadFields(mesh, objects, sstFlds);
|
||||
|
||||
PtrList<surfaceSymmTensorField> ssymtFlds;
|
||||
ReadFields(mesh, objects, ssymtFlds);
|
||||
|
||||
PtrList<surfaceTensorField> stFlds;
|
||||
ReadFields(mesh, objects, stFlds);
|
||||
Info<< endl;
|
||||
|
||||
|
||||
// Topo changes container
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -117,10 +117,7 @@ Notes:
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "argList.H"
|
||||
#include "fvMesh.H"
|
||||
#include "polyTopoChange.H"
|
||||
#include "OFstream.H"
|
||||
#include "meshTools.H"
|
||||
#include "mappedWallPolyPatch.H"
|
||||
#include "createShellMesh.H"
|
||||
#include "syncTools.H"
|
||||
@ -128,13 +125,7 @@ Notes:
|
||||
#include "wedgePolyPatch.H"
|
||||
#include "nonuniformTransformCyclicPolyPatch.H"
|
||||
#include "extrudeModel.H"
|
||||
#include "globalIndex.H"
|
||||
#include "faceSet.H"
|
||||
|
||||
#include "volFields.H"
|
||||
#include "surfaceFields.H"
|
||||
#include "pointFields.H"
|
||||
//#include "ReadFields.H"
|
||||
#include "fvMeshTools.H"
|
||||
#include "OBJstream.H"
|
||||
#include "PatchTools.H"
|
||||
@ -1599,55 +1590,6 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//// Read objects in time directory
|
||||
// IOobjectList objects(mesh, runTime.timeName());
|
||||
//
|
||||
//// Read vol fields.
|
||||
//
|
||||
// PtrList<volScalarField> vsFlds;
|
||||
// ReadFields(mesh, objects, vsFlds);
|
||||
//
|
||||
// PtrList<volVectorField> vvFlds;
|
||||
// ReadFields(mesh, objects, vvFlds);
|
||||
//
|
||||
// PtrList<volSphericalTensorField> vstFlds;
|
||||
// ReadFields(mesh, objects, vstFlds);
|
||||
//
|
||||
// PtrList<volSymmTensorField> vsymtFlds;
|
||||
// ReadFields(mesh, objects, vsymtFlds);
|
||||
//
|
||||
// PtrList<volTensorField> vtFlds;
|
||||
// ReadFields(mesh, objects, vtFlds);
|
||||
//
|
||||
//// Read surface fields.
|
||||
//
|
||||
// PtrList<surfaceScalarField> ssFlds;
|
||||
// ReadFields(mesh, objects, ssFlds);
|
||||
//
|
||||
// PtrList<surfaceVectorField> svFlds;
|
||||
// ReadFields(mesh, objects, svFlds);
|
||||
//
|
||||
// PtrList<surfaceSphericalTensorField> sstFlds;
|
||||
// ReadFields(mesh, objects, sstFlds);
|
||||
//
|
||||
// PtrList<surfaceSymmTensorField> ssymtFlds;
|
||||
// ReadFields(mesh, objects, ssymtFlds);
|
||||
//
|
||||
// PtrList<surfaceTensorField> stFlds;
|
||||
// ReadFields(mesh, objects, stFlds);
|
||||
//
|
||||
//// Read point fields.
|
||||
//
|
||||
// PtrList<pointScalarField> psFlds;
|
||||
// ReadFields(pointMesh::New(mesh), objects, psFlds);
|
||||
//
|
||||
// PtrList<pointVectorField> pvFlds;
|
||||
// ReadFields(pointMesh::New(mesh), objects, pvFlds);
|
||||
|
||||
|
||||
|
||||
// Create dummy fv* files
|
||||
createDummyFvMeshFiles(mesh, shellRegionName);
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -502,37 +502,9 @@ int main(int argc, char *argv[])
|
||||
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
PtrList<volScalarField> vsFlds;
|
||||
if (fields) ReadFields(mesh, objects, vsFlds);
|
||||
|
||||
PtrList<volVectorField> vvFlds;
|
||||
if (fields) ReadFields(mesh, objects, vvFlds);
|
||||
|
||||
PtrList<volSphericalTensorField> vstFlds;
|
||||
if (fields) ReadFields(mesh, objects, vstFlds);
|
||||
|
||||
PtrList<volSymmTensorField> vsymtFlds;
|
||||
if (fields) ReadFields(mesh, objects, vsymtFlds);
|
||||
|
||||
PtrList<volTensorField> vtFlds;
|
||||
if (fields) ReadFields(mesh, objects, vtFlds);
|
||||
|
||||
PtrList<surfaceScalarField> ssFlds;
|
||||
if (fields) ReadFields(mesh, objects, ssFlds);
|
||||
|
||||
PtrList<surfaceVectorField> svFlds;
|
||||
if (fields) ReadFields(mesh, objects, svFlds);
|
||||
|
||||
PtrList<surfaceSphericalTensorField> sstFlds;
|
||||
if (fields) ReadFields(mesh, objects, sstFlds);
|
||||
|
||||
PtrList<surfaceSymmTensorField> ssymtFlds;
|
||||
if (fields) ReadFields(mesh, objects, ssymtFlds);
|
||||
|
||||
PtrList<surfaceTensorField> stFlds;
|
||||
if (fields) ReadFields(mesh, objects, stFlds);
|
||||
|
||||
|
||||
#include "readVolFields.H"
|
||||
#include "readSurfaceFields.H"
|
||||
// #include "readPointFields.H"
|
||||
|
||||
|
||||
// Creating (if necessary) faceZones
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -60,6 +60,7 @@ Description
|
||||
#include "ReadFields.H"
|
||||
#include "volFields.H"
|
||||
#include "surfaceFields.H"
|
||||
#include "pointFields.H"
|
||||
|
||||
using namespace Foam;
|
||||
|
||||
@ -278,35 +279,11 @@ int main(int argc, char *argv[])
|
||||
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
PtrList<volScalarField> vsFlds;
|
||||
if (fields) ReadFields(mesh, objects, vsFlds);
|
||||
#include "readVolFields.H"
|
||||
#include "readSurfaceFields.H"
|
||||
#include "readPointFields.H"
|
||||
|
||||
PtrList<volVectorField> vvFlds;
|
||||
if (fields) ReadFields(mesh, objects, vvFlds);
|
||||
|
||||
PtrList<volSphericalTensorField> vstFlds;
|
||||
if (fields) ReadFields(mesh, objects, vstFlds);
|
||||
|
||||
PtrList<volSymmTensorField> vsymtFlds;
|
||||
if (fields) ReadFields(mesh, objects, vsymtFlds);
|
||||
|
||||
PtrList<volTensorField> vtFlds;
|
||||
if (fields) ReadFields(mesh, objects, vtFlds);
|
||||
|
||||
PtrList<surfaceScalarField> ssFlds;
|
||||
if (fields) ReadFields(mesh, objects, ssFlds);
|
||||
|
||||
PtrList<surfaceVectorField> svFlds;
|
||||
if (fields) ReadFields(mesh, objects, svFlds);
|
||||
|
||||
PtrList<surfaceSphericalTensorField> sstFlds;
|
||||
if (fields) ReadFields(mesh, objects, sstFlds);
|
||||
|
||||
PtrList<surfaceSymmTensorField> ssymtFlds;
|
||||
if (fields) ReadFields(mesh, objects, ssymtFlds);
|
||||
|
||||
PtrList<surfaceTensorField> stFlds;
|
||||
if (fields) ReadFields(mesh, objects, stFlds);
|
||||
Info<< endl;
|
||||
|
||||
|
||||
// Mesh change engine
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -71,6 +71,7 @@ Note
|
||||
#include "ReadFields.H"
|
||||
#include "volFields.H"
|
||||
#include "surfaceFields.H"
|
||||
#include "pointFields.H"
|
||||
|
||||
using namespace Foam;
|
||||
|
||||
@ -375,6 +376,11 @@ int main(int argc, char *argv[])
|
||||
"disable the default behaviour of preserving faceZones by having"
|
||||
" multiple faces in between cells"
|
||||
);
|
||||
argList::addBoolOption
|
||||
(
|
||||
"noFields",
|
||||
"do not update fields"
|
||||
);
|
||||
|
||||
#include "setRootCase.H"
|
||||
#include "createTime.H"
|
||||
@ -423,6 +429,7 @@ int main(int argc, char *argv[])
|
||||
Info<< "Generating multiple cells for points on concave feature edges."
|
||||
<< nl << endl;
|
||||
}
|
||||
const bool fields = !args.optionFound("noFields");
|
||||
|
||||
|
||||
// Face(centre)s that need inclusion in the dual mesh
|
||||
@ -474,37 +481,13 @@ int main(int argc, char *argv[])
|
||||
// Read objects in time directory
|
||||
IOobjectList objects(mesh, runTime.timeName());
|
||||
|
||||
// Read vol fields.
|
||||
PtrList<volScalarField> vsFlds;
|
||||
ReadFields(mesh, objects, vsFlds);
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
PtrList<volVectorField> vvFlds;
|
||||
ReadFields(mesh, objects, vvFlds);
|
||||
#include "readVolFields.H"
|
||||
#include "readSurfaceFields.H"
|
||||
#include "readPointFields.H"
|
||||
|
||||
PtrList<volSphericalTensorField> vstFlds;
|
||||
ReadFields(mesh, objects, vstFlds);
|
||||
|
||||
PtrList<volSymmTensorField> vsymtFlds;
|
||||
ReadFields(mesh, objects, vsymtFlds);
|
||||
|
||||
PtrList<volTensorField> vtFlds;
|
||||
ReadFields(mesh, objects, vtFlds);
|
||||
|
||||
// Read surface fields.
|
||||
PtrList<surfaceScalarField> ssFlds;
|
||||
ReadFields(mesh, objects, ssFlds);
|
||||
|
||||
PtrList<surfaceVectorField> svFlds;
|
||||
ReadFields(mesh, objects, svFlds);
|
||||
|
||||
PtrList<surfaceSphericalTensorField> sstFlds;
|
||||
ReadFields(mesh, objects, sstFlds);
|
||||
|
||||
PtrList<surfaceSymmTensorField> ssymtFlds;
|
||||
ReadFields(mesh, objects, ssymtFlds);
|
||||
|
||||
PtrList<surfaceTensorField> stFlds;
|
||||
ReadFields(mesh, objects, stFlds);
|
||||
Info<< endl;
|
||||
|
||||
|
||||
// Topo change container
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -817,62 +817,11 @@ int main(int argc, char *argv[])
|
||||
// Read objects in time directory
|
||||
IOobjectList objects(mesh, runTime.timeName());
|
||||
|
||||
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
// Read vol fields.
|
||||
|
||||
PtrList<volScalarField> vsFlds;
|
||||
if (fields) ReadFields(mesh, objects, vsFlds);
|
||||
|
||||
PtrList<volVectorField> vvFlds;
|
||||
if (fields) ReadFields(mesh, objects, vvFlds);
|
||||
|
||||
PtrList<volSphericalTensorField> vstFlds;
|
||||
if (fields) ReadFields(mesh, objects, vstFlds);
|
||||
|
||||
PtrList<volSymmTensorField> vsymtFlds;
|
||||
if (fields) ReadFields(mesh, objects, vsymtFlds);
|
||||
|
||||
PtrList<volTensorField> vtFlds;
|
||||
if (fields) ReadFields(mesh, objects, vtFlds);
|
||||
|
||||
|
||||
// Read surface fields.
|
||||
|
||||
PtrList<surfaceScalarField> ssFlds;
|
||||
if (fields) ReadFields(mesh, objects, ssFlds);
|
||||
|
||||
PtrList<surfaceVectorField> svFlds;
|
||||
if (fields) ReadFields(mesh, objects, svFlds);
|
||||
|
||||
PtrList<surfaceSphericalTensorField> sstFlds;
|
||||
if (fields) ReadFields(mesh, objects, sstFlds);
|
||||
|
||||
PtrList<surfaceSymmTensorField> ssymtFlds;
|
||||
if (fields) ReadFields(mesh, objects, ssymtFlds);
|
||||
|
||||
PtrList<surfaceTensorField> stFlds;
|
||||
if (fields) ReadFields(mesh, objects, stFlds);
|
||||
|
||||
|
||||
// Read point fields.
|
||||
|
||||
PtrList<pointScalarField> psFlds;
|
||||
if (fields) ReadFields(pointMesh::New(mesh), objects, psFlds);
|
||||
|
||||
PtrList<pointVectorField> pvFlds;
|
||||
if (fields) ReadFields(pointMesh::New(mesh), objects, pvFlds);
|
||||
|
||||
PtrList<pointSphericalTensorField> pstFlds;
|
||||
if (fields) ReadFields(pointMesh::New(mesh), objects, pstFlds);
|
||||
|
||||
PtrList<pointSymmTensorField> psymtFlds;
|
||||
if (fields) ReadFields(pointMesh::New(mesh), objects, psymtFlds);
|
||||
|
||||
PtrList<pointTensorField> ptFlds;
|
||||
if (fields) ReadFields(pointMesh::New(mesh), objects, ptFlds);
|
||||
|
||||
#include "readVolFields.H"
|
||||
#include "readSurfaceFields.H"
|
||||
#include "readPointFields.H"
|
||||
|
||||
Info<< endl;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -72,10 +72,17 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
// constant, not false
|
||||
timeSelector::addOptions(true, false);
|
||||
argList::addBoolOption
|
||||
(
|
||||
"noFields",
|
||||
"do not update fields"
|
||||
);
|
||||
|
||||
#include "setRootCase.H"
|
||||
#include "createTime.H"
|
||||
|
||||
const bool fields = !args.optionFound("noFields");
|
||||
|
||||
instantList timeDirs = timeSelector::select0(runTime, args);
|
||||
|
||||
#include "createNamedMesh.H"
|
||||
@ -151,28 +158,16 @@ int main(int argc, char *argv[])
|
||||
// Read objects in time directory
|
||||
IOobjectList objects(mesh, runTime.timeName());
|
||||
|
||||
// Read vol fields.
|
||||
PtrList<volScalarField> vsFlds;
|
||||
ReadFields(mesh, objects, vsFlds);
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
PtrList<volVectorField> vvFlds;
|
||||
ReadFields(mesh, objects, vvFlds);
|
||||
|
||||
PtrList<volSphericalTensorField> vstFlds;
|
||||
ReadFields(mesh, objects, vstFlds);
|
||||
|
||||
PtrList<volSymmTensorField> vsymtFlds;
|
||||
ReadFields(mesh, objects, vsymtFlds);
|
||||
|
||||
PtrList<volTensorField> vtFlds;
|
||||
ReadFields(mesh, objects, vtFlds);
|
||||
#include "readVolFields.H"
|
||||
|
||||
// Map and store the fields on the scMesh.
|
||||
interpolateFields(scMesh(), vsFlds);
|
||||
interpolateFields(scMesh(), vvFlds);
|
||||
interpolateFields(scMesh(), vstFlds);
|
||||
interpolateFields(scMesh(), vsymtFlds);
|
||||
interpolateFields(scMesh(), vtFlds);
|
||||
if (fields) interpolateFields(scMesh(), vsFlds);
|
||||
if (fields) interpolateFields(scMesh(), vvFlds);
|
||||
if (fields) interpolateFields(scMesh(), vstFlds);
|
||||
if (fields) interpolateFields(scMesh(), vsymtFlds);
|
||||
if (fields) interpolateFields(scMesh(), vtFlds);
|
||||
|
||||
|
||||
// Write
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -1517,6 +1517,11 @@ int main(int argc, char *argv[])
|
||||
"name",
|
||||
"base name of the unspecified regions, defaults to \"region\""
|
||||
);
|
||||
argList::addBoolOption
|
||||
(
|
||||
"noFields",
|
||||
"do not update fields"
|
||||
);
|
||||
|
||||
#include "setRootCase.H"
|
||||
#include "createTime.H"
|
||||
@ -1545,6 +1550,7 @@ int main(int argc, char *argv[])
|
||||
const bool sloppyCellZones = args.optionFound("sloppyCellZones");
|
||||
const bool useFaceZones = args.optionFound("useFaceZones");
|
||||
const bool prefixRegion = args.optionFound("prefixRegion");
|
||||
const bool fields = !args.optionFound("noFields");
|
||||
|
||||
if
|
||||
(
|
||||
@ -1886,39 +1892,11 @@ int main(int argc, char *argv[])
|
||||
|
||||
IOobjectList objects(mesh, runTime.timeName());
|
||||
|
||||
// Read vol fields.
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
PtrList<volScalarField> vsFlds;
|
||||
ReadFields(mesh, objects, vsFlds);
|
||||
|
||||
PtrList<volVectorField> vvFlds;
|
||||
ReadFields(mesh, objects, vvFlds);
|
||||
|
||||
PtrList<volSphericalTensorField> vstFlds;
|
||||
ReadFields(mesh, objects, vstFlds);
|
||||
|
||||
PtrList<volSymmTensorField> vsymtFlds;
|
||||
ReadFields(mesh, objects, vsymtFlds);
|
||||
|
||||
PtrList<volTensorField> vtFlds;
|
||||
ReadFields(mesh, objects, vtFlds);
|
||||
|
||||
// Read surface fields.
|
||||
|
||||
PtrList<surfaceScalarField> ssFlds;
|
||||
ReadFields(mesh, objects, ssFlds);
|
||||
|
||||
PtrList<surfaceVectorField> svFlds;
|
||||
ReadFields(mesh, objects, svFlds);
|
||||
|
||||
PtrList<surfaceSphericalTensorField> sstFlds;
|
||||
ReadFields(mesh, objects, sstFlds);
|
||||
|
||||
PtrList<surfaceSymmTensorField> ssymtFlds;
|
||||
ReadFields(mesh, objects, ssymtFlds);
|
||||
|
||||
PtrList<surfaceTensorField> stFlds;
|
||||
ReadFields(mesh, objects, stFlds);
|
||||
#include "readVolFields.H"
|
||||
#include "readSurfaceFields.H"
|
||||
// #include "readPointFields.H"
|
||||
|
||||
Info<< endl;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration | Website: https://openfoam.org
|
||||
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -60,15 +60,17 @@ Description
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "fvCFD.H"
|
||||
#include "argList.H"
|
||||
#include "polyTopoChanger.H"
|
||||
#include "mapPolyMesh.H"
|
||||
#include "ListOps.H"
|
||||
#include "slidingInterface.H"
|
||||
#include "perfectInterface.H"
|
||||
#include "IOobjectList.H"
|
||||
#include "ReadFields.H"
|
||||
#include "volFields.H"
|
||||
#include "surfaceFields.H"
|
||||
#include "pointFields.H"
|
||||
|
||||
using namespace Foam;
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -207,6 +209,11 @@ int main(int argc, char *argv[])
|
||||
argList::noParallel();
|
||||
#include "addOverwriteOption.H"
|
||||
#include "addRegionOption.H"
|
||||
argList::addBoolOption
|
||||
(
|
||||
"noFields",
|
||||
"do not update fields"
|
||||
);
|
||||
|
||||
argList::validArgs.append("masterPatch");
|
||||
argList::validArgs.append("slavePatch");
|
||||
@ -241,6 +248,7 @@ int main(int argc, char *argv[])
|
||||
const bool partialCover = args.optionFound("partial");
|
||||
const bool perfectCover = args.optionFound("perfect");
|
||||
const bool overwrite = args.optionFound("overwrite");
|
||||
const bool fields = !args.optionFound("noFields");
|
||||
|
||||
if (partialCover && perfectCover)
|
||||
{
|
||||
@ -428,33 +436,11 @@ int main(int argc, char *argv[])
|
||||
// Search for list of objects for this time
|
||||
IOobjectList objects(mesh, runTime.timeName());
|
||||
|
||||
// Read all current fvFields so they will get mapped
|
||||
Info<< "Reading all current volfields" << endl;
|
||||
PtrList<volScalarField> volScalarFields;
|
||||
ReadFields(mesh, objects, volScalarFields);
|
||||
if (fields) Info<< "Reading geometric fields" << nl << endl;
|
||||
|
||||
PtrList<volVectorField> volVectorFields;
|
||||
ReadFields(mesh, objects, volVectorFields);
|
||||
|
||||
PtrList<volSphericalTensorField> volSphericalTensorFields;
|
||||
ReadFields(mesh, objects, volSphericalTensorFields);
|
||||
|
||||
PtrList<volSymmTensorField> volSymmTensorFields;
|
||||
ReadFields(mesh, objects, volSymmTensorFields);
|
||||
|
||||
PtrList<volTensorField> volTensorFields;
|
||||
ReadFields(mesh, objects, volTensorFields);
|
||||
|
||||
//- Uncomment if you want to interpolate surface fields (usually bad idea)
|
||||
// Info<< "Reading all current surfaceFields" << endl;
|
||||
// PtrList<surfaceScalarField> surfaceScalarFields;
|
||||
// ReadFields(mesh, objects, surfaceScalarFields);
|
||||
//
|
||||
// PtrList<surfaceVectorField> surfaceVectorFields;
|
||||
// ReadFields(mesh, objects, surfaceVectorFields);
|
||||
//
|
||||
// PtrList<surfaceTensorField> surfaceTensorFields;
|
||||
// ReadFields(mesh, objects, surfaceTensorFields);
|
||||
#include "readVolFields.H"
|
||||
// #include "readSurfaceFields.H"
|
||||
#include "readPointFields.H"
|
||||
|
||||
if (!overwrite)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user