Commit e91b8638 authored by Franjo's avatar Franjo

Updated tutorials

Added FanOctree as an example for cartesianMesh

Fixed typos
parent 6204fbcf
#!/bin/sh
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cd cartesianMesh
# Delete data generated by cartesianMesh
cd asmoOctree
cleanCase
rm -rf constant/polyMesh > /dev/null 2>&1
rm log.*
cd ..
cd bunnyOctree
cleanCase
rm -rf constant/polyMesh > /dev/null 2>&1
rm log.*
cd ..
cd intakePortOctree
cleanCase
rm -rf constant/polyMesh > /dev/null 2>&1
rm log.*
cd ..
cd sawOctree
cleanCase
rm -rf processor* > /dev/null 2>&1
rm log.*
cd ..
cd sBendOctree
cleanCase
rm -rf constant/polyMesh > /dev/null 2>&1
rm log.*
cd ..
cd ..
cd cartesian2DMesh
# Delete data generated by cartesian2DMesh
cd hatOctree
cleanCase
rm -rf constant/polyMesh > /dev/null 2>&1
rm log.*
cd ..
cd ..
cd tetMesh
# Delete data generated by tetMesh
cd cutCubeOctree
cleanCase
rm -rf constant/polyMesh > /dev/null 2>&1
rm log.*
cd ..
cd socketOctree
cleanCase
rm -rf constant/polyMesh > /dev/null 2>&1
rm log.*
cd ..
cd ..
#!/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
cleanCase
rm -r constant/polyMesh
#!/bin/sh
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication cartesianMesh
runApplication checkMesh
...@@ -5,45 +5,23 @@ ...@@ -5,45 +5,23 @@
| \\ / O peration | | | \\ / O peration | |
| \\ / A nd | Author: Franjo Juretic | | \\ / A nd | Author: Franjo Juretic |
| \\/ M anipulation | E-mail: franjo.juretic@c-fields.com | | \\/ M anipulation | E-mail: franjo.juretic@c-fields.com |
=======
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.0 |
| \\ / A nd | Web: http://www.openfoam.org |
| \\/ M anipulation | |
>>>>>>> parent of aee3c13... Removed Fan from tutorials
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
FoamFile FoamFile
{ {
<<<<<<< HEAD
version 2.0; version 2.0;
format ascii; format ascii;
class dictionary; class dictionary;
location "system"; location "system";
object meshDict; object meshDict;
=======
version 2.0;
format ascii;
root "";
case "";
instance "";
local "";
class dictionary; class dictionary;
object controlDict; object controlDict;
>>>>>>> parent of aee3c13... Removed Fan from tutorials
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
<<<<<<< HEAD
application ; application ;
=======
application icoFoam;
>>>>>>> parent of aee3c13... Removed Fan from tutorials
startFrom latestTime; startFrom latestTime;
...@@ -65,7 +43,7 @@ writeFormat binary; ...@@ -65,7 +43,7 @@ writeFormat binary;
writePrecision 6; writePrecision 6;
writeCompression uncompressed; writeCompression compressed;
timeFormat general; timeFormat general;
......
<<<<<<< HEAD
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | cfMesh: A library for mesh generation | | \\ / F ield | cfMesh: A library for mesh generation |
...@@ -15,35 +14,6 @@ FoamFile ...@@ -15,35 +14,6 @@ FoamFile
location "system"; location "system";
object meshDict; object meshDict;
} }
=======
// The FOAM Project // File: adaptiveProperties
/*
-------------------------------------------------------------------------------
========= | dictionary
\\ / |
\\ / | Name: adaptiveProperties
\\ / | Family: Data file
\\/ |
F ield | FOAM version: 1.9.6
O peration | Product of Nabla Ltd.
A and |
M anipulation | Email: Enquiries@Nabla.co.uk
-------------------------------------------------------------------------------
*/
version 0.5;
format ascii;
root "/home/larson/franjo/foam/run";
case "thetaTest";
instance "system";
local "";
note "fvSchemes for Foam";
class dictionary;
object adaptiveProperties;
>>>>>>> parent of aee3c13... Removed Fan from tutorials
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -53,7 +23,6 @@ maxCellSize 40; ...@@ -53,7 +23,6 @@ maxCellSize 40;
boundaryCellSize 10; boundaryCellSize 10;
<<<<<<< HEAD
minCellSize 1.25; minCellSize 1.25;
localRefinement localRefinement
...@@ -159,55 +128,6 @@ keepCellsIntersectingPatches ...@@ -159,55 +128,6 @@ keepCellsIntersectingPatches
keepCells 1; keepCells 1;
} }
} }
=======
patchCellSize
19
(
// outer rim
patch0 5
// blade seat edge
patch5 1.25
// shaft
patch6 10
// thin edges at blade ends
patch37 0.625
patch55 0.625
patch72 0.625
patch89 0.625
patch86 0.625
patch114 0.625
patch138 0.625
patch157 0.625
// blades
patch8 5
patch11 5
patch12 5
patch16 5
patch19 5
patch24 5
patch27 5
patch30 5
);
subsetFileName "Fan1.sftr";
subsetCellSize
1
(
_refine_1 2.5
);
keepCellsIntersectingPatches
3
(
patch0
patch1
patch2
);
>>>>>>> parent of aee3c13... Removed Fan from tutorials
keepCellsIntersectingBoundary 1; keepCellsIntersectingBoundary 1;
checkForGluedMesh 1; checkForGluedMesh 1;
......
...@@ -5,4 +5,9 @@ ...@@ -5,4 +5,9 @@
runApplication preparePar runApplication preparePar
runParallel cartesianMesh 4 runParallel cartesianMesh 4
runParallel checkMesh 4 runParallel checkMesh 4
if [ "$WM_PROJECT" = "OpenFOAM" ]
then
runApplication reconstructParMesh -constant -fullMatch
else
runApplication reconstructParMesh -zeroTime runApplication reconstructParMesh -zeroTime
fi
cellSetIntersectedByPlane.C cellSetIntersectedByPlane.C
EXE = $(FOAM_APPBIN)/cellSetIntersectedByPlane EXE = $(FOAM_USER_APPBIN)/cellSetIntersectedByPlane
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude \
-I$(FOAM_USER_LIB)/meshGeneration/meshLibrary/lnInclude -I$(FOAM_SRC)/finiteVolume/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshLibrary \ -ltriSurface \
-ltriSurface \ -lmeshTools \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools -L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
printCellsInSet.C printCellsInSet.C
EXE = $(FOAM_APPBIN)/printCellsInSet EXE = $(FOAM_USER_APPBIN)/printCellsInSet
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude \
-I$(FOAM_USER_LIB)/meshGeneration/meshLibrary/lnInclude -I$(FOAM_SRC)/finiteVolume/lnInclude
EXE_LIBS = -lmeshLibrary -ltriSurface -lfiniteVolume -lmeshTools EXE_LIBS = \
-ltriSurface \
-lmeshTools \
-lfiniteVolume \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment