Allwmake

@@ -8,11 +8,12 @@ targetType=libso
 #------------------------------------------------------------------------------
 moduleName="avalanche"
 
-if [ "$FOAM_MODULE_PREFIX" = false ]
-then
-    echo "Compilation of $moduleName is disabled (prefix=false)"
+echo "========================================"
+case "$FOAM_MODULE_PREFIX" in
+(false | none)
+    echo "Compilation of $moduleName is disabled (prefix=${FOAM_MODULE_PREFIX})"
     exit 0
-fi
+esac
 
 echo "========================================"
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"

applications/solvers/faParkerFukushimaFoam/Make/options

@@ -18,4 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteArea \
     -lfiniteVolume \
-    -L$(FOAM_LIBBIN) -lfaAvalanche
+    -L$(FOAM_MODULE_LIBBIN) -lfaAvalanche

applications/solvers/faSavageHutterFoam/Make/options

@@ -18,4 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteArea \
     -lfiniteVolume \
-    -L$(FOAM_LIBBIN) -lfaAvalanche
+    -L$(FOAM_MODULE_LIBBIN) -lfaAvalanche

applications/solvers/faTwoLayerAvalancheFoam/Make/options

@@ -18,4 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteArea \
     -lfiniteVolume \
-    -L$(FOAM_LIBBIN) -lfaAvalanche
+    -L$(FOAM_MODULE_LIBBIN) -lfaAvalanche

applications/utilities/gridToSTL/Make/options

@@ -18,4 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteArea \
     -lfiniteVolume \
-    -lfaAvalanche
+    -L$(FOAM_MODULE_LIBBIN) -lfaAvalanche

applications/utilities/releaseAreaMapping/Make/options

@@ -18,4 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteArea \
     -lfiniteVolume \
-    -lfaAvalanche
+    -L$(FOAM_MODULE_LIBBIN) -lfaAvalanche

applications/utilities/slopeMesh/slopeMesh.C

@@ -36,7 +36,7 @@ Author
 
 #include "fvCFD.H"
 #include "faCFD.H"
-#include "elevationModels/elevationModel/elevationModel.H"
+#include "elevationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //