diff --git a/applications/solvers/combustion/PDRFoam/Make/files b/applications/solvers/combustion/PDRFoam/Make/files index 677d96327efdff6f77fbd90e83364a38839c4fe2..889eebc33e62a385afca9d096fc59ff4aa53eade 100644 --- a/applications/solvers/combustion/PDRFoam/Make/files +++ b/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 diff --git a/applications/utilities/parallelProcessing/decompositionMethods/metis-5.0pre2/GKlib/trunk/gk_dlmalloc.h b/applications/utilities/parallelProcessing/decompositionMethods/metis-5.0pre2/GKlib/trunk/gk_dlmalloc.h index f19428562dc8e845da5a7da21d9494410437fd8c..bd4678935f8ad88aeb27209b778c1c5431203bb7 100644 --- a/applications/utilities/parallelProcessing/decompositionMethods/metis-5.0pre2/GKlib/trunk/gk_dlmalloc.h +++ b/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 */ diff --git a/tutorials/Allrun b/tutorials/Allrun index 84aae1565bab706a7f5bb0ef2cdb5dd6c9f55396..e41156e63a7774d11a9b2d4ded4809fc8f5f0a00 100755 --- a/tutorials/Allrun +++ b/tutorials/Allrun @@ -75,6 +75,7 @@ applications=\ rhoTurbFoam \ cavitatingFoam \ MRFSimpleFoam \ + interDyMFoam \ " logReport () { diff --git a/tutorials/interDyMFoam/Allclean b/tutorials/interDyMFoam/Allclean new file mode 100755 index 0000000000000000000000000000000000000000..acf465ac32ab82602496247961016ab9779533cf --- /dev/null +++ b/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 diff --git a/tutorials/interDyMFoam/Allrun b/tutorials/interDyMFoam/Allrun new file mode 100755 index 0000000000000000000000000000000000000000..6ef2ffbf92030011ac3f6b8e317fc531cf12f9ae --- /dev/null +++ b/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 diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/README.txt b/tutorials/interDyMFoam/damBreakWithObstacle/README.txt deleted file mode 100644 index e07cd127c704e8499b10e1f45d5cd85d913ac724..0000000000000000000000000000000000000000 --- a/tutorials/interDyMFoam/damBreakWithObstacle/README.txt +++ /dev/null @@ -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 diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict b/tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict index 0dbfd9b902afebc1153be3ac2ec855c771f6c0f1..e1313279fd06ada2dc4e74653240c75f6369b65e 100644 --- a/tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict +++ b/tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict @@ -24,7 +24,7 @@ FoamFile application interFoam; -startFrom startTime; +startFrom latestTime; startTime 0; diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/system/decomposeParDict b/tutorials/interDyMFoam/damBreakWithObstacle/system/decomposeParDict index ef1ee29d0370ed41dcf2265b7d9ad44a21fef46e..88569a8784a662dafabbb241f24831ae9ff34028 100644 --- a/tutorials/interDyMFoam/damBreakWithObstacle/system/decomposeParDict +++ b/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 {