diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/G b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/G similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/G rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/G diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/IDefault b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/IDefault similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/IDefault rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/IDefault diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/T similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/T diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/U b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/U similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/U rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/U diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/alphat similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/alphat rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/alphat diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/epsilon similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/epsilon rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/epsilon diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/k b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/k similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/k rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/k diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/nut b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/nut similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/nut rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/nut diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/p b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/p rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p_rgh similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/p_rgh rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p_rgh diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/qr b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/qr similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/qr rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/qr diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/T similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/T diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/p b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/p similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/p rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/p diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/T similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/T diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/p b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/p similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/p rename to tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/p diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean index 77d28a7dac..bd637e1bf9 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean @@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase +rm -rf 0 rm -rf VTK rm -rf constant/cellToRegion diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun-parallel new file mode 100755 index 0000000000..5ebe90f21e --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun-parallel @@ -0,0 +1,41 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory + +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Setup case +./Allrun.pre + +#-- Run in parallel + +# Decompose +runApplication decomposePar -allRegions -constant + +# Agglomerate patch faces +for i in air +do + runParallel -s $i -np 4 \ + faceAgglomerate -region $i -dict constant/viewFactorsDict +done + +# Generate view factors +for i in air +do + runParallel -s $i -np 4 viewFactorsGen -region $i +done + +# set the initial fields +restore0Dir + +runParallel $(getApplication) + +# Reconstruct +runApplication reconstructPar -allRegions + +echo +echo "creating files for paraview post-processing" +echo +paraFoam -touchAll + +# ----------------------------------------------------------------------------- diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre index 78752106d3..ad4135ab5c 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre @@ -19,6 +19,9 @@ do rm -f 0*/$i/{rho,mut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault} done +# set the initial fields +restore0Dir + for i in air solid floor do runApplication -s $i changeDictionary -region $i -subDict dictionaryReplacement diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/decomposeParDict index 414b630824..1bdeb6b7ad 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/decomposeParDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/decomposeParDict @@ -19,9 +19,6 @@ FoamFile numberOfSubdomains 4; -//- Keep owner and neighbour on same processor for faces in zones: -// preserveFaceZones (heater solid1 solid3); - method scotch;