Merge branch 'config-modules' into 'develop'

Support for additional modules

See merge request Development/OpenFOAM-plus!183

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "cfmesh"]
+	path = modules/cfmesh
+	url = https://develop.openfoam.com/Community/integration-cfmesh.git

Allwmake

@@ -43,6 +43,14 @@ echo "Compile OpenFOAM applications"
 echo
 applications/Allwmake $targetType $*
 
+# Additional components/modules
+if [ -d "$WM_PROJECT_DIR/modules" ]
+then
+(
+    cd $WM_PROJECT_DIR/modules 2>/dev/null && wmake -all
+)
+fi
+
 # Some summary information
 echo
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"

doc/Doxygen/Doxyfile

@@ -769,7 +769,8 @@ WARN_LOGFILE           =
 #INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global
 INPUT                  = $(WM_PROJECT_DIR)/src \
                          $(WM_PROJECT_DIR)/applications/utilities \
-                         $(WM_PROJECT_DIR)/applications/solvers
+                         $(WM_PROJECT_DIR)/applications/solvers \
+                         $(WM_PROJECT_DIR)/modules/doc
 
 #For testing only
 #INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global \

modules/README.md

@@ -0,0 +1,15 @@
+OpenFOAM Modules
+================
+
+This directory is a location to place additional OpenFOAM components
+or tools and have them built as part of the normal OpenFOAM build
+process. It is assumed that each subdirectory contain an appropriate
+Allwmake file, and that they should in all likelihood also build into
+`$FOAM_APPBIN` and `$FOAM_LIBBIN` instead of
+`$FOAM_USER_APPBIN` and `$FOAM_USER_LIBBIN`.
+
+These additional components may be added as git submodules, by script
+or by hand.
+
+To build the doxygen information for the components, it is also
+necessary to link the directories to the doc/ subdirectory.

modules/doc/Allwclean

@@ -0,0 +1,7 @@
+#!/bin/sh
+# Dummy for "wclean -all"
+# Returns true so it does look like an error
+
+echo "skip wclean for modules doxygen directory"
+
+#------------------------------------------------------------------------------

modules/doc/Allwmake

@@ -0,0 +1,7 @@
+#!/bin/sh
+# Dummy for "wmake -all"
+# Returns true so it does look like an error
+
+echo "skip wmake target for modules doxygen directory"
+
+#------------------------------------------------------------------------------

modules/doc/makelink.example

@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1
+
+# Manually create doxygen links for module documentation
+
+for dir in cfmesh/meshLibrary
+do
+    [ -d "../$dir" ] && ln -svf ../$dir ${dir##*/}
+done
+
+#------------------------------------------------------------------------------

src/OpenFOAM/global/foamVersion.H

@@ -27,7 +27,6 @@ Namespace
 Description
     Namespace for OpenFOAM
 
-
 Global
     Foam::FOAMversion
 
@@ -67,6 +66,9 @@ namespace Foam
     extern const char* const FOAMversion;
     extern const char* const FOAMbuild;
     extern const std::string FOAMbuildArch;
+
+    //- Additional OpenFOAM modules
+    namespace Module {}
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //