From e1462229c08a4a1be8861967ab0cf18d96bd217b Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 10 Jan 2012 15:47:47 +0000
Subject: [PATCH] ENH: Changing chtMultiRegionFoam tutorial entries
---
.../lagrangian/LTSReactingParcelFoam/Make/options | 9 +++++++--
.../chtMultiRegionFoam/multiRegionHeater/Allrun | 10 +++++-----
.../multiRegionHeater/constant/regionProperties | 10 +++++++---
.../multiRegionLiquidHeater/constant/regionProperties | 10 +++++++---
.../snappyMultiRegionHeater/constant/regionProperties | 9 +++++++--
.../multiRegionHeater/constant/regionProperties | 10 +++++++---
.../constant/regionProperties | 10 +++++++---
7 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
index 30c3b5d6a15..bfe0fa7d39c 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
@@ -20,7 +20,10 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
- -I$(LIB_SRC)/combustionModels/lnInclude
+ -I$(LIB_SRC)/combustionModels/lnInclude \
+ -I$(LIB_SRC)/fieldSources/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude
+
EXE_LIBS = \
-lfiniteVolume \
@@ -44,4 +47,6 @@ EXE_LIBS = \
-lODE \
-lregionModels \
-lsurfaceFilmModels \
- -lcombustionModels
+ -lcombustionModels \
+ -lfieldSources \
+ -lsampling
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index a63bfce6ab2..b9137a48fa2 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -37,13 +37,13 @@ do
done
# Run
-runParallel `getApplication` 4
+#runParallel `getApplication` 4
# Reconstruct
-for i in bottomAir topAir heater leftSolid rightSolid
-do
- reconstructPar -region $i > log.reconstructPar.$i2 >&1
-done
+#for i in bottomAir topAir heater leftSolid rightSolid
+#do
+# reconstructPar -region $i > log.reconstructPar.$i2 >&1
+#done
echo
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
index 67629a878b2..dc0d1417d50 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
@@ -15,8 +15,12 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluidRegionNames ( bottomAir topAir );
-
-solidRegionNames ( heater leftSolid rightSolid );
+regions
+(
+ fluid (bottomAir topAir)
+ solid (heater leftSolid rightSolid)
+ porousFluid ()
+ porousSolid ()
+);
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/regionProperties
index 138248c73f4..d76684c2cdd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/regionProperties
@@ -15,8 +15,12 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluidRegionNames ( bottomWater topAir );
-
-solidRegionNames ( heater leftSolid rightSolid );
+regions
+(
+ fluid (bottomWater topAir)
+ solid (heater leftSolid rightSolid)
+ porousFluid ()
+ porousSolid ()
+);
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
index 67629a878b2..9ca5dc857c3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
@@ -15,8 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluidRegionNames ( bottomAir topAir );
+regions
+(
+ fluid (bottomAir topAir)
+ solid (heater leftSolid rightSolid)
+ porousFluid ()
+ porousSolid ()
+);
-solidRegionNames ( heater leftSolid rightSolid );
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/regionProperties
index 67629a878b2..dc0d1417d50 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/regionProperties
@@ -15,8 +15,12 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluidRegionNames ( bottomAir topAir );
-
-solidRegionNames ( heater leftSolid rightSolid );
+regions
+(
+ fluid (bottomAir topAir)
+ solid (heater leftSolid rightSolid)
+ porousFluid ()
+ porousSolid ()
+);
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
index 67629a878b2..dc0d1417d50 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
@@ -15,8 +15,12 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluidRegionNames ( bottomAir topAir );
-
-solidRegionNames ( heater leftSolid rightSolid );
+regions
+(
+ fluid (bottomAir topAir)
+ solid (heater leftSolid rightSolid)
+ porousFluid ()
+ porousSolid ()
+);
// ************************************************************************* //
--
GitLab