diff --git a/tutorials/Allclean b/tutorials/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..dc5e15eb376bd223c8bf01e53b694feb1b0b4f5c
--- /dev/null
+++ b/tutorials/Allclean
@@ -0,0 +1,20 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
+echo "--------"
+echo "Cleaning tutorials ..."
+echo "Removing backup files"
+
+find . \( \
+ -name '*~' -o -name '*.bak' \
+ -name core -o -name 'core.[1-9]*' \
+ -name '*.pvs' -o -name '*.OpenFOAM' -name '*.foam' \
+ \) -type f -delete
+
+rm -f logs testLoopReport > /dev/null 2>&1
+
+foamCleanTutorials cases
+
+echo "--------"
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/Allrun b/tutorials/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..0a731b3fc90c94adc565338945942191e4f8321f
--- /dev/null
+++ b/tutorials/Allrun
@@ -0,0 +1,163 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
+# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+# This file is part of OpenFOAM.
+#
+# OpenFOAM is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+# Allrun
+#
+# Description
+# Runs tutorial cases and summarizes the outcome as 'testLoopReport'
+#
+#------------------------------------------------------------------------------
+cd ${0%/*} || exit 1 # Run from this directory
+
+usage()
+{
+ exec 1>&2
+ while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+ cat<<USAGE
+
+usage: ${0##*/} [OPTION]
+
+options:
+ -collect Collect logs only. Can be useful for aborted runs.
+ -help print the usage
+
+* Runs tutorial cases and summarizes the outcome as 'testLoopReport'
+
+USAGE
+ exit 1
+}
+
+#------------------------------------------------------------------------------
+
+unset optCollectOnly
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+ case "$1" in
+ -h | -help)
+ usage
+ ;;
+ -collect)
+ optCollectOnly=true
+ ;;
+ -test) # Known options that should be passed through
+ break
+ ;;
+ -*)
+ usage "unknown option: $1"
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+done
+
+#------------------------------------------------------------------------------
+
+# logReport <logfile>
+# Extracts useful info from log file.
+logReport()
+{
+ local logfile=$1
+
+ # logfile is path/to/case/log.application
+ caseName=$(dirname $logfile | sed -e 's/\(.*\)\.\///g')
+ app=$(echo $logfile | sed -e 's/\(.*\)log\.//g')
+ appAndCase="Application $app - case $caseName"
+
+ if grep -q "FOAM FATAL" $logfile
+ then
+ echo "$appAndCase: ** FOAM FATAL ERROR **"
+ return 1
+ fi
+
+ # Check for solution singularity on U equation
+ for eqn in Ux Uy Uz
+ do
+ if grep -q -E "${eqn}[:| ]*solution singularity" $logfile
+ then
+ if [ "$eqn" = Uz ]
+ then
+ # Can only get here if Ux,Uy,Uz all failed
+ echo "$appAndCase: ** Solution singularity **"
+ return 1
+ fi
+ else
+ break
+ fi
+ done
+
+ if grep -q -E "^[\t ]*[Ee]nd" $logfile
+ then
+ # Extract time from this type of content
+ ## ExecutionTime = 60.2 s ClockTime = 63 s --> "60.2 s"
+ completionTime=$(tail -10 $logfile | \
+ sed -n -e '/Execution/{s/^[^=]*=[ \t]*//; s/\( s\) .*$/\1/; p}')
+
+ echo "$appAndCase: completed${completionTime:+ in }$completionTime"
+ else
+ echo "$appAndCase: unconfirmed completion"
+ fi
+}
+
+if [ -z "$optCollectOnly" ]
+then
+ # Recursively run all tutorials
+ foamRunTutorials -skipFirst $*
+fi
+
+
+# Analyse all log files
+echo "Collecting log files..." 1>&2
+rm -f logs testLoopReport > /dev/null 2>&1
+touch logs testLoopReport
+
+for appDir in *
+do
+ [ -d $appDir ] || continue
+ echo -n " $appDir..." 1>&2
+
+ logs=$(find -L $appDir -name 'log.*' -type f)
+ if [ -n "$logs" ]
+ then
+ echo 1>&2
+ else
+ echo " (no logs)" 1>&2
+ continue
+ fi
+
+ # Sort logs by time-stamp
+ for log in $(echo $logs | xargs ls -rt)
+ do
+ # Concatenate and summarize logs
+ cat "$log" >> logs 2>/dev/null
+ logReport $log
+ done
+ echo
+done > testLoopReport
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesian2DMesh/hatOctree/0/.gitignore b/tutorials/cartesian2DMesh/hatOctree/0/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesian2DMesh/hatOctree/0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesian2DMesh/hatOctree/Allclean b/tutorials/cartesian2DMesh/hatOctree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesian2DMesh/hatOctree/Allclean
+++ b/tutorials/cartesian2DMesh/hatOctree/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesian2DMesh/hatOctree/Allrun b/tutorials/cartesian2DMesh/hatOctree/Allrun
index 315349422cb5b0963268d8caa8fbde12e3347a54..70b6096f19b48055029bf58f8f97c8d3f885f659 100755
--- a/tutorials/cartesian2DMesh/hatOctree/Allrun
+++ b/tutorials/cartesian2DMesh/hatOctree/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication cartesian2DMesh
runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesian2DMesh/hatOctree/README b/tutorials/cartesian2DMesh/hatOctree/README
deleted file mode 100644
index 7cc7f69e0a4626841b83a593bb5ab78fa4f75035..0000000000000000000000000000000000000000
--- a/tutorials/cartesian2DMesh/hatOctree/README
+++ /dev/null
@@ -1 +0,0 @@
-Please run cartesian2DMesh to generate a 2D mesh.
diff --git a/tutorials/cartesian2DMesh/hatOctree/constant/.gitignore b/tutorials/cartesian2DMesh/hatOctree/constant/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesian2DMesh/hatOctree/constant/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesian2DMesh/hatOctree/system/controlDict b/tutorials/cartesian2DMesh/hatOctree/system/controlDict
index a3a832a31816f59d3d08c0c1882eb07a0e534d83..53f573cf8fe5945e759581f3c4f8505ef2f684b5 100644
--- a/tutorials/cartesian2DMesh/hatOctree/system/controlDict
+++ b/tutorials/cartesian2DMesh/hatOctree/system/controlDict
@@ -1,36 +1,38 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application ;
-deltaT 1;
-endTime 50;
-graphFormat raw;
-purgeWrite 0;
-runTimeModifiable yes;
-startFrom startTime;
-startTime 0;
-stopAt endTime;
-timeFormat general;
-timePrecision 6;
-writeCompression uncompressed;
-writeControl timeStep;
-writeFormat ascii;
-writeInterval 20;
-writePrecision 6;
-
-// ************************************************************************* //
\ No newline at end of file
+
+application cartesian2DMesh;
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 50;
+
+deltaT 1;
+
+writeControl timeStep;
+
+writeInterval 20;
+
+writeFormat ascii;
+
+runTimeModifiable yes;
+
+// ************************************************************************* //
diff --git a/tutorials/cartesian2DMesh/hatOctree/system/fvSchemes b/tutorials/cartesian2DMesh/hatOctree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4d25d6f56efaeb27233a5f0f90adeeb3a6c5779b 100644
--- a/tutorials/cartesian2DMesh/hatOctree/system/fvSchemes
+++ b/tutorials/cartesian2DMesh/hatOctree/system/fvSchemes
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/cartesian2DMesh/hatOctree/system/fvSolution b/tutorials/cartesian2DMesh/hatOctree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..21f261c957b1733727b26d45c8b95cc429175e36 100644
--- a/tutorials/cartesian2DMesh/hatOctree/system/fvSolution
+++ b/tutorials/cartesian2DMesh/hatOctree/system/fvSolution
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/cartesian2DMesh/hatOctree/system/meshDict b/tutorials/cartesian2DMesh/hatOctree/system/meshDict
index 66128306d12081a575b84bf1757a775631db528c..1c77bc14d23c4a8917e8b12a5309e44bff16bb55 100644
--- a/tutorials/cartesian2DMesh/hatOctree/system/meshDict
+++ b/tutorials/cartesian2DMesh/hatOctree/system/meshDict
@@ -1,25 +1,24 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | OpenFOAM GUI Project: creativeFields |
-| \\ / O peration | Version: 0.8.9.0 |
-| \\ / A nd | Web: www.c-fields.com |
-| \\/ M anipulation | |
+| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / O peration | |
+| \\ / A nd | Author: Franjo Juretic |
+| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
FoamFile
{
-version 2;
-format ascii;
-class dictionary;
-location "system";
-object meshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object meshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-maxCellSize 0.01;
+maxCellSize 0.01;
-surfaceFile "geom.fms";
+surfaceFile "geom.fms";
boundaryLayers
{
diff --git a/tutorials/cartesianMesh/asmoOctree/0/.gitignore b/tutorials/cartesianMesh/asmoOctree/0/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/asmoOctree/0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/asmoOctree/Allclean b/tutorials/cartesianMesh/asmoOctree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesianMesh/asmoOctree/Allclean
+++ b/tutorials/cartesianMesh/asmoOctree/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/asmoOctree/Allrun b/tutorials/cartesianMesh/asmoOctree/Allrun
index f22963cc7cda9c3ab87f4cf45e02c0338a81c8f4..2f8cfc4bcd97cfb46e91ddbeefbd32fb3c8b5bc5 100755
--- a/tutorials/cartesianMesh/asmoOctree/Allrun
+++ b/tutorials/cartesianMesh/asmoOctree/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication cartesianMesh
runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/asmoOctree/README b/tutorials/cartesianMesh/asmoOctree/README
deleted file mode 100644
index dd8b841ea54f014109a0274d460d23f799264e09..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/asmoOctree/README
+++ /dev/null
@@ -1 +0,0 @@
-Please run cartesianMesh to generate the mesh
diff --git a/tutorials/cartesianMesh/asmoOctree/constant/.gitignore b/tutorials/cartesianMesh/asmoOctree/constant/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/asmoOctree/constant/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/asmoOctree/system/controlDict b/tutorials/cartesianMesh/asmoOctree/system/controlDict
index 1bda0db6a50d363e90c229f004b9d89395bdb33e..04f7a0ea60246e7e0626830b5121162420b23734 100644
--- a/tutorials/cartesianMesh/asmoOctree/system/controlDict
+++ b/tutorials/cartesianMesh/asmoOctree/system/controlDict
@@ -1,66 +1,37 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Foam Application Class
-applicationClass ;
+application cartesianMesh;
-// Start point of run
startFrom latestTime;
-// Calculation start time
startTime 0;
-// End point of run
stopAt endTime;
-// Calculation end time
endTime 20;
-// Calculation time step
deltaT 1;
-// Type of write output control
writeControl timeStep;
-// Interval with which the results are output
-writeInterval 550;
+writeInterval 50;
-// Limits number of time directories before overwriting
-cycleWrite 0;
-
-// Write Format
writeFormat ascii;
-// Significant figures of written ASCII data
-writePrecision 6;
-
-// Write Compression
-writeCompression compressed;
-
-// Time directories name format
-timeFormat general;
-
-// Decimal precision of time directory names
-timePrecision 6;
-
-// Can parameters be modified during run time?
runTimeModifiable no;
-
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/asmoOctree/system/fvSchemes b/tutorials/cartesianMesh/asmoOctree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4d25d6f56efaeb27233a5f0f90adeeb3a6c5779b 100644
--- a/tutorials/cartesianMesh/asmoOctree/system/fvSchemes
+++ b/tutorials/cartesianMesh/asmoOctree/system/fvSchemes
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/cartesianMesh/asmoOctree/system/fvSolution b/tutorials/cartesianMesh/asmoOctree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..5e86a642255c4c94545cccad4ae76f19691f9b42 100644
--- a/tutorials/cartesianMesh/asmoOctree/system/fvSolution
+++ b/tutorials/cartesianMesh/asmoOctree/system/fvSolution
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
@@ -13,6 +13,7 @@ FoamFile
class dictionary;
object fvSolution;
}
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
diff --git a/tutorials/cartesianMesh/asmoOctree/system/meshDict b/tutorials/cartesianMesh/asmoOctree/system/meshDict
index 57c1ce7af5d716ab68d725c587220202690018eb..5fddafaee237372b62ca346a5381620889d746a7 100644
--- a/tutorials/cartesianMesh/asmoOctree/system/meshDict
+++ b/tutorials/cartesianMesh/asmoOctree/system/meshDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
@@ -38,5 +38,5 @@ localRefinement
cellSize 0.005;
}
}
-
+
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/bunnyOctree/0/.gitignore b/tutorials/cartesianMesh/bunnyOctree/0/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/bunnyOctree/0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/bunnyOctree/Allclean b/tutorials/cartesianMesh/bunnyOctree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesianMesh/bunnyOctree/Allclean
+++ b/tutorials/cartesianMesh/bunnyOctree/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/bunnyOctree/Allrun b/tutorials/cartesianMesh/bunnyOctree/Allrun
deleted file mode 100755
index f22963cc7cda9c3ab87f4cf45e02c0338a81c8f4..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/bunnyOctree/Allrun
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-runApplication cartesianMesh
-runApplication checkMesh
diff --git a/tutorials/cartesianMesh/bunnyOctree/Allrun-optional b/tutorials/cartesianMesh/bunnyOctree/Allrun-optional
new file mode 100755
index 0000000000000000000000000000000000000000..2f8cfc4bcd97cfb46e91ddbeefbd32fb3c8b5bc5
--- /dev/null
+++ b/tutorials/cartesianMesh/bunnyOctree/Allrun-optional
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
+
+runApplication cartesianMesh
+runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/bunnyOctree/constant/.gitignore b/tutorials/cartesianMesh/bunnyOctree/constant/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/bunnyOctree/constant/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/bunnyOctree/system/controlDict b/tutorials/cartesianMesh/bunnyOctree/system/controlDict
index 9a7ae05a8762e098bea0ff443cd20aa66d49c9b3..f7d3a9ad9ee174ce08f1bc0603759e5439ad3be9 100644
--- a/tutorials/cartesianMesh/bunnyOctree/system/controlDict
+++ b/tutorials/cartesianMesh/bunnyOctree/system/controlDict
@@ -1,51 +1,37 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application ;
-
-startFrom latestTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 10;
-
-deltaT 0.05;
-
-writeControl timeStep;
+application true; // Optional : no default application to run
-writeInterval 20;
+startFrom latestTime;
-purgeWrite 0;
+startTime 0;
-writeFormat ascii;
+stopAt endTime;
-writePrecision 6;
+endTime 10;
-writeCompression uncompressed;
+deltaT 1;
-timeFormat general;
+writeControl timeStep;
-timePrecision 6;
+writeInterval 20;
-runTimeModifiable yes;
+writeFormat ascii;
+runTimeModifiable yes;
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/bunnyOctree/system/decomposeParDict b/tutorials/cartesianMesh/bunnyOctree/system/decomposeParDict
index d3dfec8bdb9a2df8a5d7a725e087f27c214d4a64..7f703303ab0bd50aa740fbf0a432b4667a7c0643 100644
--- a/tutorials/cartesianMesh/bunnyOctree/system/decomposeParDict
+++ b/tutorials/cartesianMesh/bunnyOctree/system/decomposeParDict
@@ -1,17 +1,16 @@
/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | foam-extend: Open Source CFD |
-| \\ / O peration | Version: 3.0 |
-| \\ / A nd | Web: http://www.extend-project.de |
-| \\/ M anipulation | |
+| ========= | |
+| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / O peration | |
+| \\ / A nd | Author: Franjo Juretic |
+| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
+
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- note "mesh decomposition control dictionary";
- location "system";
object decomposeParDict;
}
diff --git a/tutorials/cartesianMesh/bunnyOctree/system/fvSchemes b/tutorials/cartesianMesh/bunnyOctree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4d25d6f56efaeb27233a5f0f90adeeb3a6c5779b 100644
--- a/tutorials/cartesianMesh/bunnyOctree/system/fvSchemes
+++ b/tutorials/cartesianMesh/bunnyOctree/system/fvSchemes
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/cartesianMesh/bunnyOctree/system/fvSolution b/tutorials/cartesianMesh/bunnyOctree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..21f261c957b1733727b26d45c8b95cc429175e36 100644
--- a/tutorials/cartesianMesh/bunnyOctree/system/fvSolution
+++ b/tutorials/cartesianMesh/bunnyOctree/system/fvSolution
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/cartesianMesh/bunnyOctree/system/meshDict b/tutorials/cartesianMesh/bunnyOctree/system/meshDict
index 740bb460a9fa7afc5279e6406550133ef5d0128b..cd9c25f66e0ba4fbaffea412461aaf72b77fbb51 100644
--- a/tutorials/cartesianMesh/bunnyOctree/system/meshDict
+++ b/tutorials/cartesianMesh/bunnyOctree/system/meshDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
@@ -27,52 +27,52 @@ objectRefinements
{
ear1
{
- cellSize 10;
- type cone;
- p0 (-100 1873 -320);
- radius0 200;
- p1 (-560 1400 0);
- radius1 200;
+ type cone;
+ cellSize 10;
+ p0 (-100 1873 -320);
+ radius0 200;
+ p1 (-560 1400 0);
+ radius1 200;
}
ear2
{
- cellSize 10;
- type cone;
- p0 (-650 1873 -620);
- radius0 200;
- p1 (-670 1300 0);
- radius1 200;
+ type cone;
+ cellSize 10;
+ p0 (-650 1873 -620);
+ radius0 200;
+ p1 (-670 1300 0);
+ radius1 200;
}
tail
{
- cellSize 10;
- type box;
- centre (500 500 150);
- lengthX 100;
- lengthY 150;
- lengthZ 200;
+ type box;
+ cellSize 10;
+ centre (500 500 150);
+ lengthX 100;
+ lengthY 150;
+ lengthZ 200;
}
insideTheBody
{
- cellSize 10;
- type sphere;
- centre (0 700 0);
- radius 50;
+ type sphere;
+ cellSize 10;
+ centre (0 700 0);
+ radius 50;
}
muzzlePiercing
{
- cellSize 10;
- type line;
- p0 (-750 1000 450);
- p1 (-750 1500 450);
+ type line;
+ cellSize 10;
+ p0 (-750 1000 450);
+ p1 (-750 1500 450);
}
}
meshQualitySettings
{
- maxNonOrthogonality 30;
+ maxNonOrthogonality 30;
- minTetQuality 1e-10;
+ minTetQuality 1e-10;
}
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/elbow_90degree/0/.ignore b/tutorials/cartesianMesh/elbow_90degree/0/.ignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/elbow_90degree/Allclean b/tutorials/cartesianMesh/elbow_90degree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesianMesh/elbow_90degree/Allclean
+++ b/tutorials/cartesianMesh/elbow_90degree/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/elbow_90degree/Allrun b/tutorials/cartesianMesh/elbow_90degree/Allrun
index c3cf57bb3e19a2db261cb47e02c26a607ecc4745..a818771b2161730e4b619cafc93ac1556fa34e52 100755
--- a/tutorials/cartesianMesh/elbow_90degree/Allrun
+++ b/tutorials/cartesianMesh/elbow_90degree/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication cartesianMesh
runApplication checkMesh -constant
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/elbow_90degree/constant/.ignore b/tutorials/cartesianMesh/elbow_90degree/constant/.ignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/elbow_90degree/readme.txt b/tutorials/cartesianMesh/elbow_90degree/readme.txt
deleted file mode 100644
index 32400a6c89d9e382a1bf88160af19080dfe1566c..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/elbow_90degree/readme.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-cfMesh Example Case
-Date: 02 October 2014
-Application: cartesianMesh
-
-Goal: Demonstration of the regular expressions feature available within
-cfMesh for specifying patch names in the meshDict file.
-
-STL File: elbow_90degree.stl
-STL Type: Multi-solid
-
-Patches within the STL File (Note: Each patch is one STL Solid):
-inlet_S73
-outlet_S74
-bendOuter_S75
-bendOuter_S76
-bendInner_S77
-ringArea_S78
-fixedWalls_S79
-fixedWalls_S80
-fixedWalls_S81
-
-
-
-
-
-
-
-
diff --git a/tutorials/cartesianMesh/elbow_90degree/system/controlDict b/tutorials/cartesianMesh/elbow_90degree/system/controlDict
index ebbe91cdcf3a7f234ca7e8c49040972b71436abd..f5e596ea8ba0b2df4842aabc3ab16cdb3ed86c50 100644
--- a/tutorials/cartesianMesh/elbow_90degree/system/controlDict
+++ b/tutorials/cartesianMesh/elbow_90degree/system/controlDict
@@ -1,23 +1,20 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// ************************************************************************* //
-applicationClass ;
+application cartesianMesh;
startFrom latestTime;
@@ -33,21 +30,8 @@ writeControl timeStep;
writeInterval 100;
-cycleWrite 0;
-
writeFormat ascii;
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
runTimeModifiable yes;
-nCorrectors 2;
-
-nNonOrthogonalCorrectors 0;
-
-
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/elbow_90degree/system/fvSchemes b/tutorials/cartesianMesh/elbow_90degree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/cartesianMesh/elbow_90degree/system/fvSchemes
+++ b/tutorials/cartesianMesh/elbow_90degree/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/elbow_90degree/system/fvSolution b/tutorials/cartesianMesh/elbow_90degree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/cartesianMesh/elbow_90degree/system/fvSolution
+++ b/tutorials/cartesianMesh/elbow_90degree/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/elbow_90degree/system/meshDict b/tutorials/cartesianMesh/elbow_90degree/system/meshDict
index 54578912ba3d1b0b030a9954d74dce2794f8d6ed..aa14707f63c1e16b25091bb9daf478e659992fe5 100644
--- a/tutorials/cartesianMesh/elbow_90degree/system/meshDict
+++ b/tutorials/cartesianMesh/elbow_90degree/system/meshDict
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -19,18 +18,18 @@ FoamFile
surfaceFile "elbow_90degree.stl";
+minCellSize 1.0;
+
maxCellSize 5.0;
boundaryCellSize 3.0;
-minCellSize 1.00;
-
localRefinement
{
"ringArea.*"
{
cellSize 0.2;
- }
+ }
}
boundaryLayers
@@ -48,24 +47,24 @@ boundaryLayers
renameBoundary
{
- defaultName fixedWalls;
- defaultType wall;
+ defaultName fixedWalls;
+ defaultType wall;
newPatchNames
{
"inlet.*"
{
- newName inlet;
- type patch;
+ type patch;
+ newName inlet;
}
"outlet.*"
{
- newName outlet;
- type patch;
+ type patch;
+ newName outlet;
}
}
}
-
-
+
+
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/intakePortOctree/0/.gitignore b/tutorials/cartesianMesh/intakePortOctree/0/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/intakePortOctree/0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/intakePortOctree/Allclean b/tutorials/cartesianMesh/intakePortOctree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesianMesh/intakePortOctree/Allclean
+++ b/tutorials/cartesianMesh/intakePortOctree/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/intakePortOctree/Allrun b/tutorials/cartesianMesh/intakePortOctree/Allrun
index f22963cc7cda9c3ab87f4cf45e02c0338a81c8f4..2f8cfc4bcd97cfb46e91ddbeefbd32fb3c8b5bc5 100755
--- a/tutorials/cartesianMesh/intakePortOctree/Allrun
+++ b/tutorials/cartesianMesh/intakePortOctree/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication cartesianMesh
runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/intakePortOctree/constant/.gitignore b/tutorials/cartesianMesh/intakePortOctree/constant/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/intakePortOctree/constant/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/intakePortOctree/system/controlDict b/tutorials/cartesianMesh/intakePortOctree/system/controlDict
index ebbe91cdcf3a7f234ca7e8c49040972b71436abd..f5e596ea8ba0b2df4842aabc3ab16cdb3ed86c50 100644
--- a/tutorials/cartesianMesh/intakePortOctree/system/controlDict
+++ b/tutorials/cartesianMesh/intakePortOctree/system/controlDict
@@ -1,23 +1,20 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// ************************************************************************* //
-applicationClass ;
+application cartesianMesh;
startFrom latestTime;
@@ -33,21 +30,8 @@ writeControl timeStep;
writeInterval 100;
-cycleWrite 0;
-
writeFormat ascii;
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
runTimeModifiable yes;
-nCorrectors 2;
-
-nNonOrthogonalCorrectors 0;
-
-
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/intakePortOctree/system/fvSchemes b/tutorials/cartesianMesh/intakePortOctree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/cartesianMesh/intakePortOctree/system/fvSchemes
+++ b/tutorials/cartesianMesh/intakePortOctree/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/intakePortOctree/system/fvSolution b/tutorials/cartesianMesh/intakePortOctree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/cartesianMesh/intakePortOctree/system/fvSolution
+++ b/tutorials/cartesianMesh/intakePortOctree/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/intakePortOctree/system/meshDict b/tutorials/cartesianMesh/intakePortOctree/system/meshDict
index 13027caa3b3dd65fb5e551d5aeb1cdc5da9aec71..d296a70c42eb6a82b4b1d89ee52d221fffcdfc8a 100644
--- a/tutorials/cartesianMesh/intakePortOctree/system/meshDict
+++ b/tutorials/cartesianMesh/intakePortOctree/system/meshDict
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -19,51 +18,51 @@ FoamFile
surfaceFile "geom2.stl";
+minCellSize 2;
+
maxCellSize 10;
boundaryCellSize 1.25;
-minCellSize 2.0;
-
localRefinement
{
patch001
{
cellSize 0.625;
- }
+ }
patch002
{
cellSize 0.625;
- }
+ }
patch003
{
cellSize 0.625;
- }
+ }
patch004
{
cellSize 0.625;
- }
+ }
patch005
{
cellSize 0.625;
- }
+ }
patch006
{
cellSize 0.625;
- }
+ }
patch007
{
cellSize 0.625;
- }
+ }
patch008
{
cellSize 0.625;
- }
+ }
}
meshQualitySettings
{
maxNonOrthogonality 50;
}
-
+
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/multipleOrifices/0/.ignore b/tutorials/cartesianMesh/multipleOrifices/0/.ignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/multipleOrifices/Allclean b/tutorials/cartesianMesh/multipleOrifices/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesianMesh/multipleOrifices/Allclean
+++ b/tutorials/cartesianMesh/multipleOrifices/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/multipleOrifices/Allrun b/tutorials/cartesianMesh/multipleOrifices/Allrun
index c3cf57bb3e19a2db261cb47e02c26a607ecc4745..a818771b2161730e4b619cafc93ac1556fa34e52 100755
--- a/tutorials/cartesianMesh/multipleOrifices/Allrun
+++ b/tutorials/cartesianMesh/multipleOrifices/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication cartesianMesh
runApplication checkMesh -constant
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/multipleOrifices/constant/.ignore b/tutorials/cartesianMesh/multipleOrifices/constant/.ignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/multipleOrifices/readme.txt b/tutorials/cartesianMesh/multipleOrifices/readme.txt
deleted file mode 100644
index c22592a75d24df082692b9b488d5c9f9e54d398e..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/multipleOrifices/readme.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-cfMesh Example Case
-Date: 02 October 2014
-Application: cartesianMesh
-
-Goal: Demonstration of the regular expressions feature available within
-cfMesh for specifying patch names in the meshDict file.
-
-STL File: multipleOrifices.stl
-STL Type: Multi-solid
-
-Patches within the STL File (Note: Each patch is one STL Solid):
-inlet_S42
-outlet_S43
-orifice01_S44
-orifice01_S45
-orifice01_S46
-orifice02_S47
-orifice02_S48
-orifice02_S49
-orifice03_S50
-orifice03_S51
-orifice03_S52
-orifice04_S53
-orifice04_S54
-orifice04_S55
-orifice05_S56
-orifice05_S57
-orifice05_S58
-orifice06_S59
-orifice06_S60
-orifice06_S61
-tubes_S62
-tubes_S63
-tubes_S64
-tubes_S65
-tubes_S66
-tubes_S67
-tubes_S68
-tubes_S69
-tubes_S70
-tubes_S71
-tubes_S72
-tubes_S73
-fixedWalls_S74
-fixedWalls_S75
-fixedWalls_S76
-fixedWalls_S77
-fixedWalls_S78
-fixedWalls_S79
-fixedWalls_S80
-fixedWalls_S81
-
-
-
-
-
diff --git a/tutorials/cartesianMesh/multipleOrifices/system/controlDict b/tutorials/cartesianMesh/multipleOrifices/system/controlDict
index ebbe91cdcf3a7f234ca7e8c49040972b71436abd..f5e596ea8ba0b2df4842aabc3ab16cdb3ed86c50 100644
--- a/tutorials/cartesianMesh/multipleOrifices/system/controlDict
+++ b/tutorials/cartesianMesh/multipleOrifices/system/controlDict
@@ -1,23 +1,20 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// ************************************************************************* //
-applicationClass ;
+application cartesianMesh;
startFrom latestTime;
@@ -33,21 +30,8 @@ writeControl timeStep;
writeInterval 100;
-cycleWrite 0;
-
writeFormat ascii;
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
runTimeModifiable yes;
-nCorrectors 2;
-
-nNonOrthogonalCorrectors 0;
-
-
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/multipleOrifices/system/fvSchemes b/tutorials/cartesianMesh/multipleOrifices/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/cartesianMesh/multipleOrifices/system/fvSchemes
+++ b/tutorials/cartesianMesh/multipleOrifices/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/multipleOrifices/system/fvSolution b/tutorials/cartesianMesh/multipleOrifices/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/cartesianMesh/multipleOrifices/system/fvSolution
+++ b/tutorials/cartesianMesh/multipleOrifices/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/multipleOrifices/system/meshDict b/tutorials/cartesianMesh/multipleOrifices/system/meshDict
index 6bb0561211ff1dbb2b94b09bad88569bb6576c30..a17957165ad0fb70d72788d11ae7b853bbabd47c 100644
--- a/tutorials/cartesianMesh/multipleOrifices/system/meshDict
+++ b/tutorials/cartesianMesh/multipleOrifices/system/meshDict
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -19,18 +18,18 @@ FoamFile
surfaceFile "multipleOrifices.stl";
+minCellSize 1.0;
+
maxCellSize 5.0;
boundaryCellSize 2.0;
-minCellSize 1.00;
-
localRefinement
{
"orifice01.*"
{
cellSize 0.1;
- }
+ }
"orifice02.*"
{
@@ -46,9 +45,7 @@ localRefinement
boundaryLayers
{
// nLayers 3;
-
// thicknessRatio 1.2;
-
// maxFirstLayerThickness 0.5;
patchBoundaryLayers
@@ -64,7 +61,7 @@ boundaryLayers
allowDiscontinuity 0;
}
- "fixedWalls.*"
+ "fixedWalls.*"
{
nLayers 4;
@@ -75,7 +72,7 @@ boundaryLayers
allowDiscontinuity 0;
}
- "tubes.*"
+ "tubes.*"
{
nLayers 4;
@@ -92,24 +89,24 @@ boundaryLayers
renameBoundary
{
- defaultName fixedWalls;
- defaultType wall;
+ defaultName fixedWalls;
+ defaultType wall;
newPatchNames
{
"inlet.*"
{
- newName inlet;
- type patch;
+ type patch;
+ newName inlet;
}
"outlet.*"
{
- newName outlet;
- type patch;
+ type patch;
+ newName outlet;
}
}
}
-
-
+
+
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/sBendOctree/0/.gitignore b/tutorials/cartesianMesh/sBendOctree/0/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/sBendOctree/0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/sBendOctree/Allclean b/tutorials/cartesianMesh/sBendOctree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesianMesh/sBendOctree/Allclean
+++ b/tutorials/cartesianMesh/sBendOctree/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/sBendOctree/Allrun b/tutorials/cartesianMesh/sBendOctree/Allrun
deleted file mode 100755
index e79e3ef4edc58821ad33c8ebd657fa4951fb90fc..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/sBendOctree/Allrun
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-runApplication cartesianMesh
-runApplication improveSymmetryPlanes
-runApplication checkMesh
diff --git a/tutorials/cartesianMesh/sBendOctree/Allrun-optional b/tutorials/cartesianMesh/sBendOctree/Allrun-optional
new file mode 100755
index 0000000000000000000000000000000000000000..2c703fecb15cfd459f1e149e431f929803c15d0b
--- /dev/null
+++ b/tutorials/cartesianMesh/sBendOctree/Allrun-optional
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
+
+runApplication cartesianMesh
+runApplication improveSymmetryPlanes
+runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/sBendOctree/README b/tutorials/cartesianMesh/sBendOctree/README
index d0dea91e5ea466af2f46904ac6cc262b31c15292..87877e81a341a4757143fa591ed7ffa5d0850c20 100644
--- a/tutorials/cartesianMesh/sBendOctree/README
+++ b/tutorials/cartesianMesh/sBendOctree/README
@@ -1 +1,4 @@
-The exmaple demonstrates usage of subsets for refinement, and how to set up boundary layer properties. To generate the mesh please run cartesianMesh or tetMesh.
+The exmaple demonstrates usage of subsets for refinement, and how to
+set up boundary layer properties.
+
+To generate the mesh please run cartesianMesh or tetMesh.
diff --git a/tutorials/cartesianMesh/sBendOctree/constant/.gitignore b/tutorials/cartesianMesh/sBendOctree/constant/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/sBendOctree/constant/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/sBendOctree/system/controlDict b/tutorials/cartesianMesh/sBendOctree/system/controlDict
index 236cab7abf84f8bbec6d25cc7748f25afa8cd0a5..a6a43bff9be5bd2f3acef5414bb6cffa3daf6292 100644
--- a/tutorials/cartesianMesh/sBendOctree/system/controlDict
+++ b/tutorials/cartesianMesh/sBendOctree/system/controlDict
@@ -1,36 +1,37 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application ;
-deltaT 0.001;
-endTime 2;
-graphFormat raw;
-purgeWrite 0;
-runTimeModifiable yes;
-startFrom latestTime;
-startTime 0;
-stopAt endTime;
-timeFormat general;
-timePrecision 6;
-writeCompression compressed;
-writeControl timeStep;
-writeFormat binary;
-writeInterval 100;
-writePrecision 6;
-
-// ************************************************************************* //
\ No newline at end of file
+
+application true; // Optional : no default application to run
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 2;
+
+deltaT 0.001;
+
+writeControl timeStep;
+
+writeInterval 100;
+
+writeFormat binary;
+
+runTimeModifiable yes;
+
+// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/sBendOctree/system/fvSchemes b/tutorials/cartesianMesh/sBendOctree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/cartesianMesh/sBendOctree/system/fvSchemes
+++ b/tutorials/cartesianMesh/sBendOctree/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/sBendOctree/system/fvSolution b/tutorials/cartesianMesh/sBendOctree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/cartesianMesh/sBendOctree/system/fvSolution
+++ b/tutorials/cartesianMesh/sBendOctree/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/sBendOctree/system/meshDict b/tutorials/cartesianMesh/sBendOctree/system/meshDict
index 60debc7d9bb3bb721db46fcb161569715272e448..daf05110b7a906c1fcaf3189666ebb0b3313c250 100644
--- a/tutorials/cartesianMesh/sBendOctree/system/meshDict
+++ b/tutorials/cartesianMesh/sBendOctree/system/meshDict
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -16,22 +15,21 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+maxCellSize 0.1;
-maxCellSize 0.1;
-
-surfaceFile "sBend.fms";
+surfaceFile "sBend.fms";
boundaryLayers
{
- nLayers 1;
+ nLayers 1;
patchBoundaryLayers
{
walls
{
- nLayers 3;
- thicknessRatio 1.2;
+ nLayers 3;
+ thicknessRatio 1.2;
}
}
@@ -39,11 +37,11 @@ boundaryLayers
optimisationParameters
{
- nSmoothNormals 5;
- relThicknessTol 0.15;
- featureSizeFactor 0.3;
- reCalculateNormals 1;
- maxNumIterations 5;
+ nSmoothNormals 5;
+ relThicknessTol 0.15;
+ featureSizeFactor 0.3;
+ reCalculateNormals 1;
+ maxNumIterations 5;
}
}
@@ -52,13 +50,14 @@ localRefinement
refFine
{
- cellSize 0.025;
+ cellSize 0.025;
}
walls
{
- cellSize 0.05;
+ cellSize 0.05;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/sawOctree/0/.gitignore b/tutorials/cartesianMesh/sawOctree/0/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/sawOctree/0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/sawOctree/Allclean b/tutorials/cartesianMesh/sawOctree/Allclean
index d1ab657facfa3e8154c5c61ec37e9f522128f438..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesianMesh/sawOctree/Allclean
+++ b/tutorials/cartesianMesh/sawOctree/Allclean
@@ -1,14 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
-rm -r 0/polyMesh
-rm -r processor*
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/sawOctree/Allrun b/tutorials/cartesianMesh/sawOctree/Allrun
index 11b1fcaf89fce2aea762916e81b80f6e38633f51..a191096e2b7d4f2ddf1df740ecd5a1a602bd7fd9 100755
--- a/tutorials/cartesianMesh/sawOctree/Allrun
+++ b/tutorials/cartesianMesh/sawOctree/Allrun
@@ -1,13 +1,12 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication preparePar
-runParallel `which cartesianMesh` 4
-runParallel `which checkMesh` 4
-if [ "$WM_PROJECT" = "OpenFOAM" ]
-then
+runParallel cartesianMesh
+runParallel checkMesh
+
runApplication reconstructParMesh -constant -fullMatch
-else
-runApplication reconstructParMesh -zeroTime
-fi
+## runApplication reconstructParMesh -zeroTime
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/sawOctree/README b/tutorials/cartesianMesh/sawOctree/README
deleted file mode 100644
index 44510a92c1b83585bc21b166a5710214d1e6c9be..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/sawOctree/README
+++ /dev/null
@@ -1 +0,0 @@
-Please run cartesianMesh to generate the mesh.
diff --git a/tutorials/cartesianMesh/sawOctree/constant/.gitignore b/tutorials/cartesianMesh/sawOctree/constant/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/sawOctree/constant/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/cartesianMesh/sawOctree/sawOctree.foam b/tutorials/cartesianMesh/sawOctree/sawOctree.foam
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/sawOctree/system/controlDict b/tutorials/cartesianMesh/sawOctree/system/controlDict
index de6110208c22b21e0360f5c51bdfa4e80a65e393..26e4d1f9f8cac26a750dbdbdc951e160a8fa6865 100644
--- a/tutorials/cartesianMesh/sawOctree/system/controlDict
+++ b/tutorials/cartesianMesh/sawOctree/system/controlDict
@@ -1,23 +1,20 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// ************************************************************************* //
-applicationClass ;
+application cartesianMesh;
startFrom latestTime;
@@ -33,21 +30,8 @@ writeControl timeStep;
writeInterval 100;
-cycleWrite 0;
-
writeFormat binary;
-writeCompression compressed;
-
-timeFormat general;
-
-timePrecision 6;
-
runTimeModifiable yes;
-nCorrectors 2;
-
-nNonOrthogonalCorrectors 0;
-
-
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/sawOctree/system/decomposeParDict b/tutorials/cartesianMesh/sawOctree/system/decomposeParDict
index cdb3ad7e896e967804ce626e350093e40c76c971..3e666b3122eb9363ad30f89c2087dffdc1b7e996 100644
--- a/tutorials/cartesianMesh/sawOctree/system/decomposeParDict
+++ b/tutorials/cartesianMesh/sawOctree/system/decomposeParDict
@@ -5,7 +5,6 @@
| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/sawOctree/system/fvSchemes b/tutorials/cartesianMesh/sawOctree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/cartesianMesh/sawOctree/system/fvSchemes
+++ b/tutorials/cartesianMesh/sawOctree/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/sawOctree/system/fvSolution b/tutorials/cartesianMesh/sawOctree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/cartesianMesh/sawOctree/system/fvSolution
+++ b/tutorials/cartesianMesh/sawOctree/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/sawOctree/system/meshDict b/tutorials/cartesianMesh/sawOctree/system/meshDict
index 5bcf3b848d235769583f1ab881ca940d5bc4fee0..78b32c03d2261d061d86ae5454b3feed84a4634d 100644
--- a/tutorials/cartesianMesh/sawOctree/system/meshDict
+++ b/tutorials/cartesianMesh/sawOctree/system/meshDict
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -17,9 +16,9 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-surfaceFile "sav1.stl";
+surfaceFile "sav1.stl";
-maxCellSize 0.25;
+maxCellSize 0.25;
boundaryCellSize 0.125;
diff --git a/tutorials/cartesianMesh/ship5415Octree/0/.gitignore b/tutorials/cartesianMesh/ship5415Octree/0/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/ship5415Octree/Allclean b/tutorials/cartesianMesh/ship5415Octree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..9a0d3ab2e8553b3830ca8360047ba6eacca9872f 100755
--- a/tutorials/cartesianMesh/ship5415Octree/Allclean
+++ b/tutorials/cartesianMesh/ship5415Octree/Allclean
@@ -1,12 +1,9 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+rm -f ship5415-hull-and-box.ftr 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/ship5415Octree/Allrun b/tutorials/cartesianMesh/ship5415Octree/Allrun
index 63704885b86ac6648d8dcedff5630566c657871f..45d36d6cec4e34fe99c99932d66d16ba71d63019 100755
--- a/tutorials/cartesianMesh/ship5415Octree/Allrun
+++ b/tutorials/cartesianMesh/ship5415Octree/Allrun
@@ -1,8 +1,12 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
-runApplication surfaceFeatureEdges 5415Joined2.stl 5415Joined3.ftr
+runApplication surfaceFeatureEdges \
+ ship5415-hull-and-box.stl \
+ ship5415-hull-and-box.ftr
runApplication cartesianMesh
runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/ship5415Octree/constant/.gitignore b/tutorials/cartesianMesh/ship5415Octree/constant/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/ship5415Octree/5415Joined2.stl b/tutorials/cartesianMesh/ship5415Octree/ship5415-hull-and-box.stl
similarity index 100%
rename from tutorials/cartesianMesh/ship5415Octree/5415Joined2.stl
rename to tutorials/cartesianMesh/ship5415Octree/ship5415-hull-and-box.stl
diff --git a/tutorials/cartesianMesh/ship5415Octree/5415Joined1.stl b/tutorials/cartesianMesh/ship5415Octree/ship5415-hull.stl
similarity index 100%
rename from tutorials/cartesianMesh/ship5415Octree/5415Joined1.stl
rename to tutorials/cartesianMesh/ship5415Octree/ship5415-hull.stl
diff --git a/tutorials/cartesianMesh/ship5415Octree/ship5415Octree.foam b/tutorials/cartesianMesh/ship5415Octree/ship5415Octree.foam
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/ship5415Octree/system/controlDict b/tutorials/cartesianMesh/ship5415Octree/system/controlDict
index 8dea2f811f64ce2079665b89748d2158d6cad374..07f6248cd2f9501b9f1665e22ba931179def3489 100644
--- a/tutorials/cartesianMesh/ship5415Octree/system/controlDict
+++ b/tutorials/cartesianMesh/ship5415Octree/system/controlDict
@@ -1,52 +1,37 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object constrolDict;
+ object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application ;
-
-deltaT 0.05;
-
-endTime 10;
-
-graphFormat raw;
-
-purgeWrite 0;
-
-runTimeModifiable yes;
-
-startFrom latestTime;
+application cartesianMesh;
-startTime 0;
+startFrom latestTime;
-stopAt endTime;
+startTime 0;
-timeFormat general;
+stopAt endTime;
-timePrecision 6;
+endTime 10;
-writeCompression uncompressed;
+deltaT 1;
-writeControl timeStep;
+writeControl timeStep;
-writeFormat ascii;
+writeInterval 20;
-writeInterval 20;
+writeFormat ascii;
-writePrecision 6;
+runTimeModifiable yes;
-// ************************************************************************* //
\ No newline at end of file
+// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/ship5415Octree/system/fvSchemes b/tutorials/cartesianMesh/ship5415Octree/system/fvSchemes
index 05354395d321ca707a848ef5f49f45f95203c282..ebb3f22fd7d8c35242ad085b4d8870873045a190 100644
--- a/tutorials/cartesianMesh/ship5415Octree/system/fvSchemes
+++ b/tutorials/cartesianMesh/ship5415Octree/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -63,4 +62,4 @@ snGradSchemes
sngrad(p) corrected;
}
-// ************************************************************************* //
\ No newline at end of file
+// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/ship5415Octree/system/fvSolution b/tutorials/cartesianMesh/ship5415Octree/system/fvSolution
index da0e4d961fc429606147a63610d41876ebc16353..f580a0fd967421469776c3588c888736e143bcb1 100644
--- a/tutorials/cartesianMesh/ship5415Octree/system/fvSolution
+++ b/tutorials/cartesianMesh/ship5415Octree/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -46,4 +45,4 @@ solvers
}
}
-// ************************************************************************* //
\ No newline at end of file
+// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/ship5415Octree/system/meshDict b/tutorials/cartesianMesh/ship5415Octree/system/meshDict
index 0259ad5f00ee2633d5468dbd3dc7c2c7e77d7bd5..7efe0b665bcc7aa9e65f8109bcaa2465788a4db0 100644
--- a/tutorials/cartesianMesh/ship5415Octree/system/meshDict
+++ b/tutorials/cartesianMesh/ship5415Octree/system/meshDict
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -17,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-surfaceFile "5415Joined3.ftr";
+surfaceFile "ship5415-hull-and-box.ftr";
maxCellSize 150;
@@ -26,7 +25,7 @@ surfaceMeshRefinement
hull
{
additionalRefinementLevels 1;
- surfaceFile "5415Joined1.stl";
+ surfaceFile "ship5415-hull.stl";
refinementThickness 50;
}
}
@@ -35,16 +34,16 @@ anisotropicSources
{
Box
{
- type box;
- centre (2800 0 250);
- lengthX 6000;
- lengthY 1000;
- lengthZ 200;
- scaleX 1;
- scaleY 1;
- scaleZ 0.3;
+ type box;
+ centre (2800 0 250);
+ lengthX 6000;
+ lengthY 1000;
+ lengthZ 200;
+ scaleX 1;
+ scaleY 1;
+ scaleZ 0.3;
}
-
+
/*
planeUpper
{
@@ -54,7 +53,7 @@ anisotropicSources
scalingDistance 125;
scalingFactor 0.5;
}
-
+
planeLower
{
type plane;
@@ -65,7 +64,7 @@ anisotropicSources
}
*/
}
-
+
boundaryLayers
{
@@ -77,7 +76,7 @@ boundaryLayers
thicknessRatio 1.1;
}
}
-
+
optimiseLayer 1;
optimisationParameters
diff --git a/tutorials/cartesianMesh/singleOrifice/0/.ignore b/tutorials/cartesianMesh/singleOrifice/0/.ignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/singleOrifice/Allclean b/tutorials/cartesianMesh/singleOrifice/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/cartesianMesh/singleOrifice/Allclean
+++ b/tutorials/cartesianMesh/singleOrifice/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/singleOrifice/Allrun b/tutorials/cartesianMesh/singleOrifice/Allrun
index c3cf57bb3e19a2db261cb47e02c26a607ecc4745..a818771b2161730e4b619cafc93ac1556fa34e52 100755
--- a/tutorials/cartesianMesh/singleOrifice/Allrun
+++ b/tutorials/cartesianMesh/singleOrifice/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication cartesianMesh
runApplication checkMesh -constant
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/cartesianMesh/singleOrifice/constant/.ignore b/tutorials/cartesianMesh/singleOrifice/constant/.ignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/cartesianMesh/singleOrifice/readme.txt b/tutorials/cartesianMesh/singleOrifice/readme.txt
deleted file mode 100644
index 0d2836437c6b45f266c5c9c1bc694839e4c9472c..0000000000000000000000000000000000000000
--- a/tutorials/cartesianMesh/singleOrifice/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-cfMesh Example Case
-Date: 02 October 2014
-Application: cartesianMesh
-
-Goal: Demonstration of the regular expressions feature available within
-cfMesh for specifying patch names in the meshDict file.
-
-STL File: singleOrifice.stl
-STL Type: Multi-solid
-
-Patches within the STL File (Note: Each patch is one STL Solid):
-inlet_S11
-outlet_S12
-orificeRegion_S13
-orificeRegion_S14
-orificeRegion_S15
-fixedWalls_S16
-fixedWalls_S17
-fixedWalls_S18
-fixedWalls_S19
-
-
-
-
-
-
-
diff --git a/tutorials/cartesianMesh/singleOrifice/system/controlDict b/tutorials/cartesianMesh/singleOrifice/system/controlDict
index ebbe91cdcf3a7f234ca7e8c49040972b71436abd..f5e596ea8ba0b2df4842aabc3ab16cdb3ed86c50 100644
--- a/tutorials/cartesianMesh/singleOrifice/system/controlDict
+++ b/tutorials/cartesianMesh/singleOrifice/system/controlDict
@@ -1,23 +1,20 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// ************************************************************************* //
-applicationClass ;
+application cartesianMesh;
startFrom latestTime;
@@ -33,21 +30,8 @@ writeControl timeStep;
writeInterval 100;
-cycleWrite 0;
-
writeFormat ascii;
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
runTimeModifiable yes;
-nCorrectors 2;
-
-nNonOrthogonalCorrectors 0;
-
-
// ************************************************************************* //
diff --git a/tutorials/cartesianMesh/singleOrifice/system/fvSchemes b/tutorials/cartesianMesh/singleOrifice/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/cartesianMesh/singleOrifice/system/fvSchemes
+++ b/tutorials/cartesianMesh/singleOrifice/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/singleOrifice/system/fvSolution b/tutorials/cartesianMesh/singleOrifice/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/cartesianMesh/singleOrifice/system/fvSolution
+++ b/tutorials/cartesianMesh/singleOrifice/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/cartesianMesh/singleOrifice/system/meshDict b/tutorials/cartesianMesh/singleOrifice/system/meshDict
index b2eeb7d106edfdb727250aab0e8bcfebd042f4e4..7a7eb175f5243578c340a6ec0cefb5a368eb1800 100644
--- a/tutorials/cartesianMesh/singleOrifice/system/meshDict
+++ b/tutorials/cartesianMesh/singleOrifice/system/meshDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
@@ -19,20 +19,20 @@ FoamFile
surfaceFile "singleOrifice.stl";
+minCellSize 0.5;
+
maxCellSize 3.0;
boundaryCellSize 1.0;
-minCellSize 0.50;
-
anisotropicSources
{
- Plane
+ Plane
{
- type plane;
- origin (0 0 -20);
- normal (0 0 1);
- scalingDistance 45;
+ type plane;
+ origin (0 0 -20);
+ normal (0 0 1);
+ scalingDistance 45;
scalingFactor 2;
}
}
@@ -42,7 +42,7 @@ localRefinement
"orificeRegion.*"
{
cellSize 0.2;
- }
+ }
}
boundaryLayers
@@ -66,7 +66,7 @@ boundaryLayers
allowDiscontinuity 0;
}
- "fixedWalls.*"
+ "fixedWalls.*"
{
nLayers 4;
@@ -81,30 +81,30 @@ boundaryLayers
renameBoundary
{
- defaultName fixedWalls;
- defaultType wall;
+ defaultName fixedWalls;
+ defaultType wall;
newPatchNames
{
"orificeRegion.*"
{
- newName orificeRegion;
- type wall;
+ type wall;
+ newName orificeRegion;
}
-
+
"inlet.*"
{
- newName inlet;
type patch;
+ newName inlet;
}
"outlet.*"
{
- newName outlet;
type patch;
+ newName outlet;
}
}
}
-
-
+
+
// ************************************************************************* //
diff --git a/tutorials/pMesh/bunnyPoly/Allclean b/tutorials/pMesh/bunnyPoly/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/pMesh/bunnyPoly/Allclean
+++ b/tutorials/pMesh/bunnyPoly/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/pMesh/bunnyPoly/Allrun b/tutorials/pMesh/bunnyPoly/Allrun
index 56d1f622871a35ed493d70465a9ed4d6d1a21442..96e543f097f7975703fc37aaa8fe9bd2190c9246 100755
--- a/tutorials/pMesh/bunnyPoly/Allrun
+++ b/tutorials/pMesh/bunnyPoly/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication pMesh
runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/pMesh/bunnyPoly/system/controlDict b/tutorials/pMesh/bunnyPoly/system/controlDict
index 9a7ae05a8762e098bea0ff443cd20aa66d49c9b3..e92db86a311b0bf1a65bcebad17970818e5835b1 100644
--- a/tutorials/pMesh/bunnyPoly/system/controlDict
+++ b/tutorials/pMesh/bunnyPoly/system/controlDict
@@ -1,51 +1,41 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application ;
-
-startFrom latestTime;
+application pMesh;
-startTime 0;
+startFrom latestTime;
-stopAt endTime;
+startTime 0;
-endTime 10;
+stopAt endTime;
-deltaT 0.05;
+endTime 10;
-writeControl timeStep;
+deltaT 0.05;
-writeInterval 20;
+writeControl timeStep;
-purgeWrite 0;
+writeInterval 20;
-writeFormat ascii;
+purgeWrite 0;
-writePrecision 6;
+writeFormat ascii;
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
+writePrecision 6;
runTimeModifiable yes;
-
// ************************************************************************* //
diff --git a/tutorials/pMesh/bunnyPoly/system/decomposeParDict b/tutorials/pMesh/bunnyPoly/system/decomposeParDict
index d3dfec8bdb9a2df8a5d7a725e087f27c214d4a64..c4f3594c5a0448159c06fe1d18248cff946bf0bb 100644
--- a/tutorials/pMesh/bunnyPoly/system/decomposeParDict
+++ b/tutorials/pMesh/bunnyPoly/system/decomposeParDict
@@ -1,17 +1,15 @@
/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | foam-extend: Open Source CFD |
-| \\ / O peration | Version: 3.0 |
-| \\ / A nd | Web: http://www.extend-project.de |
-| \\/ M anipulation | |
+| ========= | |
+| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / O peration | |
+| \\ / A nd | Author: Franjo Juretic |
+| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- note "mesh decomposition control dictionary";
- location "system";
object decomposeParDict;
}
diff --git a/tutorials/pMesh/bunnyPoly/system/fvSchemes b/tutorials/pMesh/bunnyPoly/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/pMesh/bunnyPoly/system/fvSchemes
+++ b/tutorials/pMesh/bunnyPoly/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/pMesh/bunnyPoly/system/fvSolution b/tutorials/pMesh/bunnyPoly/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/pMesh/bunnyPoly/system/fvSolution
+++ b/tutorials/pMesh/bunnyPoly/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/pMesh/bunnyPoly/system/meshDict b/tutorials/pMesh/bunnyPoly/system/meshDict
index 6876bdf09b0adc0f7379b68afb0cbc81f1a70e0f..533ed5d16dc694a638c3ce0e7b50704364c32215 100644
--- a/tutorials/pMesh/bunnyPoly/system/meshDict
+++ b/tutorials/pMesh/bunnyPoly/system/meshDict
@@ -1,73 +1,72 @@
/*--------------------------------*- C++ -*----------------------------------*\
-| _ _ _ _ | |
-| // \\ | Creative Fields cfMeshPRO |
-| | cfMeshPRO | | |
-| \\ _ _ _ _ // | Version: 0.0.99 |
-| | Web: www.c-fields.com e-mail: support@c-fields.com |
+| ========= | |
+| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / O peration | |
+| \\ / A nd | Author: Franjo Juretic |
+| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
FoamFile
{
-version 2;
-format ascii;
-class dictionary;
-location "system";
-object meshDict;
+ version 2;
+ format ascii;
+ class dictionary;
+ location "system";
+ object meshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-maxCellSize 40;
-surfaceFile "bunnyWrapped.stl";
+maxCellSize 40;
+surfaceFile "bunnyWrapped.stl";
objectRefinements
{
+ ear1
+ {
+ type cone;
+ cellSize 20.1;
+ p0 (-100 1873 -320);
+ p1 (-560 1400 0);
+ radius0 200;
+ radius1 200;
+ }
-ear1
-{
-cellSize 20.1;
-p0 ( -100 1873 -320 );
-p1 ( -560 1400 0 );
-radius0 200;
-radius1 200;
-type cone;
-}
-
-ear2
-{
-cellSize 20.1;
-p0 ( -650 1873 -620 );
-p1 ( -670 1300 0 );
-radius0 200;
-radius1 200;
-type cone;
-}
+ ear2
+ {
+ type cone;
+ cellSize 20.1;
+ p0 (-650 1873 -620);
+ p1 (-670 1300 0);
+ radius0 200;
+ radius1 200;
+ }
/*
-insideTheBody
-{
-cellSize 20.1;
-centre ( 0 700 0 );
-radius 50;
-refinementThickness 50;
-type sphere;
-}
+ insideTheBody
+ {
+ type sphere;
+ cellSize 20.1;
+ centre (0 700 0);
+ radius 50;
+ refinementThickness 50;
+ }
-muzzlePiercing
-{
-cellSize 20.1;
-p0 ( -750 1000 450 );
-p1 ( -750 1500 450 );
-type line;
-}
+ muzzlePiercing
+ {
+ type line;
+ cellSize 20.1;
+ p0 (-750 1000 450);
+ p1 (-750 1500 450);
+ }
-tail
-{
-cellSize 20.1;
-centre ( 500 500 150 );
-lengthX 100;
-lengthY 150;
-lengthZ 200;
-type box;
-}
+ tail
+ {
+ type box;
+ cellSize 20.1;
+ centre (500 500 150);
+ lengthX 100;
+ lengthY 150;
+ lengthZ 200;
+ }
*/
}
diff --git a/tutorials/pMesh/multipleOrifices/Allclean b/tutorials/pMesh/multipleOrifices/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/pMesh/multipleOrifices/Allclean
+++ b/tutorials/pMesh/multipleOrifices/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/pMesh/multipleOrifices/Allrun b/tutorials/pMesh/multipleOrifices/Allrun
index 9f5f7846fb89d5490d3e55ef8899b3141ab8b820..b9d18ebf4ab4f521ab8c8c2a747abd941d44bd9e 100755
--- a/tutorials/pMesh/multipleOrifices/Allrun
+++ b/tutorials/pMesh/multipleOrifices/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication pMesh
runApplication checkMesh -constant
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/pMesh/multipleOrifices/system/controlDict b/tutorials/pMesh/multipleOrifices/system/controlDict
index ebbe91cdcf3a7f234ca7e8c49040972b71436abd..cb8e44ab3a3eed2f3c842724c33f082d7ec828d8 100644
--- a/tutorials/pMesh/multipleOrifices/system/controlDict
+++ b/tutorials/pMesh/multipleOrifices/system/controlDict
@@ -1,23 +1,20 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// ************************************************************************* //
-applicationClass ;
+application pMesh;
startFrom latestTime;
@@ -33,21 +30,8 @@ writeControl timeStep;
writeInterval 100;
-cycleWrite 0;
-
writeFormat ascii;
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
runTimeModifiable yes;
-nCorrectors 2;
-
-nNonOrthogonalCorrectors 0;
-
-
// ************************************************************************* //
diff --git a/tutorials/pMesh/multipleOrifices/system/fvSchemes b/tutorials/pMesh/multipleOrifices/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/pMesh/multipleOrifices/system/fvSchemes
+++ b/tutorials/pMesh/multipleOrifices/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/pMesh/multipleOrifices/system/fvSolution b/tutorials/pMesh/multipleOrifices/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/pMesh/multipleOrifices/system/fvSolution
+++ b/tutorials/pMesh/multipleOrifices/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/pMesh/multipleOrifices/system/meshDict b/tutorials/pMesh/multipleOrifices/system/meshDict
index b2ff3391a53b83843e6d2433324c723909ceefc5..2c097c8f56a9e2c838f08e4ec69b805b39cd7bc1 100644
--- a/tutorials/pMesh/multipleOrifices/system/meshDict
+++ b/tutorials/pMesh/multipleOrifices/system/meshDict
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -28,7 +27,7 @@ localRefinement
"orifice01.*"
{
cellSize 0.1;
- }
+ }
"orifice02.*"
{
@@ -53,21 +52,21 @@ boundaryLayers
renameBoundary
{
- defaultName fixedWalls;
- defaultType wall;
+ defaultName fixedWalls;
+ defaultType wall;
newPatchNames
{
"inlet.*"
{
- newName inlet;
- type patch;
+ type patch;
+ newName inlet;
}
"outlet.*"
{
- newName outlet;
- type patch;
+ type patch;
+ newName outlet;
}
}
}
@@ -86,5 +85,5 @@ workflowControls
//restartFromLatestStep 1;
}
-
+
// ************************************************************************* //
diff --git a/tutorials/tetMesh/cutCubeOctree/0/.gitignore b/tutorials/tetMesh/cutCubeOctree/0/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/tetMesh/cutCubeOctree/0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/tetMesh/cutCubeOctree/Allclean b/tutorials/tetMesh/cutCubeOctree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/tetMesh/cutCubeOctree/Allclean
+++ b/tutorials/tetMesh/cutCubeOctree/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/tetMesh/cutCubeOctree/Allrun b/tutorials/tetMesh/cutCubeOctree/Allrun
index 7dc47c3b86589ee42cf63b91f5e079e1efe46983..e53b308ee6857afb97510fdcaca0aca46ae491ac 100755
--- a/tutorials/tetMesh/cutCubeOctree/Allrun
+++ b/tutorials/tetMesh/cutCubeOctree/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication tetMesh
runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/tetMesh/cutCubeOctree/constant/.gitignore b/tutorials/tetMesh/cutCubeOctree/constant/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/tetMesh/cutCubeOctree/constant/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/tetMesh/cutCubeOctree/system/controlDict b/tutorials/tetMesh/cutCubeOctree/system/controlDict
index e59222d563497919bb954af4b70c74427cca5b4b..889adea58f965fdf1bb38df1e1f476b5adab65a1 100644
--- a/tutorials/tetMesh/cutCubeOctree/system/controlDict
+++ b/tutorials/tetMesh/cutCubeOctree/system/controlDict
@@ -1,23 +1,20 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// ************************************************************************* //
-applicationClass ;
+application tetMesh;
startFrom latestTime;
@@ -33,21 +30,10 @@ writeControl timeStep;
writeInterval 100;
-cycleWrite 0;
-
writeFormat ascii;
-writeCompression compressed;
-
-timeFormat general;
-
-timePrecision 6;
+writeCompression on;
runTimeModifiable yes;
-nCorrectors 2;
-
-nNonOrthogonalCorrectors 0;
-
-
// ************************************************************************* //
diff --git a/tutorials/tetMesh/cutCubeOctree/system/fvSchemes b/tutorials/tetMesh/cutCubeOctree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/tetMesh/cutCubeOctree/system/fvSchemes
+++ b/tutorials/tetMesh/cutCubeOctree/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/tetMesh/cutCubeOctree/system/fvSolution b/tutorials/tetMesh/cutCubeOctree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/tetMesh/cutCubeOctree/system/fvSolution
+++ b/tutorials/tetMesh/cutCubeOctree/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/tetMesh/cutCubeOctree/system/meshDict b/tutorials/tetMesh/cutCubeOctree/system/meshDict
index e22380538876c53f4ebec74df0b7232dbc6190a2..4155cc04661f2e32c25f21cc604efdd3e9596a67 100644
--- a/tutorials/tetMesh/cutCubeOctree/system/meshDict
+++ b/tutorials/tetMesh/cutCubeOctree/system/meshDict
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -19,12 +18,11 @@ FoamFile
surfaceFile "geom1.stl";
+minCellSize 0.1;
maxCellSize 0.2;
boundaryCellSize 0.1;
-minCellSize 0.1;
-
localRefinement
{
patch0000
diff --git a/tutorials/tetMesh/socketOctree/0/.gitignore b/tutorials/tetMesh/socketOctree/0/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/tetMesh/socketOctree/0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/tetMesh/socketOctree/Allclean b/tutorials/tetMesh/socketOctree/Allclean
index b928b6cfea9e31cf9680fd810604054f9fe8b007..38a5e0491b0b46cbf0176317bf97f4860885638a 100755
--- a/tutorials/tetMesh/socketOctree/Allclean
+++ b/tutorials/tetMesh/socketOctree/Allclean
@@ -1,12 +1,8 @@
-#!/bin/bash
-
-# Klas Jareteg, 2012-10-13
-# Description:
-# Script to run comparative case between coupled and segregated solvers.
-
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -r constant/polyMesh
+rmdir constant 2>/dev/null
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/tetMesh/socketOctree/Allrun b/tutorials/tetMesh/socketOctree/Allrun
index 7dc47c3b86589ee42cf63b91f5e079e1efe46983..e53b308ee6857afb97510fdcaca0aca46ae491ac 100755
--- a/tutorials/tetMesh/socketOctree/Allrun
+++ b/tutorials/tetMesh/socketOctree/Allrun
@@ -1,6 +1,8 @@
#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication tetMesh
runApplication checkMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/tetMesh/socketOctree/constant/.gitignore b/tutorials/tetMesh/socketOctree/constant/.gitignore
deleted file mode 100644
index 86d0cb2726c6c7c179b99520c452dd1b68e7a813..0000000000000000000000000000000000000000
--- a/tutorials/tetMesh/socketOctree/constant/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/tutorials/tetMesh/socketOctree/system/controlDict b/tutorials/tetMesh/socketOctree/system/controlDict
index 81d538ef1824ee76994b7d770a63fced164e501b..369d8da7a4e657c74b8fa796cee599b0fc7fd621 100644
--- a/tutorials/tetMesh/socketOctree/system/controlDict
+++ b/tutorials/tetMesh/socketOctree/system/controlDict
@@ -1,23 +1,20 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
- object meshDict;
+ object controlDict;
}
-
// ************************************************************************* //
-applicationClass ;
+application tetMesh;
startFrom latestTime;
@@ -33,21 +30,10 @@ writeControl timeStep;
writeInterval 100;
-cycleWrite 0;
-
writeFormat ascii;
-writeCompression compressed;
-
-timeFormat general;
-
-timePrecision 6;
+writeCompression on;
runTimeModifiable yes;
-nCorrectors 2;
-
-nNonOrthogonalCorrectors 0;
-
-
// ************************************************************************* //
diff --git a/tutorials/tetMesh/socketOctree/system/fvSchemes b/tutorials/tetMesh/socketOctree/system/fvSchemes
index 01a0a06c660a62eb4fb5500bf890f709be1c8a27..4c36c6cf7f55fb08f1c253a89c3201ca080f0e9d 100644
--- a/tutorials/tetMesh/socketOctree/system/fvSchemes
+++ b/tutorials/tetMesh/socketOctree/system/fvSchemes
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/tetMesh/socketOctree/system/fvSolution b/tutorials/tetMesh/socketOctree/system/fvSolution
index 023baf93018bb01ff67a176648e077e7a9e06065..b669c562b9e9681597a19fb7954295e096b77253 100644
--- a/tutorials/tetMesh/socketOctree/system/fvSolution
+++ b/tutorials/tetMesh/socketOctree/system/fvSolution
@@ -1,11 +1,10 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
diff --git a/tutorials/tetMesh/socketOctree/system/meshDict b/tutorials/tetMesh/socketOctree/system/meshDict
index 391de27b73a532f2080968c28c87422b3b80ce13..dd62d8c414c954eb04d4baa4f71ff283ab963705 100644
--- a/tutorials/tetMesh/socketOctree/system/meshDict
+++ b/tutorials/tetMesh/socketOctree/system/meshDict
@@ -1,44 +1,42 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
-| \\ / F ield | cfMesh: A library for mesh generation |
+| \\ / F ield | cfMesh: A library for mesh generation |
| \\ / O peration | |
-| \\ / A nd | Author: Franjo Juretic |
+| \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
format ascii;
class dictionary;
- location "system";
object meshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-boundaryCellSize 4.5;
+//minCellSize 0.375;
+maxCellSize 9;
+boundaryCellSize 4.5;
//keepCellsIntersectingBoundary 1;
-maxCellSize 9;
-//minCellSize 0.375;
-surfaceFile "socket.fms";
+surfaceFile "socket.fms";
boundaryLayers
{
- maxFirstLayerThickness 2.0;
- nLayers 1;
- thicknessRatio 1.2;
+ maxFirstLayerThickness 2.0;
+ nLayers 1;
+ thicknessRatio 1.2;
patchBoundaryLayers
{
patch7
{
- allowDiscontinuity 0;
- maxFirstLayerThickness 1.0;
- nLayers 2;
- thicknessRatio 1.1;
+ allowDiscontinuity 0;
+ maxFirstLayerThickness 1.0;
+ nLayers 2;
+ thicknessRatio 1.1;
}
}
}
@@ -48,17 +46,17 @@ localRefinement
patch15
{
- additionalRefinementLevels 1;
+ additionalRefinementLevels 1;
}
subset1
{
- cellSize 4.5;
+ cellSize 4.5;
}
subset2
{
- cellSize 4.5;
+ cellSize 4.5;
}
}