diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict index 93935af0252f366af3d1d12caf8719b394e5d836..946682c0dc4ad670b9a733b35d9d123f7bf26f96 100644 --- a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict +++ b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changeDictionaryDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { T @@ -61,7 +60,6 @@ dictionaryReplacement } } - K { internalField uniform 80; @@ -83,7 +81,6 @@ dictionaryReplacement } } - cp { internalField uniform 450; diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean index aeb3ee5b7be4287e65543bfa9614b70b919a52c6..113b86d8baa9b088c84a0946a8f0b11a2c29f2b2 100755 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean @@ -4,4 +4,7 @@ . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase -rm -r VTK +rm -rf VTK + +rm -rf constant/cellToRegion constant/polyMesh/sets + diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun index 3a79aca5a977e09e7ea2ba5e88d18a1a15462924..1e766717f63fbc14a3ebf2401b197a52063d27fe 100755 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -8,12 +8,24 @@ runApplication setSet -batch makeCellSets.setSet rm constant/polyMesh/sets/*_old runApplication setsToZones -noFlipMap runApplication splitMeshRegions -cellZones + changeDictionary -region bottomAir changeDictionary -region topAir changeDictionary -region heater changeDictionary -region leftSolid changeDictionary -region rightSolid -runApplication chtMultiRegionFoam +# remove fluid fields from solid regions (for post-processing only) +for i in heater leftSolid rightSolid +do + rm -f 0*/$i/{epsilon,k,p,pd,U} +done +# remove solid fields from fluid regions (for post-processing only) +for i in bottomAir topAir +do + rm -f 0*/$i/{cp,K} +done + +runApplication chtMultiRegionFoam diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties index 66160205bcd474745aac60abeb61f44633e1aca7..6b4cc41e7a84e17964ea8f308450c5a26a43b9b5 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object RASProperties; + version 2.0; + format ascii; + class dictionary; + object RASProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // RASModel kEpsilon; @@ -101,5 +93,4 @@ wallFunctionCoeffs E 9; } - // ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties index e9aee6c9b50caa4fae9f0025596b7894773d2cbb..03e0adce892c8e4fdd83c43484578d4bb486aca3 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties @@ -1,28 +1,19 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object environmentalProperties; + version 2.0; + format ascii; + class dictionary; + object environmentalProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // g g [0 1 -2 0 0 0 0] (0 -9.81 0); - // ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index ca90242d7d51bdd737438508ea0ae9d7cd54159f..7eb3ee5b9f430e1429510ce0cf7063914b1f4f41 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -1,30 +1,21 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object thermophysicalProperties; + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>; mixture air 1 28.9 1000 0 1.8e-05 0.7; - // ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict index a0733096f968daf7c78d2039ac1463ec193e82f7..5f292d4e4952c00603559a3b216503b01b78ff46 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict @@ -1,28 +1,19 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object blockMeshDict; + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - convertToMeters 1; vertices @@ -78,5 +69,4 @@ mergePatchPairs ( ); - // ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties index 6bff0e8cffe5d61b2b2f5fa957e507979b445753..bff96505ebefbae96c7c20ceac2628b60edea66b 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object regionProperties; + version 2.0; + format ascii; + class dictionary; + object regionProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // fluidRegionNames @@ -28,7 +20,6 @@ fluidRegionNames topAir ); - solidRegionNames ( heater diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties index a0307ea431e968ef30d1a62211fb57853841a610..9037f279053fe08eee8d5191bb8f984e287ff50e 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object RASProperties; + version 2.0; + format ascii; + class dictionary; + object RASProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // RASModel kEpsilon; @@ -102,5 +94,4 @@ wallFunctionCoeffs E 9; } - // ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict index 1a89c964f221850352d57988a93cc7ee605ff194..285f41a8438936f0aa4945a4d1dda19ed06a48c0 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changeDictionaryDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { U @@ -33,7 +32,6 @@ dictionaryReplacement value uniform (0 0 0); } - bottomAir_to_leftSolid { type fixedValue; @@ -53,8 +51,6 @@ dictionaryReplacement } } - - T { boundaryField @@ -94,7 +90,6 @@ dictionaryReplacement } } - epsilon { // Set the value on all bc to non-zero. Not used in simulation @@ -154,7 +149,6 @@ dictionaryReplacement } } - k { internalField uniform 0.1; @@ -211,7 +205,6 @@ dictionaryReplacement } } - pd { boundaryField @@ -259,7 +252,6 @@ dictionaryReplacement } } - p { internalField uniform 1000000; diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/changeDictionaryDict index 5c53b44a239928903ec866ddd08983be78f21144..56a984c7d79fe0905dadedba30cadee68ca322e6 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/changeDictionaryDict +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changeDictionaryDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { T @@ -115,7 +114,6 @@ dictionaryReplacement } } - K { internalField uniform 80; @@ -153,7 +151,6 @@ dictionaryReplacement } } - cp { internalField uniform 450; diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict index cab5c5b147b5c965375fda658d2eff2126b72fa1..c229aaa9a653e28b6dce29bf6196b94e3e70f1f8 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object controlDict; + version 2.0; + format ascii; + class dictionary; + object controlDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // application chtFoam; @@ -57,5 +49,4 @@ maxCo 0.3; adjustTimeStep yes; - // ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict index 1a50cc17b977a1b44dd3a5b3d612ee437df75cc9..b4226ef4844a0fdb5eb834a3a8907bb4cde64608 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changeDictionaryDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { T @@ -115,7 +114,6 @@ dictionaryReplacement } } - K { internalField uniform 80; @@ -153,7 +151,6 @@ dictionaryReplacement } } - cp { internalField uniform 450; diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict index a6fd49e467e61a16153a4c61cd32e576b477db80..86ac71c3cb0286947e32e15704e3a418dbd8d284 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changeDictionaryDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { T @@ -99,7 +98,6 @@ dictionaryReplacement } } - K { internalField uniform 80; @@ -133,7 +131,6 @@ dictionaryReplacement } } - cp { internalField uniform 450; diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict index 1ad8174abb7fc9e3f8eca31ad2536f3b77952a2a..b27b29bfcdc0de7ca1e8856defe9732399f1eca9 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changeDictionaryDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { T @@ -98,7 +97,6 @@ dictionaryReplacement } } - K { internalField uniform 80; @@ -132,7 +130,6 @@ dictionaryReplacement } } - cp { internalField uniform 450; diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict index c24aa9244d0a94d8844f76d2021592e21c85959e..058056571ae270fc3a3a9078f991c2748bc5803f 100644 --- a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changeDictionaryDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { U @@ -33,7 +32,6 @@ dictionaryReplacement inletValue uniform (0 0 0); } - topAir_to_leftSolid { type fixedValue; @@ -53,8 +51,6 @@ dictionaryReplacement } } - - T { boundaryField @@ -95,7 +91,6 @@ dictionaryReplacement } } - epsilon { // Set the value on all bc to non-zero. Not used in simulation @@ -152,7 +147,6 @@ dictionaryReplacement } } - k { internalField uniform 0.1; @@ -210,7 +204,6 @@ dictionaryReplacement } } - pd { boundaryField