From 97ac66ad9e02352464e6bcbd4acad8b1641f2b48 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 18 Oct 2012 17:31:11 +0100
Subject: [PATCH] ENH: Updated porosity-based tutorials
---
.../angledDuct/constant/porosityProperties} | 24 ++++++------
.../angledDuct/constant/porosityProperties} | 23 +++++------
.../angledDuct/constant/porosityProperties} | 23 +++++------
.../constant/porosityProperties} | 23 +++++------
.../mixerVessel2D/constant/porousZones | 36 ------------------
.../{porousZones => porosityProperties} | 36 +++++++++---------
.../angledDuctImplicit/constant/porousZones | 36 ------------------
.../filter/constant/porosityProperties} | 27 +++++++------
.../parcelInBox/constant/porousZones | 38 -------------------
.../verticalChannel/constant/porousZones | 38 -------------------
10 files changed, 83 insertions(+), 221 deletions(-)
rename tutorials/compressible/{rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porousZones => rhoPimpleFoam/ras/angledDuct/constant/porosityProperties} (78%)
rename tutorials/compressible/{rhoPimpleFoam/ras/angledDuct/constant/porousZones => rhoPimplecFoam/angledDuct/constant/porosityProperties} (78%)
rename tutorials/compressible/{rhoPimplecFoam/angledDuct/constant/porousZones => rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porosityProperties} (78%)
rename tutorials/{lagrangian/reactingParcelFoam/filter/constant/porousZones => compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porosityProperties} (78%)
delete mode 100644 tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones
rename tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/{porousZones => porosityProperties} (70%)
delete mode 100644 tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones
rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel/constant/porousZones => reactingParcelFoam/filter/constant/porosityProperties} (86%)
delete mode 100644 tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/porousZones
delete mode 100644 tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/porousZones
diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porousZones b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porosityProperties
similarity index 78%
rename from tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porousZones
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porosityProperties
index afeb6461e13..650f01268ca 100644
--- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porousZones
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porosityProperties
@@ -11,26 +11,28 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object porousZones;
+ object porosityProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-1
-(
- porosity
+porosity1
+{
+ type DarcyForchheimer;
+ active yes;
+ cellZone porosity;
+
+ DarcyForchheimerCoeffs
{
+ d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
+ f f [0 -1 0 0 0 0 0] (0 0 0);
+
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
-
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
}
-)
+}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porosityProperties
similarity index 78%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones
rename to tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porosityProperties
index afeb6461e13..22add8ff299 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porosityProperties
@@ -11,26 +11,27 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object porousZones;
+ object porosityProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-1
-(
- porosity
+porosity1
+{
+ type DarcyForchheimer;
+ active yes;
+ cellZone porosity;
+
+ DarcyForchheimerCoeffs
{
+ d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
+ f f [0 -1 0 0 0 0 0] (0 0 0);
+
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
-
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
}
-)
+}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porousZones b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porosityProperties
similarity index 78%
rename from tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porousZones
rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porosityProperties
index afeb6461e13..22add8ff299 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porousZones
+++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porosityProperties
@@ -11,26 +11,27 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object porousZones;
+ object porosityProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-1
-(
- porosity
+porosity1
+{
+ type DarcyForchheimer;
+ active yes;
+ cellZone porosity;
+
+ DarcyForchheimerCoeffs
{
+ d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
+ f f [0 -1 0 0 0 0 0] (0 0 0);
+
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
-
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
}
-)
+}
// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/porousZones b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porosityProperties
similarity index 78%
rename from tutorials/lagrangian/reactingParcelFoam/filter/constant/porousZones
rename to tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porosityProperties
index 32d3aca74f0..1a76ef1d80b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/porousZones
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porosityProperties
@@ -11,26 +11,27 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object porousZones;
+ object porosityProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-(
- filter // name of cell zone
+porosity1
+{
+ type DarcyForchheimer;
+ active yes;
+ cellZone stator;
+
+ DarcyForchheimerCoeffs
{
+ d d [0 -2 0 0 0 0 0] (1e5 -1000 -1000);
+ f f [0 -1 0 0 0 0 0] (0 0 0);
+
coordinateSystem
{
e1 (1 0 0);
e2 (0 1 0);
}
-
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
}
-)
-
+}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones
deleted file mode 100644
index 11a47989c7f..00000000000
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object porousZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
- stator
- {
- coordinateSystem
- {
- e1 (1 0 0);
- e2 (0 1 0);
- }
-
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (1e5 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
- }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porosityProperties
similarity index 70%
rename from tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones
rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porosityProperties
index fe113542025..fe001b7bea3 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porosityProperties
@@ -11,34 +11,36 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object porousZones;
+ object porosityProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-1
-(
- porosity
+porosity1
+{
+ type DarcyForchheimer;
+ active yes;
+ cellZone porosity;
+
+ DarcyForchheimerCoeffs
{
+ d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
+ f f [0 -1 0 0 0 0 0] (0 0 0);
+
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
+ }
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
-
- thermalModel
- {
- type none; // fixedTemperature;
+ thermalModel
+ {
+ type none; // fixedTemperature;
- // fixedTemperature coefficients
- T 350;
- }
+ // fixedTemperature coefficients
+ T 350;
}
-)
+}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones
deleted file mode 100644
index afeb6461e13..00000000000
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object porousZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
- porosity
- {
- coordinateSystem
- {
- e1 (0.70710678 0.70710678 0);
- e2 (0 0 1);
- }
-
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
- }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/porousZones b/tutorials/lagrangian/reactingParcelFoam/filter/constant/porosityProperties
similarity index 86%
rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/porousZones
rename to tutorials/lagrangian/reactingParcelFoam/filter/constant/porosityProperties
index d3de954c172..fcd5c5d3f17 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/porousZones
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/porosityProperties
@@ -11,28 +11,31 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object porousZones;
+ object porosityProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-(
-/*
- porousRegion // name of cell zone
- {
- coordinateSystem
- {
- e1 (1 0 0);
- e2 (0 1 0);
- }
+filter1
+{
+ cellZone filter;
+ active true;
+ type DarcyForchheimer;
+ DarcyForchheimerCoeffs
+ {
Darcy
{
d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
}
+
+ coordinateSystem
+ {
+ e1 (1 0 0);
+ e2 (0 1 0);
+ }
}
-*/
-);
+}
// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/porousZones b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/porousZones
deleted file mode 100644
index d3de954c172..00000000000
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/porousZones
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object porousZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-/*
- porousRegion // name of cell zone
- {
- coordinateSystem
- {
- e1 (1 0 0);
- e2 (0 1 0);
- }
-
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
- }
-*/
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/porousZones b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/porousZones
deleted file mode 100644
index d3de954c172..00000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/porousZones
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object porousZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-/*
- porousRegion // name of cell zone
- {
- coordinateSystem
- {
- e1 (1 0 0);
- e2 (0 1 0);
- }
-
- Darcy
- {
- d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
- f f [0 -1 0 0 0 0 0] (0 0 0);
- }
- }
-*/
-);
-
-
-// ************************************************************************* //
--
GitLab