Merge remote-tracking branch 'origin/bgschaid/foam3Fixes' into nextRelease

.gitignore

@@ -21,6 +21,7 @@
 *.la
 *.so
 *.jar
+*.dylib
 
 # derived files
 lex.yy.c
@@ -34,6 +35,9 @@ core
 # lnInclude (symlink) folders - anywhere
 lnInclude
 
+# A hidden file created by the Mac OS X Finder.
+.DS_Store
+
 # build folders - anywhere
 linux*Gcc*/
 linux*Icc*/
@@ -63,6 +67,21 @@ doc/[Dd]oxygen/man
 # generated files in the main directory (e.g. ReleaseNotes-?.?.html)
 /*.html
 
+# patch residue
+*.orig
+*.rej
+
+# pyFoam-stuff
+PlyParser_FoamFileParser_parsetab.py
+
+# python-compile
+*.pyc
+
+# other stuff
+.build
+.hgignore
+.timeStamp
+
 # source packages - anywhere
 *.tar.bz2
 *.tar.gz
@@ -90,21 +109,7 @@ etc/pref.sh
 # make sure that this settings file is not used
 etc/bashrc.preset
 
-# The following files are blacklisted because of a DMCA complaint by ANSYS.
-src/lduSolvers/tools/PriorityArray.C
-src/lduSolvers/tools/PriorityArray.H
-src/lduSolvers/amg/amgPolicy/samgPolicy.C
-src/lduSolvers/amg/amgPolicy/samgPolicy.H
-src/lduSolvers/amg/amgPolicy/aamgPolicy.C
-src/lduSolvers/amg/amgPolicy/aamgPolicy.H
-
-# The following files are blacklisted because of a DMCA complaint by ANSYS.
-src/lduSolvers/tools/PriorityArray.C
-src/lduSolvers/tools/PriorityArray.H
-src/lduSolvers/amg/amgPolicy/samgPolicy.C
-src/lduSolvers/amg/amgPolicy/samgPolicy.H
-src/lduSolvers/amg/amgPolicy/aamgPolicy.C
-src/lduSolvers/amg/amgPolicy/aamgPolicy.H
+#Test-Harness generated stuff
 
 # The following files are blacklisted because of a DMCA complaint by ANSYS.
 src/lduSolvers/tools/PriorityArray.C

.hgignore

@@ -12,6 +12,9 @@ syntax: glob
 *.orig[0-9][0-9]
 \#*\#
 
+# file-browser settings - anywhere
+.directory
+
 # CVS recovered versions - anywhere
 .#*
 
@@ -33,10 +36,11 @@ syntax: glob
 # A hidden file created by the Mac OS X Finder.
 .DS_Store
 
-# Ignore the build-dirctories
-darwinIntel*/
+# build folders - anywhere
 linux*Gcc*/
 linux*Icc*/
+darwin*Gcc*/
+darwin*Intel*/
 linuxming*/
 SiCortex*Gcc*/
 solaris*Gcc*/
@@ -62,6 +66,9 @@ doc/[Dd]oxygen/html
 doc/[Dd]oxygen/latex
 doc/[Dd]oxygen/man
 
