mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
Merge branch 'master' into splitCyclic
Conflicts: applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C src/edgeMesh/edgeFormats/vtk/VTKedgeFormat.H src/mesh/blockMesh/curvedEdges/spline.H src/meshTools/PointEdgeWave/PointEdgeWave.C src/meshTools/sets/topoSets/faceSet.C
This commit is contained in:
@ -2,7 +2,7 @@ EXE_INC = \
|
||||
-I$(LIB_SRC)/meshTools/lnInclude \
|
||||
-I$(LIB_SRC)/dynamicMesh/lnInclude \
|
||||
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
||||
-I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude
|
||||
-I$(LIB_SRC)/parallel/decompositionMethods/lnInclude
|
||||
|
||||
EXE_LIBS = \
|
||||
-lmeshTools \
|
||||
|
||||
@ -125,7 +125,7 @@ labelList regionFaceOrder
|
||||
|
||||
label prevRegion = -1;
|
||||
|
||||
forAll (cellOrder, newCellI)
|
||||
forAll(cellOrder, newCellI)
|
||||
{
|
||||
label oldCellI = cellOrder[newCellI];
|
||||
|
||||
@ -379,10 +379,10 @@ autoPtr<mapPolyMesh> reorderMesh
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
argList::validOptions.insert("blockOrder", "");
|
||||
argList::validOptions.insert("orderPoints", "");
|
||||
argList::validOptions.insert("writeMaps", "");
|
||||
argList::validOptions.insert("overwrite", "");
|
||||
argList::addBoolOption("blockOrder");
|
||||
argList::addBoolOption("orderPoints");
|
||||
argList::addBoolOption("writeMaps");
|
||||
argList::addBoolOption("overwrite");
|
||||
|
||||
# include "addTimeOptions.H"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user