From 04d2165a31d3128177575f09b91317187824ddec Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 31 May 2012 16:51:31 +0100 Subject: [PATCH] ENH: Updated injection models for lagrangian tutorials --- .../constant/reactingCloud1Properties | 80 +++++----- .../constant/coalCloud1Properties | 44 +++--- .../constant/limestoneCloud1Properties | 44 +++--- .../constant/kinematicCloudProperties | 3 +- .../constant/kinematicCloudProperties | 40 ++--- .../filter/constant/reactingCloud1Properties | 24 +-- .../constant/reactingCloud1Properties | 40 ++--- .../constant/reactingCloud1Properties | 82 ++++++----- .../constant/reactingCloud1Properties | 24 +-- .../constant/reactingCloud1Properties | 68 ++++----- .../constant/reactingCloud1Properties | 24 +-- .../constant/reactingCloud1Properties | 40 ++--- .../aachenBomb/constant/sprayCloudProperties | 138 +++++++++--------- 13 files changed, 338 insertions(+), 313 deletions(-) diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 8ee12eae98..98039b690f 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -94,7 +94,47 @@ subModels gravity; } - injectionModel patchInjection; + injectionModels + { + model1 + { + type patchInjection; + massFlowRate 0.8e-03; + parcelBasisType mass; + patchName inletCentral; + parcelsPerSecond 100; + duration 1; // NOTE: set to 1 for steady state + U0 (0 40 0); + flowRateProfile constant 1; + sizeDistribution + { + type general; + generalDistribution + { + distribution + ( + (10e-06 0.0025) + (15e-06 0.0528) + (20e-06 0.2795) + (25e-06 1.0918) + (30e-06 2.3988) + (35e-06 4.4227) + (40e-06 6.3888) + (45e-06 8.6721) + (50e-06 10.3153) + (55e-06 11.6259) + (60e-06 12.0030) + (65e-06 10.4175) + (70e-06 10.8427) + (75e-06 8.0016) + (80e-06 6.1333) + (85e-06 3.8827) + (90e-06 3.4688) + ); + } + } + } + } dispersionModel stochasticDispersionRAS; @@ -114,44 +154,6 @@ subModels radiation off; - patchInjectionCoeffs - { - massFlowRate 0.8e-03; - parcelBasisType mass; - patchName inletCentral; - parcelsPerSecond 100; - duration 1; // NOTE: set to 1 for steady state - U0 (0 40 0); - flowRateProfile constant 1; - sizeDistribution - { - type general; - generalDistribution - { - distribution - ( - (10e-06 0.0025) - (15e-06 0.0528) - (20e-06 0.2795) - (25e-06 1.0918) - (30e-06 2.3988) - (35e-06 4.4227) - (40e-06 6.3888) - (45e-06 8.6721) - (50e-06 10.3153) - (55e-06 11.6259) - (60e-06 12.0030) - (65e-06 10.4175) - (70e-06 10.8427) - (75e-06 8.0016) - (80e-06 6.1333) - (85e-06 3.8827) - (90e-06 3.4688) - ); - } - } - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 60fa4fb298..c3e9c114a2 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -87,7 +87,29 @@ subModels gravity; } - injectionModel manualInjection; + injectionModels + { + model1 + { + type manualInjection; + massTotal 0.0001; + parcelBasisType mass; + SOI 0; + positionsFile "coalCloud1Positions"; + U0 ( 0 -10 0 ); + sizeDistribution + { + type RosinRammler; + RosinRammlerDistribution + { + minValue 5e-06; + maxValue 0.0005; + d 5e-05; + n 0.5; + } + } + } + } dispersionModel stochasticDispersionRAS; @@ -107,26 +129,6 @@ subModels radiation on; - manualInjectionCoeffs - { - massTotal 0.0001; - parcelBasisType mass; - SOI 0; - positionsFile "coalCloud1Positions"; - U0 ( 0 -10 0 ); - sizeDistribution - { - type RosinRammler; - RosinRammlerDistribution - { - minValue 5e-06; - maxValue 0.0005; - d 5e-05; - n 0.5; - } - } - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index e35910a540..66502bae46 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -77,7 +77,29 @@ subModels gravity; } - injectionModel manualInjection; + injectionModels + { + model1 + { + type manualInjection; + massTotal 0.0001; + parcelBasisType mass; + SOI 0; + positionsFile "limestonePositions"; + U0 ( 0 0 0 ); + sizeDistribution + { + type RosinRammler; + RosinRammlerDistribution + { + minValue 5e-06; + maxValue 0.000565; + d 4.8e-05; + n 0.5; + } + } + } + } dispersionModel stochasticDispersionRAS; @@ -89,26 +111,6 @@ subModels radiation on; - manualInjectionCoeffs - { - massTotal 0.0001; - parcelBasisType mass; - SOI 0; - positionsFile "limestonePositions"; - U0 ( 0 0 0 ); - sizeDistribution - { - type RosinRammler; - RosinRammlerDistribution - { - minValue 5e-06; - maxValue 0.000565; - d 4.8e-05; - n 0.5; - } - } - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties index d8f358df2e..3ea1510347 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties @@ -66,7 +66,8 @@ subModels gravity; } - injectionModel none; + injectionModels + {} dispersionModel none; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties index a30c3ae534..fac715eceb 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties @@ -57,7 +57,27 @@ subModels gravity; } - injectionModel manualInjection; + injectionModels + { + model1 + { + type manualInjection; + massTotal 0; + parcelBasisType fixed; + nParticle 1; + SOI 0; + positionsFile "kinematicCloudPositions"; + U0 ( 0 0 0 ); + sizeDistribution + { + type fixedValue; + fixedValueDistribution + { + value 0.006; + } + } + } + } dispersionModel none; @@ -71,24 +91,6 @@ subModels radiation off; - manualInjectionCoeffs - { - massTotal 0; - parcelBasisType fixed; - nParticle 1; - SOI 0; - positionsFile "kinematicCloudPositions"; - U0 ( 0 0 0 ); - sizeDistribution - { - type fixedValue; - fixedValueDistribution - { - value 0.006; - } - } - } - pairCollisionCoeffs { // Maximum possible particle diameter expected at any time diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index 4823654b9a..42e93e5524 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -88,7 +88,19 @@ subModels gravity; } - injectionModel reactingMultiphaseLookupTableInjection; + injectionModels + { + model1 + { + type reactingMultiphaseLookupTableInjection; + massTotal 1e-2; + parcelBasisType mass; + SOI 0.5; + inputFile "parcelInjectionProperties"; + duration 1.0; + parcelsPerSecond 250; + } + } dispersionModel none; @@ -108,16 +120,6 @@ subModels radiation off; - reactingMultiphaseLookupTableInjectionCoeffs - { - massTotal 1e-2; - parcelBasisType mass; - SOI 0.5; - inputFile "parcelInjectionProperties"; - duration 1.0; - parcelsPerSecond 250; - } - localInteractionCoeffs { patches diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 7356b7134d..a0443a38c4 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -88,7 +88,27 @@ subModels gravity; } - injectionModel manualInjection; + injectionModels + { + model1 + { + type manualInjection; + massTotal 5.23599e-10; // 1 droplet of density 1000 kg/m3 + parcelBasisType mass; + SOI 0; + positionsFile "reactingCloud1Positions"; + U0 (0 0 0); + sizeDistribution + { + type uniform; + uniformDistribution + { + minValue 100e-06; + maxValue 100e-06; + } + } + } + } dispersionModel none; @@ -108,24 +128,6 @@ subModels radiation off; - manualInjectionCoeffs - { - massTotal 5.23599e-10; // 1 droplet of density 1000 kg/m3 - parcelBasisType mass; - SOI 0; - positionsFile "reactingCloud1Positions"; - U0 (0 0 0); - sizeDistribution - { - type uniform; - uniformDistribution - { - minValue 100e-06; - maxValue 100e-06; - } - } - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index aea506a90d..12ccfdf77e 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -88,7 +88,48 @@ subModels gravity; } - injectionModel patchInjection; + injectionModels + { + model1 + { + type patchInjection; + SOI 0.01; + massTotal 8; + parcelBasisType mass; + patchName inletCentral; + duration 10000; + parcelsPerSecond 1e5; + U0 (40 0 0); + flowRateProfile constant 1; + sizeDistribution + { + type general; + generalDistribution + { + distribution + ( + (10e-06 0.0025) + (15e-06 0.0528) + (20e-06 0.2795) + (25e-06 1.0918) + (30e-06 2.3988) + (35e-06 4.4227) + (40e-06 6.3888) + (45e-06 8.6721) + (50e-06 10.3153) + (55e-06 11.6259) + (60e-06 12.0030) + (65e-06 10.4175) + (70e-06 10.8427) + (75e-06 8.0016) + (80e-06 6.1333) + (85e-06 3.8827) + (90e-06 3.4688) + ); + } + } + } + } dispersionModel stochasticDispersionRAS; @@ -108,45 +149,6 @@ subModels radiation off; - patchInjectionCoeffs - { - SOI 0.01; - massTotal 8; - parcelBasisType mass; - patchName inletCentral; - duration 10000; - parcelsPerSecond 1e5; - U0 (40 0 0); - flowRateProfile constant 1; - sizeDistribution - { - type general; - generalDistribution - { - distribution - ( - (10e-06 0.0025) - (15e-06 0.0528) - (20e-06 0.2795) - (25e-06 1.0918) - (30e-06 2.3988) - (35e-06 4.4227) - (40e-06 6.3888) - (45e-06 8.6721) - (50e-06 10.3153) - (55e-06 11.6259) - (60e-06 12.0030) - (65e-06 10.4175) - (70e-06 10.8427) - (75e-06 8.0016) - (80e-06 6.1333) - (85e-06 3.8827) - (90e-06 3.4688) - ); - } - } - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties index 36786661bf..d1816d7c8f 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties @@ -83,7 +83,19 @@ subModels gravity; } - injectionModel reactingLookupTableInjection; + injectionModels + { + model1 + { + type reactingLookupTableInjection; + massTotal 0.5; + parcelBasisType mass; + SOI 0; + inputFile "parcelInjectionProperties"; + duration 20.0; + parcelsPerSecond 50; + } + } dispersionModel none; @@ -99,16 +111,6 @@ subModels radiation off; - reactingLookupTableInjectionCoeffs - { - massTotal 0.5; - parcelBasisType mass; - SOI 0; - inputFile "parcelInjectionProperties"; - duration 20.0; - parcelsPerSecond 50; - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index f3167d9cc0..650b98eb90 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -83,7 +83,41 @@ subModels gravity; } - injectionModel coneInjection; + injectionModels + { + model1 + { + type coneInjection; + SOI 0.000; + duration 20.000; + positionAxis + ( + ((0.3 0.35 1.45) (0 0 -1)) + ((0.6 0.35 1.45) (0 0 -1)) + ); + + massTotal 10; + parcelsPerInjector 20000; + parcelsPerSecond 500; + parcelBasisType mass; + flowRateProfile constant 0.1; + Umag constant 3.0; + thetaInner constant 0; + thetaOuter constant 45; + + sizeDistribution + { + type RosinRammler; + RosinRammlerDistribution + { + minValue 5e-04; + maxValue 0.0012; + d 7.5e-05; + n 0.5; + } + } + } + } dispersionModel none; @@ -99,38 +133,6 @@ subModels radiation off; - coneInjectionCoeffs - { - SOI 0.000; - duration 20.000; - positionAxis - ( - ((0.3 0.35 1.45) (0 0 -1)) - ((0.6 0.35 1.45) (0 0 -1)) - ); - - massTotal 10; - parcelsPerInjector 20000; - parcelsPerSecond 500; - parcelBasisType mass; - flowRateProfile constant 0.1; - Umag constant 3.0; - thetaInner constant 0; - thetaOuter constant 45; - - sizeDistribution - { - type RosinRammler; - RosinRammlerDistribution - { - minValue 5e-04; - maxValue 0.0012; - d 7.5e-05; - n 0.5; - } - } - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties index 82f2589640..563f28cd91 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties @@ -83,7 +83,19 @@ subModels gravity; } - injectionModel reactingLookupTableInjection; + injectionModels + { + model1 + { + type reactingLookupTableInjection; + massTotal 0.1; + parcelBasisType mass; + SOI 0.01; + inputFile "parcelInjectionProperties"; + duration 10.0; + parcelsPerSecond 200; + } + ] dispersionModel none; @@ -99,16 +111,6 @@ subModels radiation off; - reactingLookupTableInjectionCoeffs - { - massTotal 0.1; - parcelBasisType mass; - SOI 0.01; - inputFile "parcelInjectionProperties"; - duration 10.0; - parcelsPerSecond 200; - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index c5ea248073..cd5ca97831 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -85,7 +85,27 @@ subModels gravity; } - injectionModel manualInjection; + injectionModels + { + model1 + { + type manualInjection; + massTotal 1e-8; + parcelBasisType mass; + SOI 0; + positionsFile "reactingCloud1Positions"; + U0 ( 0 0 0 ); + sizeDistribution + { + type uniform; + uniformDistribution + { + minValue 1e-04; + maxValue 1e-04; + } + } + } + } dispersionModel none; @@ -101,24 +121,6 @@ subModels radiation off; - manualInjectionCoeffs - { - massTotal 1e-8; - parcelBasisType mass; - SOI 0; - positionsFile "reactingCloud1Positions"; - U0 ( 0 0 0 ); - sizeDistribution - { - type uniform; - uniformDistribution - { - minValue 1e-04; - maxValue 1e-04; - } - } - } - standardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties index 27e6772ec8..45b43244a6 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties @@ -84,7 +84,76 @@ subModels sphereDrag; } - injectionModel coneNozzleInjection; + injectionModels + { + model1 + { + type coneNozzleInjection; + SOI 0; + massTotal 6.0e-6; + parcelBasisType mass; + injectionMethod disc; + flowType flowRateAndDischarge; + outerDiameter 1.9e-4; + innerDiameter 0; + duration 1.25e-3; + position ( 0 0.0995 0 ); + direction ( 0 -1 0 ); + parcelsPerSecond 20000000; + flowRateProfile table + ( + (0 0.1272) + (4.16667e-05 6.1634) + (8.33333e-05 9.4778) + (0.000125 9.5806) + (0.000166667 9.4184) + (0.000208333 9.0926) + (0.00025 8.7011) + (0.000291667 8.2239) + (0.000333333 8.0401) + (0.000375 8.845) + (0.000416667 8.9174) + (0.000458333 8.8688) + (0.0005 8.8882) + (0.000541667 8.6923) + (0.000583333 8.0014) + (0.000625 7.2582) + (0.000666667 7.2757) + (0.000708333 6.968) + (0.00075 6.7608) + (0.000791667 6.6502) + (0.000833333 6.7695) + (0.000875 5.5774) + (0.000916667 4.8649) + (0.000958333 5.0805) + (0.001 4.9547) + (0.00104167 4.5613) + (0.00108333 4.4536) + (0.001125 5.2651) + (0.00116667 5.256) + (0.00120833 5.1737) + (0.00125 3.9213) + ); + + Cd constant 0.9; + + thetaInner constant 0.0; + thetaOuter constant 10.0; + + sizeDistribution + { + type RosinRammler; + + RosinRammlerDistribution + { + minValue 1e-06; + maxValue 0.00015; + d 0.00015; + n 3; + } + } + } + } dispersionModel none; @@ -106,73 +175,6 @@ subModels radiation off; - coneNozzleInjectionCoeffs - { - SOI 0; - massTotal 6.0e-6; - parcelBasisType mass; - injectionMethod disc; - flowType flowRateAndDischarge; - outerDiameter 1.9e-4; - innerDiameter 0; - duration 1.25e-3; - position ( 0 0.0995 0 ); - direction ( 0 -1 0 ); - parcelsPerSecond 20000000; - flowRateProfile table - ( - (0 0.1272) - (4.16667e-05 6.1634) - (8.33333e-05 9.4778) - (0.000125 9.5806) - (0.000166667 9.4184) - (0.000208333 9.0926) - (0.00025 8.7011) - (0.000291667 8.2239) - (0.000333333 8.0401) - (0.000375 8.845) - (0.000416667 8.9174) - (0.000458333 8.8688) - (0.0005 8.8882) - (0.000541667 8.6923) - (0.000583333 8.0014) - (0.000625 7.2582) - (0.000666667 7.2757) - (0.000708333 6.968) - (0.00075 6.7608) - (0.000791667 6.6502) - (0.000833333 6.7695) - (0.000875 5.5774) - (0.000916667 4.8649) - (0.000958333 5.0805) - (0.001 4.9547) - (0.00104167 4.5613) - (0.00108333 4.4536) - (0.001125 5.2651) - (0.00116667 5.256) - (0.00120833 5.1737) - (0.00125 3.9213) - ); - - Cd constant 0.9; - - thetaInner constant 0.0; - thetaOuter constant 10.0; - - sizeDistribution - { - type RosinRammler; - - RosinRammlerDistribution - { - minValue 1e-06; - maxValue 0.00015; - d 0.00015; - n 3; - } - } - } - standardWallInteractionCoeffs { type rebound;