Commit 67136c25 authored by graham's avatar graham
Browse files

STYLE: Remove tabs.

parent 7a2bf628
......@@ -153,7 +153,7 @@ castellatedMeshControls
//- Optional faceZone and (for closed surface) cellZone with
// how to select the cells that are in the cellZone
// (inside / outside / specified insidePoint)
//faceZone sphere;
//faceZone sphere;
//cellZone sphere;
//cellZoneInside inside; //outside/insidePoint
}
......
......@@ -9,8 +9,8 @@ export DH_VERBOSE=1
# This is the debhelper compatibility version to use.
#DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
#DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
#DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
#DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
#ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
#CONFARGS= --host=$(DEB_HOST_GNU_TYPE)
#endif
......@@ -23,7 +23,7 @@ export DH_VERBOSE=1
#CFLAGS += -O2
#endif
DEB_BUILD_ARCH_BITS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
DEB_BUILD_ARCH_BITS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
foamArch=
ifeq ($(DEB_BUILD_ARCH_BITS),64)
foamArch=linux64GccDPOpt
......@@ -31,45 +31,45 @@ else
foamArch=linuxGccDPOpt
endif
packageName = $(shell dh_listpackages)
installDir = debian/$(packageName)/opt/$(packageName)
paraviewInstallDir = /opt/paraviewopenfoam380
packageName = $(shell dh_listpackages)
installDir = debian/$(packageName)/opt/$(packageName)
paraviewInstallDir = /opt/paraviewopenfoam380
DEB_DH_SHLIBDEPS_ARGS=-L$(installDir)/lib/$(foamArch)
build: patch build-stamp
build-stamp:
dh_testdir
dh_testdir
# Add here commands to compile the package.
#./Allwmake
# Add here commands to compile the package.
#./Allwmake
touch build-stamp
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
dh_testdir
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
#./Allwclean
#set
# Add here commands to clean up after the build process.
#./Allwclean
#set
dh_clean
dh_clean
install: build
dh_testdir
dh_testroot
dh_prep
dh_installdirs
dh_testdir
dh_testroot
dh_prep
dh_installdirs
# Install source files into debian/.
install -d $(installDir)
tar cf - `bin/foamSourceFiles .` | (cd $(installDir); tar xfp -)
(cd $(installDir); bin/tools/foamConfigurePaths --foamInstall /opt --projectName $(packageName) --paraviewInstall $(paraviewInstallDir) )
# Install source files into debian/.
install -d $(installDir)
tar cf - `bin/foamSourceFiles .` | (cd $(installDir); tar xfp -)
(cd $(installDir); bin/tools/foamConfigurePaths --foamInstall /opt --projectName $(packageName) --paraviewInstall $(paraviewInstallDir) )
# Install binary files into debian/.
tar cf - `bin/foamBinDirs . $(foamArch)` | (cd $(installDir); tar xfp -)
# Install binary files into debian/.
tar cf - `bin/foamBinDirs . $(foamArch)` | (cd $(installDir); tar xfp -)
# Build architecture-independent files here.
binary-indep: build install
......@@ -77,33 +77,33 @@ binary-indep: build install
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
# dh_installemacsen
# dh_installinit
dh_installmime
dh_installcron
#dh_installman debian/lesspipe.1
#dh_undocumented
dh_installchangelogs
#dh_link
#dh_strip
dh_compress
dh_fixperms
dh_makeshlibs
dh_installdeb
# dh_perl
dh_shlibdeps -- --ignore-missing-info #We depend on vtk libs without info
dh_gencontrol
dh_md5sums
dh_builddeb
dh_testdir
dh_testroot
dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
# dh_installemacsen
# dh_installinit
dh_installmime
dh_installcron
#dh_installman debian/lesspipe.1
#dh_undocumented
dh_installchangelogs
#dh_link
#dh_strip
dh_compress
dh_fixperms
dh_makeshlibs
dh_installdeb
# dh_perl
dh_shlibdeps -- --ignore-missing-info #We depend on vtk libs without info
dh_gencontrol
dh_md5sums
dh_builddeb
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......
......@@ -64,7 +64,7 @@ snGradSchemes
fluxRequired
{
default no;
p;
p;
}
......
......@@ -36,7 +36,7 @@ boundaryField
type totalTemperature;
value uniform 297;
T0 uniform 297;
U U;
U U;
phi phi;
rho none;
psi psi;
......
......@@ -44,7 +44,7 @@ boundaryField
type totalPressure;
value uniform 101325;
p0 uniform 101325;
U U;
U U;
phi phi;
rho none;
psi psi;
......
......@@ -49,7 +49,7 @@ patches
patch outlet
(
(1 3 7 1)
(1 3 7 1)
(3 5 9 7)
)
......@@ -63,20 +63,20 @@ patches
(4 8 9 5)
)
wedge wedge1
wedge wedge1
(
(0 2 3 1)
(2 4 5 3)
)
wedge wedge2
wedge wedge2
(
(0 1 7 6)
(6 7 9 8)
)
);
mergePatchPairs
mergePatchPairs
(
);
......
......@@ -27,8 +27,8 @@ boundaryField
inlet
{
type fixedValue;
value uniform 1000;
type fixedValue;
value uniform 1000;
}
outlet
......
......@@ -20,32 +20,32 @@ vertices
(
// front-plane: z = +25mm
// inlet region
( -50 25 25) // pt 0
( 0 25 25) // pt 1
( -50 75 25) // pt 2
( 0 75 25) // pt 3
( -50 25 25) // pt 0
( 0 25 25) // pt 1
( -50 75 25) // pt 2
( 0 75 25) // pt 3
// outlet region
( -500 -75 25) // pt 4
( 0 -75 25) // pt 5
( -500 -25 25) // pt 6
( 0 -25 25) // pt 7
( -500 -75 25) // pt 4
( 0 -75 25) // pt 5
( -500 -25 25) // pt 6
( 0 -25 25) // pt 7
// bend mid-points
( 25 0 25) // pt 8
( 75 0 25) // pt 9
( 25 0 25) // pt 8
( 75 0 25) // pt 9
// back-plane: z = -25mm
// inlet region
( -50 25 -25) // pt 0 + 10
( 0 25 -25) // pt 1 + 10
( -50 75 -25) // pt 2 + 10
( 0 75 -25) // pt 3 + 10
( -50 25 -25) // pt 0 + 10
( 0 25 -25) // pt 1 + 10
( -50 75 -25) // pt 2 + 10
( 0 75 -25) // pt 3 + 10
// outlet region
( -500 -75 -25) // pt 4 + 10
( 0 -75 -25) // pt 5 + 10
( -500 -25 -25) // pt 7 + 10
( 0 -25 -25) // pt 8 + 10
( -500 -75 -25) // pt 4 + 10
( 0 -75 -25) // pt 5 + 10
( -500 -25 -25) // pt 7 + 10
( 0 -25 -25) // pt 8 + 10
// bend mid-points
( 25 0 -25) // pt 8 + 10
( 75 0 -25) // pt 9 + 10
( 25 0 -25) // pt 8 + 10
( 75 0 -25) // pt 9 + 10
);
blocks
......
......@@ -18,39 +18,39 @@ convertToMeters 3.2e-9;
vertices
(
(0 0 0)
(3.5 0 0)
(3.5 3 0)
(0 3 0)
(0 0 3)
(3.5 0 3)
(3.5 3 3)
(0 3 3)
(7.5 1 0.5)
(7.5 2 0.5)
(7.5 1 2.5)
(7.5 2 2.5)
(10 1 0.5)
(10 2 0.5)
(10 1 2.5)
(10 2 2.5)
(11.5 0.5 -0.5)
(11.5 2.5 -0.5)
(11.5 0.5 3.5)
(11.5 2.5 3.5)
(16 0.5 -0.5)
(16 2.5 -0.5)
(16 0.5 3.5)
(16 2.5 3.5)
(0 0 0)
(3.5 0 0)
(3.5 3 0)
(0 3 0)
(0 0 3)
(3.5 0 3)
(3.5 3 3)
(0 3 3)
(7.5 1 0.5)
(7.5 2 0.5)
(7.5 1 2.5)
(7.5 2 2.5)
(10 1 0.5)
(10 2 0.5)
(10 1 2.5)
(10 2 2.5)
(11.5 0.5 -0.5)
(11.5 2.5 -0.5)
(11.5 0.5 3.5)
(11.5 2.5 3.5)
(16 0.5 -0.5)
(16 2.5 -0.5)
(16 0.5 3.5)
(16 2.5 3.5)
);
blocks
(
hex (0 1 2 3 4 5 6 7) sectionA (20 16 16) simpleGrading (1 1 1)
hex (0 1 2 3 4 5 6 7) sectionA (20 16 16) simpleGrading (1 1 1)
hex (1 8 9 2 5 10 11 6) sectionA (20 16 16) simpleGrading (1 1 1)
hex (8 12 13 9 10 14 15 11) sectionB (29 16 16) simpleGrading (1 1 1)
hex (12 16 17 13 14 18 19 15) sectionC (17 16 16) simpleGrading (1 1 1)
hex (16 20 21 17 18 22 23 19) sectionC (20 16 16) simpleGrading (1 1 1)
hex (8 12 13 9 10 14 15 11) sectionB (29 16 16) simpleGrading (1 1 1)
hex (12 16 17 13 14 18 19 15) sectionC (17 16 16) simpleGrading (1 1 1)
hex (16 20 21 17 18 22 23 19) sectionC (20 16 16) simpleGrading (1 1 1)
);
edges
......@@ -58,57 +58,57 @@ edges
patches
(
patch
sectionAEnd
(
(0 4 7 3)
)
patch
sectionAEnd
(
(0 4 7 3)
)
wall
sectionCEnd
(
(20 21 23 22)
)
wall
sectionCEnd
(
(20 21 23 22)
)
wall
front
(
(0 1 5 4)
(1 8 10 5)
(8 12 14 10)
(12 16 18 14)
(16 20 22 18)
)
wall
front
(
(0 1 5 4)
(1 8 10 5)
(8 12 14 10)
(12 16 18 14)
(16 20 22 18)
)
wall
back
(
(2 3 7 6)
(2 6 11 9)
(9 11 15 13)
(13 15 19 17)
(17 19 23 21)
)
wall
back
(
(2 3 7 6)
(2 6 11 9)
(9 11 15 13)
(13 15 19 17)
(17 19 23 21)
)
wall
top
(
(4 5 6 7)
(5 10 11 6)
(10 14 15 11)
(14 18 19 15)
(18 22 23 19)
)
wall
top
(
(4 5 6 7)
(5 10 11 6)
(10 14 15 11)
(14 18 19 15)
(18 22 23 19)
)
wall
bottom
(
(0 3 2 1)
(1 2 9 8)
(8 9 13 12)
(12 13 17 16)
(16 17 21 20)
)
wall
bottom
(
(0 3 2 1)
(1 2 9 8)
(8 9 13 12)
(12 13 17 16)
(16 17 21 20)
)
);
mergePatchPairs
......
......@@ -122,7 +122,7 @@ patches
wall ceiling
(
(33 37 36 32)
(34 38 37 33)
(34 38 37 33)
(35 39 38 34)
(37 41 40 36)
(38 42 41 37)
......
......@@ -122,7 +122,7 @@ patches
wall ceiling
(
(33 37 36 32)
(34 38 37 33)
(34 38 37 33)
(35 39 38 34)
(37 41 40 36)
(38 42 41 37)
......
......@@ -88,10 +88,11 @@ castellatedMeshControls
// actually be a lot less.
maxGlobalCells 2000000;
// The surface refinement loop might spend lots of iterations refining just a
// few cells. This setting will cause refinement to stop if <= minimumRefine
// are selected for refinement. Note: it will at least do one iteration
// (unless the number of cells to refine is 0)
// The surface refinement loop might spend lots of iterations
// refining just a few cells. This setting will cause refinement
// to stop if <= minimumRefine are selected for refinement. Note:
// it will at least do one iteration (unless the number of cells
// to refine is 0)
minRefinementCells 10;
// Number of buffer layers between different levels.
......@@ -128,7 +129,7 @@ castellatedMeshControls
// Surface-wise min and max refinement level
level (1 1);
faceZone bottomAir;
faceZone bottomAir;
cellZone bottomAir;
cellZoneInside inside;
}
......@@ -138,7 +139,7 @@ castellatedMeshControls
// Surface-wise min and max refinement level
level (1 1);
faceZone topAir;
faceZone topAir;
cellZone topAir;
cellZoneInside inside;
}
......@@ -148,7 +149,7 @@ castellatedMeshControls
// Surface-wise min and max refinement level
level (0 0);
faceZone heater;
faceZone heater;
cellZone heater;
cellZoneInside inside;
}
......@@ -158,7 +159,7 @@ castellatedMeshControls
// Surface-wise min and max refinement level
level (1 1);
faceZone leftSolid;
faceZone leftSolid;
cellZone leftSolid;
cellZoneInside inside;
}
......@@ -168,7 +169,7 @@ castellatedMeshControls
// Surface-wise min and max refinement level
level (1 1);
faceZone rightSolid;
faceZone rightSolid;
cellZone rightSolid;
cellZoneInside inside;
}
......@@ -250,15 +251,15 @@ addLayersControls
// Per final patch (so not geometry!) the layer information
layers
{
//flowAirDuctReagent_flowAirDuctReagent
//flowAirDuctReagent_flowAirDuctReagent
//{
// nSurfaceLayers 1;
//}
//flowAirDuctReagent_inlet1
//flowAirDuctReagent_inlet1
//{
// nSurfaceLayers 1;
//}
//flowAirDuctReagent_inlet2
//flowAirDuctReagent_inlet2
//{
// nSurfaceLayers 1;
//}
......