Merge branch 'master' of /home/noisy2/OpenFOAM/OpenFOAM-dev/

applications/solvers/combustion/PDRFoam/Make/files

@@ -29,4 +29,4 @@ laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
 
 PDRFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/PDRFoam
+EXE = $(FOAM_APPBIN)/PDRFoam

applications/utilities/parallelProcessing/decompositionMethods/metis-5.0pre2/GKlib/trunk/gk_dlmalloc.h

@@ -584,7 +584,13 @@ MAX_RELEASE_CHECK_RATE   default: 255 unless not HAVE_MMAP
 #endif  /* MMAP_CLEARS */
 #ifndef HAVE_MREMAP
 #ifdef linux
-#define HAVE_MREMAP 1
+/*
+ * From http://glaros.dtc.umn.edu/flyspray/task/29
+ * workaround bug in mremap:
+ * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=457337
+ */
+/* #define HAVE_MREMAP 1 */
+#define HAVE_MREMAP 0
 #else   /* linux */
 #define HAVE_MREMAP 0
 #endif  /* linux */

tutorials/Allrun

@@ -75,6 +75,7 @@ applications=\
     rhoTurbFoam \
     cavitatingFoam \
     MRFSimpleFoam \
+    interDyMFoam \
 "
 
 logReport () {

tutorials/interDyMFoam/Allclean

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+currDir=`pwd`
+application=`basename $currDir`
+cases="damBreakWithObstacle"
+
+tutorialPath=`dirname $0`/..
+. $tutorialPath/CleanFunctions
+
+for case in $cases
+do
+    cleanCase $case
+done 

tutorials/interDyMFoam/Allrun

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+currDir=`pwd`
+application=`basename $currDir`
+cases="damBreakWithObstacle"
+
+tutorialPath=`dirname $0`/..
+. $tutorialPath/RunFunctions
+. $tutorialPath/CleanFunctions
+
+for case in $cases
+do
+    runApplication blockMesh $case
+    runApplication setSet $case -batch createObstacle.setSet
+    runApplication subsetMesh $case c0 -patch walls
+    runApplication setFields $case -latestTime
+    runApplication $application $case
+done

tutorials/interDyMFoam/damBreakWithObstacle/README.txt

@@ -1,13 +0,0 @@
-blockMesh
-
-setSet -batch createObstacle.setSet
-
-subsetMesh c0 -patch walls
-
-#mv 0 0-orig
-mv 0.001 0
-
-mv 0/polyMesh/* constant/polyMesh/
-rmdir 0/polyMesh
-
-setFields

tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict

@@ -24,7 +24,7 @@ FoamFile
 
 application interFoam;
 
-startFrom       startTime;
+startFrom       latestTime;
 
 startTime       0;
 

tutorials/interDyMFoam/damBreakWithObstacle/system/decomposeParDict

@@ -25,7 +25,8 @@ FoamFile
 
 numberOfSubdomains 4;
 
-method          simple;
+//method          metis;
+method          hierarchical;
 
 simpleCoeffs
 {
@@ -35,21 +36,13 @@ simpleCoeffs
 
 hierarchicalCoeffs
 {
-    n               (1 1 1);
+    n               (2 2 1);
     delta           0.001;
     order           xyz;
 }
 
 metisCoeffs
-{
+{}
-    processorWeights 
-    (
-        1
-        1
-        1
-        1
-    );
-}
 
 manualCoeffs
 {