Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

This commit is contained in:
mattijs
2017-10-25 16:29:33 +01:00
724 changed files with 10402 additions and 5420 deletions

View File

@ -589,7 +589,8 @@ void readDOFS
is.getLine(line);
{
IStringStream lineStr(line);
patchNames.append(lineStr);
word pName(lineStr);
patchNames.append(pName);
}
Info<< "For DOF set " << group

View File

@ -28,5 +28,6 @@ EXE_LIBS = \
-lmeshTools \
-lsampling \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \
-L$(FOAM_LIBBIN)/dummy \
-lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
-ldynamicMesh

View File

@ -282,7 +282,7 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
forAll(surface_, fI)
{
faces[fI] = surface_.triSurface::operator[](fI).triFaceFace();
faces[fI] = surface_.triSurface::operator[](fI);
}
vtkSurfaceWriter().write

View File

@ -31,5 +31,6 @@ EXE_LIBS = \
-lsampling \
-ldecompositionMethods \
-ldecompose \
-L$(FOAM_LIBBIN)/dummy -lptscotchDecomp -lscotchDecomp \
-L$(FOAM_LIBBIN)/dummy \
-lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
-ldynamicMesh

View File

@ -721,7 +721,7 @@ int main(int argc, char *argv[])
isoFaces.setSize(iso.size());
forAll(isoFaces, i)
{
isoFaces[i] = iso[i].triFaceFace();
isoFaces[i] = iso[i];
}
isoPoints = iso.points();
}

View File

@ -18,6 +18,8 @@ EXE_LIBS = \
-L$(FASTDUALOCTREE_SRC_PATH) -lperf_main \
-lGL \
-lconformalVoronoiMesh \
-ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy \
-lkahipDecomp -lmetisDecomp -lscotchDecomp \
-lmeshTools \
-ldynamicMesh

View File

@ -31,4 +31,5 @@ EXE_LIBS = \
-lsampling \
-ldynamicMesh \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp
-L$(FOAM_LIBBIN)/dummy \
-lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp

View File

@ -13,9 +13,8 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
/* note: scotch < 6.0 does not like both scotch and ptscotch together */ \
-lscotchDecomp \
-L$(FOAM_LIBBIN)/dummy \
-lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
-lmeshTools \
-ldynamicMesh \
-ldecompose \

View File

@ -18,4 +18,5 @@ EXE_LIBS = \
-lreconstruct \
$(LINK_FLAGS) \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp
-L$(FOAM_LIBBIN)/dummy \
-lkahipDecomp -lmetisDecomp -lscotchDecomp