+# generated files in the main directory (e.g. ReleaseNotes-?.?.html)
+/*.html
+
 # patch residue
 *.orig
 *.rej
@@ -74,20 +81,24 @@ PlyParser_FoamFileParser_parsetab.py
 
 # other stuff
 .build
-# .gitignore
+.gitignore
 .timeStamp
 
+# source packages - anywhere
+*.tar.bz2
+*.tar.gz
+*.tar
+*.tgz
+*.gtgz
+
+# ignore - changes to the configuration
+etc/prefs.csh
+etc/prefs.sh
+
 # make sure that this settings file is not used
 etc/bashrc.preset
 
 #Test-Harness generated stuff
-testHarness/OpenFOAM/1.6-ext/runDir/tutorialsTestSuites_oneTimeStep
-testHarness/OpenFOAM/1.6-ext/runDir/Testing
-testHarness/OpenFOAM/1.6-ext/runDir/CMake*
-testHarness/OpenFOAM/1.6-ext/runDir/CTestTestfile.cmake
-testHarness/OpenFOAM/1.6-ext/runDir/DartConfiguration.tcl
-testHarness/OpenFOAM/1.6-ext/runDir/Makefile
-testHarness/OpenFOAM/1.6-ext/runDir/cmake_install.cmake
 
 # The following files are blacklisted because of a DMCA complaint by ANSYS.
 src/lduSolvers/tools/PriorityArray.C

ThirdParty/AllClean.stage5

@@ -50,7 +50,7 @@ echo ========================================
 echo
 
 # swak4foam
-pkg=swak4Foam-0.2.4
+pkg=swak4Foam-0.3.0
 set -x
 rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}*
 set +x
@@ -62,5 +62,3 @@ echo ========================================
 echo
 
 # ----------------------------------------------------------------- end-of-file
-
-

ThirdParty/AllMake.stage0

@@ -59,6 +59,7 @@ echo ========================================
 echo
 
 (
+  rpm_makeRPMvault
 
   [ "$#" -gt 0 ] && {
       rpm_populateRPMvault "$@"
@@ -71,5 +72,3 @@ echo ========================================
 echo
 
 # ----------------------------------------------------------------- end-of-file
-
-

ThirdParty/AllMake.stage5

@@ -55,12 +55,12 @@ echo "Starting ThirdParty AllMake: Stage5     "
 echo "========================================"
 echo
 
-# swak4Foam - Version 0.2.4
+# swak4Foam - Version 0.3.0
 # In fact, we are basically tracking the head branch from the Mercurial repository
-# which is also replicated under the Breeder_1.7 section of the Subversion repository
+# which is also replicated under the Breeder_2.0 section of the Subversion repository
 #
 
-SWAK_RELEASE_VERSION=0.2.4
+SWAK_RELEASE_VERSION=0.3.0
 
 if [ -z "$SWAK4FOAM_SYSTEM" ]
 then
@@ -79,7 +79,7 @@ then
 		cd ./rpmBuild/BUILD;
 		hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION;
 		cd swak4Foam-$SWAK_RELEASE_VERSION;
-		hg checkout version_$SWAK_RELEASE_VERSION
+		hg checkout version_${SWAK_RELEASE_VERSION}_v2.x
 	    )
         else
 	    echo "Warning: Mercurial/hg is not installed. Switching to an alternate Subversion repository"
@@ -87,6 +87,8 @@ then
             if [ $? -eq 0 ];
 	    then
 		echo "Using Subversion/svn to download the source code for swak4Foam"
+		echo "Error: current Subversion-version does not support foam3. Please install mercurial"
+		exit -1
 		(cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_1.7/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION)
             else
 		echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam"
@@ -98,7 +100,6 @@ then
         # comment out the next two lines
 	(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; find . -name files   | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g")
 	(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; find . -name options | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g")
-	(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; sed -i.old "s|// #define FOAM_SYMMTENSOR_WORKAROUND|#define FOAM_SYMMTENSOR_WORKAROUND|g" Libraries/swak4FoamParsers/include/swak.H )
 
         # We recompile everything
 	(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; ./Allwclean; ./Allwmake)
@@ -118,5 +119,3 @@ echo "========================================"
 echo
 
 # ----------------------------------------------------------------- end-of-file
-
-

ThirdParty/tools/makeThirdPartyFunctionsForRPM

@@ -213,6 +213,22 @@ rpm_install()
 	--dbpath $buildBase/rpmDB --force --nodeps;
 }
 
+#
+# Populate the local RPM vault with comand-line supplied list of RPMs
+#
+rpm_makeRPMvault()
+{
+    rpmVault=$buildBase/RPMS/$architecture
+
+    if [ ! -e $rpmVault ]; then
+	echo ""
+	echo "Making directory for RPM-files $rpmVault"
+	echo ""
+
+	mkdir -p $rpmVault
+    fi
+}
+
 #
 # Populate the local RPM vault with comand-line supplied list of RPMs
 #
@@ -224,7 +240,6 @@ rpm_populateRPMvault()
     echo ""
     echo " Moving the following RPMs to the local RPM vault: `echo $@`"
 
-    mkdir -p $rpmVault
     mv $@ $rpmVault
 
     echo ""

etc/settings.sh

@@ -245,6 +245,8 @@ MACPORTOPENMPI)
        # include files and libraries.
        export MPI_ARCH_PATH="${libDir%/*}"
 
+       export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+
        _foamAddLib     $libDir
        unset libDir
        ;;

src/decompositionMethods/decompositionMethods/Make/options

@@ -1,8 +1,4 @@
 EXE_INC =
 
 LIB_LIBS = \
-    -L$(FOAM_LIBBIN)/dummy \
-    -L$(FOAM_MPI_LIBBIN) \
-    -lscotchDecomp \
-    -lmetisDecomp \
-    -lparMetisDecomp
+    -L$(FOAM_LIBBIN)/dummy

src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C

@@ -376,6 +376,8 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
     const dictionary& decompositionDict
 )
 {
+    loadExternalLibraries();
+
     word decompositionMethodTypeName(decompositionDict.lookup("method"));
 
     Info<< "Selecting decompositionMethod "
@@ -407,6 +409,8 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
     const polyMesh& mesh
 )
 {
+    loadExternalLibraries();
+
     word decompositionMethodTypeName(decompositionDict.lookup("method"));
 
     Info<< "Selecting decompositionMethod "
@@ -432,6 +436,28 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
     return autoPtr<decompositionMethod>(cstrIter()(decompositionDict, mesh));
 }
 
+void Foam::decompositionMethod::loadExternalLibraries()
+{
+    wordList libNames(3);
+    libNames[0]=word("scotchDecomp");
+    libNames[1]=word("metisDecomp");
+    libNames[2]=word("parMetisDecomp");
+
+    forAll(libNames,i) {
+        const word libName("lib"+libNames[i]+".so");
+
+        //        Info << "Loading " << libName << endl;
+
+        bool ok=dlLibraryTable::open(libName);
+        if(!ok) {
+            WarningIn("decompositionMethod::loadExternalLibraries()")
+                << "Loading of decomposition library " << libName
+                    << " unsuccesful. Some decomposition methods may not be "
+                    << " available"
+                    << endl;
+        }
+    }
+}
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 

src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H

@@ -107,6 +107,8 @@ private:
         //- Disallow default bitwise assignment
         void operator=(const decompositionMethod&);
 
+        //- load missing libraries to avoid compile-time linking to external dependencies
+        static void loadExternalLibraries();
 
 public:
 

src/dynamicMesh/dynamicFvMesh/Make/options

@@ -21,5 +21,4 @@ LIB_LIBS = \
     -ltetFiniteElement \
     -ltetMotionSolver \
     -lfvMotionSolver \
-    -lRBFMotionSolver \
-    -lmesquiteMotionSolver
+    -lRBFMotionSolver

src/dynamicMesh/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C

@@ -31,6 +31,22 @@ License
 
 Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
 {
+    wordList libNames(1);
+    libNames[0]=word("mesquiteMotionSolver");
+
+    forAll(libNames,i) {
+        const word libName("lib"+libNames[i]+".so");
+
+        bool ok=dlLibraryTable::open(libName);
+        if(!ok) {
+            WarningIn("dynamicFvMesh::New(const IOobject& io)")
+                << "Loading of dynamic mesh library " << libName
+                    << " unsuccesful. Some dynamic mesh  methods may not be "
+                    << " available"
+                    << endl;
+        }
+    }
+
     // Enclose the creation of the dynamicMesh to ensure it is
     // deleted before the dynamicFvMesh is created otherwise the dictionary
     // is entered in the database twice

vagrantSandbox/Vagrantfile

@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.synced_folder "..", "/OpenFOAM-sources"
+  config.vm.synced_folder "..", "/FOAM-sources"
 
   config.vm.provider :virtualbox do |vb|
     #   # Don't boot with headless mode

vagrantSandbox/initGeneralScript.sh

@@ -15,15 +15,15 @@ do
     fi
 done
 
-OFDIR=/home/vagrant/OpenFOAM/
+OFDIR=/home/vagrant/foam/
 
 mkdir -vp $OFDIR
 chown -R vagrant:vagrant $OFDIR
 
-OFClone=$OFDIR/OpenFOAM-1.6-ext
-OFReference=$OFDIR/OpenFOAM-1.6-ext-parent
+OFClone=$OFDIR/foam-extend-3.0
+OFReference=$OFClone-parent
 
-OFParent=/OpenFOAM-sources
+OFParent=/FOAM-sources
 
 if [ ! -e $OFClone ]
 then

vagrantSandbox/initUbunutuScript.sh

@@ -31,6 +31,7 @@ apt-get -y install g++
 apt-get -y install make
 #apt-get -y install python-dev
 apt-get -y install ccache
+apt-get -y install cmake
 
 # test scripts with different shells
 apt-get -y install csh