Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Mark Olesen
2018-11-19 15:45:56 +01:00
2 changed files with 1 additions and 4 deletions

View File

@ -1,13 +1,10 @@
EXE_INC = \ EXE_INC = \
-g -DFULLDEBUG -O0 -g \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ldecompositionMethods \
-lmeshTools \ -lmeshTools \
-ldynamicMesh \ -ldynamicMesh \
-lfiniteVolume -lfiniteVolume

View File

@ -2221,7 +2221,7 @@ Foam::label Foam::snappyRefineDriver::directionalSmooth
baseMesh, baseMesh,
sumOther, sumOther,
plusEqOp<scalar>(), plusEqOp<scalar>(),
0.0 scalar(0.0)
); );
syncTools::syncPointList syncTools::syncPointList
( (