diff --git a/tutorials/basic/laplacianFoam/multiWorld/Allclean b/tutorials/basic/laplacianFoam/multiWorld/Allclean index de5a16cd10109f63b054aca43fea7a08e8be41cc..d9d9ef5636ac7f1d370da7542466843621e63711 100755 --- a/tutorials/basic/laplacianFoam/multiWorld/Allclean +++ b/tutorials/basic/laplacianFoam/multiWorld/Allclean @@ -3,8 +3,12 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -(cd left && cleanCase0) -(cd right && cleanCase0) -\rm -f log.* +for subcase in left right +do +( + cd "$subcase" && cleanCase0 +) +done +rm -f log.* #------------------------------------------------------------------------------ diff --git a/tutorials/basic/laplacianFoam/multiWorld/Allrun b/tutorials/basic/laplacianFoam/multiWorld/Allrun index d8f2be032e6d0358d7c334232e42dbccad982a96..9a4b6cef7fa830ebb4d24cf388615ff8ec82cdd7 100755 --- a/tutorials/basic/laplacianFoam/multiWorld/Allrun +++ b/tutorials/basic/laplacianFoam/multiWorld/Allrun @@ -4,25 +4,40 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ # Run serial -(cd left && runApplication blockMesh && \cp -r 0.orig 0) -(cd right && runApplication blockMesh && \cp -r 0.orig 0) +for subcase in left right +do +( + cd "$subcase" || exit + runApplication blockMesh && restore0Dir +) +done + mpirun -app ./mpirun_left_right.schema # Run with database \mv log.run_left log.run_left_direct \mv log.run_right log.run_right_direct -(cd left && foamListTimes -rm && \rm -r 0 && \cp -r 0.orig 0 && foamDictionary 0/T -entry boundaryField.coupled.sampleDatabase -add true) -(cd right && foamListTimes -rm && \rm -r 0 && \cp -r 0.orig 0 && foamDictionary 0/T -entry boundaryField.coupled.sampleDatabase -add true) -mpirun -app ./mpirun_left_right.schema +for subcase in left right +do +( + cd "$subcase" || exit + foamListTimes -rm + restore0Dir + foamDictionary 0/T -entry boundaryField.coupled.sampleDatabase -add true +) +done +mpirun -app ./mpirun_left_right.schema ## Run parallel -#(cd left && runApplication blockMesh) -#(cd left && runApplication decomposePar) -#(cd right && runApplication blockMesh) -#(cd right && runApplication decomposePar) -# -#mpirun -app ./mpirun.schema +## for subcase in left right +## do +## ( +## cd "$subcase" || exit +## runApplication blockMesh && runApplication decomposePar +## ) +## done +## mpirun -app ./mpirun.schema #------------------------------------------------------------------------------ diff --git a/tutorials/basic/laplacianFoam/multiWorld/mpirun.schema b/tutorials/basic/laplacianFoam/multiWorld/mpirun.schema index faa5932bdb1a1537ebfc82afb7961e18b1c478c6..cc3c3af9f1c56337363e136847e987d70bcc4a7a 100644 --- a/tutorials/basic/laplacianFoam/multiWorld/mpirun.schema +++ b/tutorials/basic/laplacianFoam/multiWorld/mpirun.schema @@ -1,7 +1,2 @@ --np 2 laplacianFoam -case ./left -world LEFT -parallel --np 2 laplacianFoam -case ./right -world RIGHT -parallel - -#-np 1 xterm -font fixed -title processor0 -geometry 200x15+0+0 -e /home/mattijs/OpenFOAM/OpenFOAM-plus.feature-localWorld/applications/test/multiWorld/processor0.sh -#-np 1 xterm -font fixed -title processor1 -geometry 200x15+0+200 -e /home/mattijs/OpenFOAM/OpenFOAM-plus.feature-localWorld/applications/test/multiWorld/processor1.sh -#-np 1 xterm -font fixed -title processor2 -geometry 200x15+0+400 -e /home/mattijs/OpenFOAM/OpenFOAM-plus.feature-localWorld/applications/test/multiWorld/processor2.sh -#-np 1 xterm -font fixed -title processor3 -geometry 200x15+0+600 -e /home/mattijs/OpenFOAM/OpenFOAM-plus.feature-localWorld/applications/test/multiWorld/processor3.sh +-np 2 laplacianFoam -case left -world LEFT -parallel +-np 2 laplacianFoam -case right -world RIGHT -parallel diff --git a/tutorials/basic/laplacianFoam/multiWorld/mpirun_left_right.schema b/tutorials/basic/laplacianFoam/multiWorld/mpirun_left_right.schema index c811e563f4f04da6ef1b0562f296f9492c554a78..a3246667da651812a43035010a6729cd0678c867 100644 --- a/tutorials/basic/laplacianFoam/multiWorld/mpirun_left_right.schema +++ b/tutorials/basic/laplacianFoam/multiWorld/mpirun_left_right.schema @@ -1,2 +1,2 @@ --np 1 xterm -font fixed -title processor0 -geometry 200x15+0+0 -e ./run_left.sh --np 1 xterm -font fixed -title processor1 -geometry 200x15+0+200 -e ./run_right.sh +-np 1 ./run_left.sh +-np 1 ./run_right.sh diff --git a/tutorials/basic/laplacianFoam/multiWorld/run_left.sh b/tutorials/basic/laplacianFoam/multiWorld/run_left.sh index ff10c97611e3c720fb8d95764225f89e184cf628..d0e6bc68da37c7192ff7cb2633dea9a85eb7c6d4 100755 --- a/tutorials/basic/laplacianFoam/multiWorld/run_left.sh +++ b/tutorials/basic/laplacianFoam/multiWorld/run_left.sh @@ -1,3 +1,3 @@ #!/bin/bash -laplacianFoam -case ./left -world LEFT 2>&1 | tee log.run_left +laplacianFoam -case left -world LEFT 2>&1 | tee log.run_left read dummy diff --git a/tutorials/basic/laplacianFoam/multiWorld/run_right.sh b/tutorials/basic/laplacianFoam/multiWorld/run_right.sh index 529bea06fbaed8fae2e9f708d9eb68a3616b8a64..4177518422fd2c190acc6530d3cb49919f68a328 100755 --- a/tutorials/basic/laplacianFoam/multiWorld/run_right.sh +++ b/tutorials/basic/laplacianFoam/multiWorld/run_right.sh @@ -1,3 +1,3 @@ #!/bin/bash -laplacianFoam -case ./right -world RIGHT 2>&1 | tee log.run_right +laplacianFoam -case right -world RIGHT 2>&1 | tee log.run_right read dummy