diff --git a/src/functionObjects/field/Curle/Curle.H b/src/functionObjects/field/Curle/Curle.H index 1050440769..19afa8e3de 100644 --- a/src/functionObjects/field/Curle/Curle.H +++ b/src/functionObjects/field/Curle/Curle.H @@ -75,17 +75,17 @@ Usage c0 330; - // Input - either points or surface + // Input - either point or surface - input points; + input point; observerPositions ((0 0 0)(1 0 0)); //input surface; //surface "inputSurface.obj" - // Output - either points or surface - output points; + // Output - either point or surface + output point; //output surface; //surfaceType ensight; diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allclean b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allclean index e570da4052..76eef79d95 100755 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allclean +++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allclean @@ -3,12 +3,9 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots +rm -f setups.orig/common/constant/transportProperties #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allrun b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allrun index 1f717cf4bc..1102221105 100755 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allrun +++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allrun @@ -1,10 +1,9 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -# setups +# settings # operand setups setups=" @@ -12,6 +11,18 @@ cd "${0%/*}" || exit # Run from this directory LaunderSharmaKE-nutkWallFunction " + # flag to enable computations + run=true + + # flag to enable computations in parallel mode + parallel=false + + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=true + # operand exponents of kinematic viscosity values nuExponents="2 3 4 5 6 7 8" @@ -19,107 +30,163 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ ####################################### -# Collect results into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + exponent="$2" + dirSetup="setups/$setup/$exponent" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + printf "\n# Create the setup: %s %s\n" "$setup" nu=1e-"$exponent" + + if [ ! -d "$dirSetup" ] + then + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" + else + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" + fi +} + + +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + exponent="$2" + dirSetup="setups/$setup/$exponent" + dirResult="results/$setup/$exponent" + + dry_run_setup "$setup" "$exponent" + [ -d results ] || mkdir -p results + [ -d results/"$setup" ] || mkdir -p results/"$setup" + + printf "\n# Run the setup: %s %s\n\n" "$setup" nu=1e-"$exponent" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" - mkdir -p "$dirSettings" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - mv -f log.* "$dirResult" - mv -f graphs/ "$dirResult" - mv -f logs/ "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" - echo " # Cleaning up the case" + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi + + + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] && [ -d "$dirResult"/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi - } #------------------------------------------------------------------------------ -for setup in $setups -do - - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - if [ ! -d constant/polyMesh ] - then - runApplication blockMesh - runApplication renumberMesh -overwrite -constant - runApplication checkMesh -allTopology -allGeometry -constant - fi - - echo "# yPlus vs uPlus" > yPlus_vs_uPlus.xy - - for exponent in $nuExponents - do - - echo " Setting nu to 1e-$exponent" - - sed "s|EXPONENT|$exponent|g" constant/transportProperties.template \ - > constant/transportProperties - - [ -d 0 ] || restore0Dir - - runApplication $(getApplication) - - runApplication foamLog log.boundaryFoam - - if [ -e logs/yPlus_0 ] - then - yPlus=$(awk < logs/yPlus_0 'END{print $2}') - uPlus=$(awk < logs/uPlus_0 'END{print $2}') - - echo "$yPlus $uPlus" >> yPlus_vs_uPlus.xy - fi - - collect "$setup/$exponent" - - done - - mv -f yPlus_vs_uPlus.xy results/"$setup"/ - -done +[ "$parallel" = true ] && { + echo "boundaryFoam has no parallel option - skipping the execution" 1>&2 + exit 1 +} + + +#------------------------------------------------------------------------------ + +for exponent in $nuExponents +do + sed "s|EXPONENT|$exponent|g" \ + setups.orig/common/constant/transportProperties.template > \ + setups.orig/common/constant/transportProperties + + for setup in $setups + do + dirSetupOrig="setups.orig/$setup" + + if [ ! -d "$dirSetupOrig" ] + then + echo "Setup directory: $dirSetupOrig" \ + "could not be found - skipping execution" 1>&2 + continue + fi + + if [ "$run" = true ] + then + run_setup "$setup" "$exponent" + else + dry_run_setup "$setup" "$exponent" + fi + done +done + + +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/README b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/README index c1a521bfa8..a2adecc75d 100644 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/README +++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/README @@ -10,4 +10,4 @@ Usage: - run test using Allrun script - uses foamLog to generate u+ and y+ values -- postscript (.eps) plot generated using gnuplot, OF_vs_ANALYTICAL.eps +- plots are generated using gnuplot, and can be found under plots directory diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/plot b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/plot index 36cbbbcccf..5421eb9765 100755 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/plot +++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/plot @@ -72,16 +72,19 @@ command -v gnuplot >/dev/null || { for setup in $setups do - echo "" echo "# Plots for the setup: $setup" echo "" + [ -d "results/$setup" ] || { + echo "No results/$setup directory found - skipping graph creation" 1>&2 + continue + } + dirPlots="plots/$setup" [ -d "$dirPlots" ] || mkdir -p "$dirPlots" plot_yPlus_vs_uPlus "$setup" - done diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/U b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/epsilon b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/epsilon deleted file mode 120000 index 7cd846dcde..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/epsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/epsilon \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/k b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/constant/transportProperties.template b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/constant/transportProperties.template deleted file mode 120000 index 9d7b7132c6..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/constant/transportProperties.template +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties.template \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/system b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allclean b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allrun b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allrun new file mode 100755 index 0000000000..e7969986fe --- /dev/null +++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allrun @@ -0,0 +1,20 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + +runApplication foamLog log.boundaryFoam + +if [ -e logs/yPlus_0 ] +then + yPlus=$(awk < logs/yPlus_0 'END{print $2}') + uPlus=$(awk < logs/uPlus_0 'END{print $2}') + + echo "$yPlus $uPlus" >> ../yPlus_vs_uPlus.xy +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allrun.pre b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..c3b64e9de4 --- /dev/null +++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/Allrun.pre @@ -0,0 +1,19 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +canCompile || exit 0 # Dynamic code + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/foamLog.db b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/foamLog.db similarity index 100% rename from tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/foamLog.db rename to tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/foamLog.db diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/U b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/epsilon b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/epsilon deleted file mode 120000 index 7cd846dcde..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/epsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/epsilon \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/k b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/constant/transportProperties.template b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/constant/transportProperties.template deleted file mode 120000 index 9d7b7132c6..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/constant/transportProperties.template +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties.template \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/system b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean index ac2d4992a7..8cad09279c 100755 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean @@ -3,14 +3,9 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots -rm -f *.dat ( cd validation/WatersKing && wclean WatersKing ) diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun index 56d4e6e234..1b5f2c8214 100755 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun @@ -1,10 +1,9 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -# setups +# settings # operand setups setups=" @@ -12,124 +11,161 @@ cd "${0%/*}" || exit # Run from this directory Stokes " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=true + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=true + #------------------------------------------------------------------------------ ####################################### -# Collect results into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + printf "\n# Create the setup: %s\n" "$setup" - if [ ! -d "$dirResult" ] + if [ ! -d "$dirSetup" ] then + mkdir -p "$dirSetup" - echo " # Collecting results and settings into $dirResult" - - mkdir -p "$dirResult" - mkdir -p "$dirSettings" - - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" - - echo " # Cleaning up the case" - - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing - + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" fi - } -#------------------------------------------------------------------------------ +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { -if ! canCompile -then - echo "skipping tutorial $PWD" - exit 0 -fi + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" + + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" + + if [ ! -d "$dirResult" ] + then + cp -Rf "$dirSetup" "$dirResult" + + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi + + + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi + + + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] && [ -d "$dirResult"/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi + + + else + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" + fi +} #------------------------------------------------------------------------------ for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - if [ ! -d constant/polyMesh ] + if [ ! -d "$dirSetupOrig" ] then - - runApplication blockMesh - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh -allTopology -allGeometry -constant + echo "Setup directory: $dirSetupOrig" \ + "could not be found - skipping execution" 1>&2 + continue fi - if [ "$parallel" = true ] + if [ "$run" = true ] then - - runApplication decomposePar - - runParallel $(getApplication) - - runApplication reconstructPar - + run_setup "$setup" else - - runApplication $(getApplication) - + dry_run_setup "$setup" fi - - if notTest "$@" - then - # postprocessing - tail -n +4 postProcessing/probes/0/U | \ - tr -s " " | tr -d '(' | cut -d " " -f2-3 > \ - postProcessing/probes/0/Unp - fi - - collect "$setup" - done -( cd validation/WatersKing && wmake ) -runApplication WatersKing +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/plot b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/plot index 751039a4af..3c8c6e9f37 100755 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/plot +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/plot @@ -12,37 +12,21 @@ cd "${0%/*}" || exit # Run from this directory " -#------------------------------------------------------------------------------ - -# Requires gnuplot -command -v gnuplot >/dev/null || { - echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2 - exit 1 -} - -# Check "results" directory -[ -d "results" ] || { - echo "FOAM FATAL ERROR: No results directory found - skipping graph creation" 1>&2 - exit 1 -} - - #------------------------------------------------------------------------------ plot_t_vs_Ux() { setups=$@ - benchmarkFile="WatersKing.dat" - n=0 for setup in $setups do + benchmarkFile="results/$setup/WatersKing.dat" sampleFiles[$n]="results/$setup/postProcessing/probes/0/Unp" n=$(($n+1)) done - endTime=$(foamDictionary system/controlDict -entry endTime -value) + endTime=$(foamDictionary results/$setup/system/controlDict -entry endTime -value) image="plots/planarPoiseuille.png" gnuplot</dev/null || { + echo "gnuplot not found - skipping graph creation" 1>&2 + exit 1 +} + +# Check "results" directory +[ -d "results" ] || { + echo "No results directory found - skipping graph creation" 1>&2 + exit 1 +} + + #------------------------------------------------------------------------------ echo "" diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/0.orig b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/0.orig deleted file mode 120000 index 5bba4e2330..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig/ \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/fvOptions b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/fvOptions deleted file mode 120000 index 344e07ee88..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/fvOptions +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/fvOptions \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/system b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/0.orig b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/0.orig deleted file mode 120000 index 5bba4e2330..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig/ \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/fvOptions b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/fvOptions deleted file mode 120000 index 344e07ee88..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/fvOptions +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/fvOptions \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/system b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allclean b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun new file mode 100755 index 0000000000..10da2922d2 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun @@ -0,0 +1,22 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + + +if notTest "$@" +then + # postprocessing + tail -n +4 postProcessing/probes/0/U | \ + tr -s " " | tr -d '(' | cut -d " " -f2-3 > \ + postProcessing/probes/0/Unp + + ( cd ../../validation/WatersKing && wmake ) + runApplication WatersKing +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun-parallel b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..5fee366ee1 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun-parallel @@ -0,0 +1,26 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar + + +if notTest "$@" +then + # postprocessing + tail -n +4 postProcessing/probes/0/U | \ + tr -s " " | tr -d '(' | cut -d " " -f2-3 > \ + postProcessing/probes/0/Unp + + ( cd ../../validation/WatersKing && wmake ) + runApplication WatersKing +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun.pre b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..c3b64e9de4 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/Allrun.pre @@ -0,0 +1,19 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +canCompile || exit 0 # Dynamic code + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda index 2f5a7c6ad6..fa37d646c0 100644 --- a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda +++ b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda @@ -16,20 +16,20 @@ FoamFile dimensions [0 2 -1 0 0 0 0]; -internalField uniform 0.14; +internalField uniform 4e-05; boundaryField { inlet { type freestream; - freestreamValue uniform 0.14; + freestreamValue $internalField; } outlet { type freestream; - freestreamValue uniform 0.14; + freestreamValue $internalField; } walls diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut index 0fab48d085..cd93bbfc8f 100644 --- a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut +++ b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut @@ -16,20 +16,20 @@ FoamFile dimensions [0 2 -1 0 0 0 0]; -internalField uniform 0.14; +internalField uniform 1e-05; boundaryField { inlet { type freestream; - freestreamValue uniform 0.14; + freestreamValue $internalField; } outlet { type freestream; - freestreamValue uniform 0.14; + freestreamValue $internalField; } walls diff --git a/tutorials/incompressible/simpleFoam/bump2D/Allclean b/tutorials/incompressible/simpleFoam/bump2D/Allclean index c97c0ecce8..2206c5fd7d 100755 --- a/tutorials/incompressible/simpleFoam/bump2D/Allclean +++ b/tutorials/incompressible/simpleFoam/bump2D/Allclean @@ -3,8 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf *.png +rm -rf setups +rm -rf results +rm -rf plots #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/bump2D/Allrun b/tutorials/incompressible/simpleFoam/bump2D/Allrun index f029e428cd..83031bc26b 100755 --- a/tutorials/incompressible/simpleFoam/bump2D/Allrun +++ b/tutorials/incompressible/simpleFoam/bump2D/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings @@ -13,106 +12,132 @@ cd "${0%/*}" || exit # Run from this directory kEpsilonPhitF " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=true + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=true + #------------------------------------------------------------------------------ ####################################### -# Extract a value (Eg, from boundaryField/bump/value) +# Create the given setup # Arguments: -# $1 = dictEntry -# $2 = inputFile -# $3 = outputFile +# $1 = Path to create the setup # Outputs: -# Writes to 'outputFile' -# Notes: -# Only retains values between, but not including the ( ) delimiters. -# For example, -#---- -# value nonuniform List -# 110 -# ( -# 0.0041520092 -# 0.012577691 -# 0.021250264 -# 0.030176962 -# ) -# ; +# Writes info to stdout ####################################### -extractVal() -{ - if [ -f "$2" ] +dry_run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" + + printf "\n# Create the setup: %s\n" "$setup" + + if [ ! -d "$dirSetup" ] then - foamDictionary -entry "$1" -value "$2" | \ - sed -n '/(/,/)/{ s/[()]//g; /^ *$/d; p}' \ - > "$3" + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" else - # Or some other tag? - echo "Not such file: $2" 1>&2 - echo "0" > "$3" + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" fi } ####################################### -# Collect results into a given path -# and clean the case for the next run +# Run the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to the setup to run # Outputs: # Writes info to stdout ####################################### -collect() { +run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" - mkdir -p "$dirSettings" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - endTime=$(foamListTimes -latestTime) - # Create datasets for benchmark comparisons - extractVal boundaryField.bump.value "$endTime/Cx" Cx.$$ - extractVal boundaryField.bump.value "$endTime/wallShearStress" tau.$$ - extractVal boundaryField.bump.value "$endTime/Cp" cp.$$ + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi - echo "# ccx tau_xx tau_yy tau_zz cp" > profiles.dat - paste -d ' ' Cx.$$ tau.$$ cp.$$ >> profiles.dat - rm -f Cx.$$ tau.$$ cp.$$ - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - mv -f profiles.dat "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi - echo " # Cleaning up the case" + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] && [ -d "$dirResult"/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi - } @@ -120,58 +145,28 @@ collect() { for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - canCompile || exit 0 # Dynamic code - - if [ ! -d constant/polyMesh ] + if [ "$run" = true ] then - - runApplication blockMesh - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh -allTopology -allGeometry -constant - - fi - - if [ "$parallel" = true ] - then - - runApplication decomposePar - - runParallel -s parallel renumberMesh -overwrite - - runParallel $(getApplication) - - runApplication reconstructPar - + run_setup "$setup" else - - runApplication $(getApplication) - + dry_run_setup "$setup" fi - - collect "$setup" - done +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi + + #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/bump2D/plot b/tutorials/incompressible/simpleFoam/bump2D/plot index d5ddbcaad7..6c58ddc274 100755 --- a/tutorials/incompressible/simpleFoam/bump2D/plot +++ b/tutorials/incompressible/simpleFoam/bump2D/plot @@ -122,44 +122,39 @@ PLT_X_CP # Requires gnuplot command -v gnuplot >/dev/null || { - echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2 + echo "gnuplot not found - skipping graph creation" 1>&2 exit 1 } # Requires awk command -v awk >/dev/null || { - echo "FOAM FATAL ERROR: awk not found - skipping graph creation" 1>&2 + echo "awk not found - skipping graph creation" 1>&2 exit 1 } # Check "results" directory [ -d "results" ] || { - echo "FOAM FATAL ERROR: No results directory found - skipping graph creation" 1>&2 + echo "No results directory found - skipping graph creation" 1>&2 exit 1 } #------------------------------------------------------------------------------ -if notTest "$@" -then +dirPlots="plots" +[ -d "$dirPlots" ] || mkdir -p "$dirPlots" - dirPlots="plots/$setup" - [ -d "$dirPlots" ] || mkdir -p "$dirPlots" +echo "" +echo "# Plots for the skin friction coefficient" +echo "" - echo "" - echo "# Plots for the skin friction coefficient" - echo "" +plot_x_vs_Cf "$Uref" $setups - plot_x_vs_Cf "$Uref" $setups +echo "" +echo "# Plots for the pressure coefficient" +echo "" - echo "" - echo "# Plots for the pressure coefficient" - echo "" - - plot_x_vs_Cp "$Uref" $setups - -fi +plot_x_vs_Cp "$Uref" $setups # ------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/U b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/nut b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/p b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/p deleted file mode 120000 index d1e1225671..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/p +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/constant/transportProperties b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/system b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allclean b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun new file mode 100755 index 0000000000..5780d778c8 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun @@ -0,0 +1,61 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +####################################### +# Extract a value (Eg, from boundaryField/bump/value) +# Arguments: +# $1 = dictEntry +# $2 = inputFile +# $3 = outputFile +# Outputs: +# Writes to 'outputFile' +# Notes: +# Only retains values between, but not including the ( ) delimiters. +# For example, +#---- +# value nonuniform List +# 110 +# ( +# 0.0041520092 +# 0.012577691 +# 0.021250264 +# 0.030176962 +# ) +# ; +####################################### +extractVal() +{ + if [ -f "$2" ] + then + foamDictionary -entry "$1" -value "$2" | \ + sed -n '/(/,/)/{ s/[()]//g; /^ *$/d; p}' \ + > "$3" + else + # Or some other tag? + echo "Not such file: $2" 1>&2 + echo "0" > "$3" + fi +} + + +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + + +endTime=$(foamListTimes -latestTime) + +# Create datasets for benchmark comparisons +extractVal boundaryField.bump.value "$endTime/Cx" Cx.$$ +extractVal boundaryField.bump.value "$endTime/wallShearStress" tau.$$ +extractVal boundaryField.bump.value "$endTime/Cp" cp.$$ + +echo "# ccx tau_xx tau_yy tau_zz cp" > profiles.dat +paste -d ' ' Cx.$$ tau.$$ cp.$$ >> profiles.dat +rm -f Cx.$$ tau.$$ cp.$$ + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun-parallel b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..fa82bfb11b --- /dev/null +++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun-parallel @@ -0,0 +1,65 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +####################################### +# Extract a value (Eg, from boundaryField/bump/value) +# Arguments: +# $1 = dictEntry +# $2 = inputFile +# $3 = outputFile +# Outputs: +# Writes to 'outputFile' +# Notes: +# Only retains values between, but not including the ( ) delimiters. +# For example, +#---- +# value nonuniform List +# 110 +# ( +# 0.0041520092 +# 0.012577691 +# 0.021250264 +# 0.030176962 +# ) +# ; +####################################### +extractVal() +{ + if [ -f "$2" ] + then + foamDictionary -entry "$1" -value "$2" | \ + sed -n '/(/,/)/{ s/[()]//g; /^ *$/d; p}' \ + > "$3" + else + # Or some other tag? + echo "Not such file: $2" 1>&2 + echo "0" > "$3" + fi +} + + +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar + + +endTime=$(foamListTimes -latestTime) + +# Create datasets for benchmark comparisons +extractVal boundaryField.bump.value "$endTime/Cx" Cx.$$ +extractVal boundaryField.bump.value "$endTime/wallShearStress" tau.$$ +extractVal boundaryField.bump.value "$endTime/Cp" cp.$$ + +echo "# ccx tau_xx tau_yy tau_zz cp" > profiles.dat +paste -d ' ' Cx.$$ tau.$$ cp.$$ >> profiles.dat +rm -f Cx.$$ tau.$$ cp.$$ + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun.pre b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..c3b64e9de4 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/Allrun.pre @@ -0,0 +1,19 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +canCompile || exit 0 # Dynamic code + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/U b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/nut b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/p b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/p deleted file mode 120000 index d1e1225671..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/p +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/constant/transportProperties b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/system b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/U b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/nut b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/p b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/p deleted file mode 120000 index d1e1225671..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/p +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/constant/transportProperties b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/system b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/system deleted file mode 120000 index 86c0ebd6e7..0000000000 --- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/system +++ /dev/null @@ -1 +0,0 @@ -../common/system \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean index 3da0f0943d..0deb8647e9 100755 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean @@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots rm -f setups.orig/common/system/blockMeshDict diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun index 63241fbd8a..2467e39b35 100755 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings @@ -12,9 +11,18 @@ cd "${0%/*}" || exit # Run from this directory kEpsilon " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=true + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=true + # operand setups for the wall-normal height of the first-cell centre declare -A grading_vs_yp #level 5 gradings @@ -40,99 +48,119 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ ####################################### -# Extract a value (Eg, from boundaryField/bump/value) +# Create the given setup # Arguments: -# $1 = dictEntry -# $2 = inputFile -# $3 = outputFile +# $1 = Path to create the setup # Outputs: -# Writes to 'outputFile' -# Notes: -# Only retains values between, but not including the ( ) delimiters. -# For example, -#---- -# value nonuniform List -# 110 -# ( -# 0.0041520092 -# 0.012577691 -# 0.021250264 -# 0.030176962 -# ) -# ; +# Writes info to stdout ####################################### -extractVal() -{ - if [ -f "$2" ] +dry_run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + yp="$2" + dirSetup="setups/$setup/$yp" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" + + printf "\n# Create the setup: %s %s\n" "$setup" yPlus-"$yp" + + if [ ! -d "$dirSetup" ] then - foamDictionary -entry "$1" -value "$2" | \ - sed -n '/(/,/)/{ s/[()]//g; /^ *$/d; p}' \ - > "$3" + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" else - # Or some other tag? - echo "Not such file: $2" 1>&2 - echo "0" > "$3" + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" fi } ####################################### -# Collect results into a given path -# and clean the case for the next run +# Run the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to the setup to run # Outputs: # Writes info to stdout ####################################### -collect() { +run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + yp="$2" + dirSetup="setups/$setup/$yp" + dirResult="results/$setup/$yp" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + dry_run_setup "$setup" "$yp" + [ -d results ] || mkdir -p results + [ -d results/"$setup" ] || mkdir -p results/"$setup" + + printf "\n# Run the setup: %s %s\n\n" "$setup" yPlus-"$yp" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" - mkdir -p "$dirSettings" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - endTime=$(foamListTimes -latestTime) - # Create datasets for benchmark comparisons - extractVal boundaryField.bottomWall.value "$endTime/Cx" Cx.$$ - extractVal boundaryField.bottomWall.value "$endTime/wallShearStress" tau.$$ - extractVal boundaryField.bottomWall.value "$endTime/yPlus" yPlus.$$ + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi - echo "# ccx tau_xx tau_yy tau_zz y+" > profiles.dat - paste -d ' ' Cx.$$ tau.$$ yPlus.$$ >> profiles.dat - rm -f Cx.$$ tau.$$ yPlus.$$ - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - mv -f profiles.dat "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi - echo " # Cleaning up the case" + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] && [ -d "$dirResult"/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi - } @@ -140,7 +168,6 @@ collect() { for i in "${!grading_vs_yp[@]}" do - yp=$i grading=${grading_vs_yp[$yp]} @@ -150,60 +177,31 @@ do for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup and y+: $setup - $yp" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - if [ ! -d constant/polyMesh ] + if [ "$run" = true ] then - - runApplication blockMesh - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh -allTopology -allGeometry -constant - - fi - - if [ "$parallel" = true ] - then - - runApplication decomposePar - - runParallel $(getApplication) - - runApplication reconstructPar - + run_setup "$setup" "$yp" else - - runApplication $(getApplication) - + dry_run_setup "$setup" "$yp" fi - - collect "$setup/$yp" - done - rm -rf 0.orig - rm -rf constant - rm -rf system - + rm -Rf results/mesh done -#----------------------------------------------------------------------------- +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi + + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/plot b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/plot index f7e920f93b..2e8867d134 100755 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/plot +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/plot @@ -63,7 +63,7 @@ plot_Rex_vs_Cf() { plot \ weighardt(x) t "Weighardt" w lines lc "red" lw 2, \ - samples u (\$1 - X0)*Uref/nu:(sqrt(\$2*\$2 + \$3*\$3 + \$4*\$4)/(0.5*Uref*Uref)) \ + samples u (\$1 - x0)*Uref/nu:(sqrt(\$2*\$2 + \$3*\$3 + \$4*\$4)/(0.5*Uref*Uref)) \ t "$setup y^+ ${yp}" w l lc "black" lw 2 PLT_REX_VS_CF } @@ -73,19 +73,19 @@ PLT_REX_VS_CF # Requires gnuplot command -v gnuplot >/dev/null || { - echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2 + echo "gnuplot not found - skipping graph creation" 1>&2 exit 1 } # Requires awk command -v awk >/dev/null || { - echo "FOAM FATAL ERROR: awk not found - skipping graph creation" 1>&2 + echo "awk not found - skipping graph creation" 1>&2 exit 1 } # Check "results" directory [ -d "results" ] || { - echo "FOAM FATAL ERROR: No results directory found - skipping graph creation" 1>&2 + echo "No results directory found - skipping graph creation" 1>&2 exit 1 } @@ -94,26 +94,26 @@ command -v awk >/dev/null || { for setup in $setups do - for yp in $yps do - echo "" echo "# Plots for the setup and y+: $setup - $yp" echo "" - dirPlots="plots/$setup/$yp" + resultsDir="results/$setup/$yp" + [ -d "$resultsDir" ] || { + echo "No $resultsDir directory found - skipping graph creation" 1>&2 + continue + } + + dirPlots="plots/$setup" [ -d "$dirPlots" ] || mkdir -p "$dirPlots" - # few manipulations - resultsDir="results/$setup/$yp" Uref=$(foamDictionary $resultsDir/0/U -entry internalField | sed 's/^.*(\s*\([^ ]*\).*/\1/g') - nu=$(foamDictionary $resultsDir/settings/transportProperties -entry nu | sed 's|^.*\s\(.*\);|\1|g') + nu=$(foamDictionary $resultsDir/constant/transportProperties -entry nu | sed 's|^.*\s\(.*\);|\1|g') plot_Rex_vs_Cf "$setup" "$yp" "$Uref" "$nu" - done - done diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allclean b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun new file mode 100755 index 0000000000..ccc577625b --- /dev/null +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun @@ -0,0 +1,61 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +####################################### +# Extract a value (Eg, from boundaryField/bump/value) +# Arguments: +# $1 = dictEntry +# $2 = inputFile +# $3 = outputFile +# Outputs: +# Writes to 'outputFile' +# Notes: +# Only retains values between, but not including the ( ) delimiters. +# For example, +#---- +# value nonuniform List +# 110 +# ( +# 0.0041520092 +# 0.012577691 +# 0.021250264 +# 0.030176962 +# ) +# ; +####################################### +extractVal() +{ + if [ -f "$2" ] + then + foamDictionary -entry "$1" -value "$2" | \ + sed -n '/(/,/)/{ s/[()]//g; /^ *$/d; p}' \ + > "$3" + else + # Or some other tag? + echo "Not such file: $2" 1>&2 + echo "0" > "$3" + fi +} + + +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + + +endTime=$(foamListTimes -latestTime) + +# Create datasets for benchmark comparisons +extractVal boundaryField.bottomWall.value "$endTime/Cx" Cx.$$ +extractVal boundaryField.bottomWall.value "$endTime/wallShearStress" tau.$$ +extractVal boundaryField.bottomWall.value "$endTime/yPlus" yPlus.$$ + +echo "# ccx tau_xx tau_yy tau_zz y+" > profiles.dat +paste -d ' ' Cx.$$ tau.$$ yPlus.$$ >> profiles.dat +rm -f Cx.$$ tau.$$ yPlus.$$ + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun-parallel b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..940e1690d7 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun-parallel @@ -0,0 +1,65 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +####################################### +# Extract a value (Eg, from boundaryField/bump/value) +# Arguments: +# $1 = dictEntry +# $2 = inputFile +# $3 = outputFile +# Outputs: +# Writes to 'outputFile' +# Notes: +# Only retains values between, but not including the ( ) delimiters. +# For example, +#---- +# value nonuniform List +# 110 +# ( +# 0.0041520092 +# 0.012577691 +# 0.021250264 +# 0.030176962 +# ) +# ; +####################################### +extractVal() +{ + if [ -f "$2" ] + then + foamDictionary -entry "$1" -value "$2" | \ + sed -n '/(/,/)/{ s/[()]//g; /^ *$/d; p}' \ + > "$3" + else + # Or some other tag? + echo "Not such file: $2" 1>&2 + echo "0" > "$3" + fi +} + + +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar + + +endTime=$(foamListTimes -latestTime) + +# Create datasets for benchmark comparisons +extractVal boundaryField.bottomWall.value "$endTime/Cx" Cx.$$ +extractVal boundaryField.bottomWall.value "$endTime/wallShearStress" tau.$$ +extractVal boundaryField.bottomWall.value "$endTime/yPlus" yPlus.$$ + +echo "# ccx tau_xx tau_yy tau_zz y+" > profiles.dat +paste -d ' ' Cx.$$ tau.$$ yPlus.$$ >> profiles.dat +rm -f Cx.$$ tau.$$ yPlus.$$ + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun.pre b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..c3b64e9de4 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/Allrun.pre @@ -0,0 +1,19 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +canCompile || exit 0 # Dynamic code + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/U b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/p b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/p deleted file mode 120000 index d1e1225671..0000000000 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/p +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/constant/transportProperties b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/system b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/U b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/p b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/p deleted file mode 120000 index d1e1225671..0000000000 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/p +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/constant/transportProperties b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/system b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allclean b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allclean index e570da4052..2206c5fd7d 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allclean +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allclean @@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allrun index a2318c3574..6c5dda54ea 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allrun +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings @@ -12,54 +11,131 @@ cd "${0%/*}" || exit # Run from this directory kOmegaSST " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=true + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=false + #------------------------------------------------------------------------------ + ####################################### -# Collect results into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + printf "\n# Create the setup: %s\n" "$setup" + + if [ ! -d "$dirSetup" ] + then + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" + else + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" + fi +} + + +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" + + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" - mkdir -p "$dirSettings" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" - echo " # Cleaning up the case" + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi + + + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] && [ -d "$dirResult"/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi } @@ -68,54 +144,28 @@ collect() { for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - if [ ! -d constant/polyMesh ] + if [ "$run" = true ] then - - runApplication blockMesh - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh -allTopology -allGeometry -constant - - fi - - if [ "$parallel" = true ] - then - - runApplication decomposePar - - runParallel $(getApplication) - - runApplication reconstructPar - + run_setup "$setup" else - - runApplication $(getApplication) - + dry_run_setup "$setup" fi - - collect "$setup" - done +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi + + #------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/plot b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/plot index 9bd265ba0b..b27704976e 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/plot +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/plot @@ -31,7 +31,7 @@ plot_ux_vs_znorm_upstream() { endTime="$1" zMin="$2" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-HargreavesWright-2007/Ux-HW-RH-Fig6a" + benchmarkFile="resources/dataset/Ux-HW-RH-Fig6a" sampleFile="results/$setup/postProcessing/samples_u/$endTime" image="plots/$setup/ux_vs_znorm_upstream.png" @@ -72,7 +72,7 @@ plot_ux_vs_znorm_middle() { endTime="$1" zMin="$2" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-HargreavesWright-2007/Ux-HW-RH-Fig6a" + benchmarkFile="resources/dataset/Ux-HW-RH-Fig6a" sampleFile="results/$setup/postProcessing/samples_u/$endTime" image="plots/$setup/ux_vs_znorm_middle.png" @@ -113,7 +113,7 @@ plot_ux_vs_znorm_downstream() { endTime="$1" zMin="$2" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-HargreavesWright-2007/Ux-HW-RH-Fig6a" + benchmarkFile="resources/dataset/Ux-HW-RH-Fig6a" sampleFile="results/$setup/postProcessing/samples_u/$endTime" image="plots/$setup/ux_vs_znorm_downstream.png" @@ -154,7 +154,7 @@ plot_k_vs_znorm() { endTime="$1" zMin="$2" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-HargreavesWright-2007" + benchmarkFile="resources/dataset" sampleFile="results/$setup/postProcessing/samples_k/$endTime" image="plots/$setup/k_vs_znorm.png" @@ -205,7 +205,7 @@ plot_epsilon_vs_znorm() { endTime="$1" zMin="$2" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-HargreavesWright-2007/epsilon-HW-RH-Fig6c" + benchmarkFile="resources/dataset/epsilon-HW-RH-Fig6c" sampleFile="results/$setup/postProcessing/samples_epsilon/$endTime" image="plots/$setup/epsilon_vs_znorm.png" @@ -299,7 +299,7 @@ plot_nut_vs_znorm() { endTime="$1" zMin="$2" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-HargreavesWright-2007/" + benchmarkFile="resources/dataset" sampleFile="results/$setup/postProcessing/samples_nut/$endTime" image="plots/$setup/nut_vs_znorm.png" @@ -361,16 +361,20 @@ command -v gnuplot >/dev/null || { for setup in $setups do - echo "" echo "# Plots for the setup: $setup" echo "" + [ -d "results/$setup" ] || { + echo "No results/$setup directory found - skipping graph creation" 1>&2 + continue + } + dirPlots="plots/$setup" [ -d "$dirPlots" ] || mkdir -p "$dirPlots" endTime=$( \ - foamDictionary results/$setup/settings/controlDict \ + foamDictionary results/$setup/system/controlDict \ -disableFunctionEntries -entry endTime -value \ ) @@ -383,32 +387,23 @@ do if [ -d "results/$setup/postProcessing/samples_k" ] then - plot_k_vs_znorm "$endTime" "$zMin" - fi if [ -d "results/$setup/postProcessing/samples_epsilon" ] then - plot_epsilon_vs_znorm "$endTime" "$zMin" - fi if [ -d "results/$setup/postProcessing/samples_omega" ] then - plot_omega_vs_znorm "$endTime" "$zMin" - fi if [ -d "results/$setup/postProcessing/samples_nut" ] then - plot_nut_vs_znorm "$endTime" "$zMin" - fi - done diff --git a/tutorials/resources/dataset/atm-HargreavesWright-2007/Ux-HW-RH-Fig6a b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/Ux-HW-RH-Fig6a similarity index 100% rename from tutorials/resources/dataset/atm-HargreavesWright-2007/Ux-HW-RH-Fig6a rename to tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/Ux-HW-RH-Fig6a diff --git a/tutorials/resources/dataset/atm-HargreavesWright-2007/epsilon-HW-RH-Fig6c b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/epsilon-HW-RH-Fig6c similarity index 100% rename from tutorials/resources/dataset/atm-HargreavesWright-2007/epsilon-HW-RH-Fig6c rename to tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/epsilon-HW-RH-Fig6c diff --git a/tutorials/resources/dataset/atm-HargreavesWright-2007/k-HW-Fig6b-2500 b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/k-HW-Fig6b-2500 similarity index 100% rename from tutorials/resources/dataset/atm-HargreavesWright-2007/k-HW-Fig6b-2500 rename to tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/k-HW-Fig6b-2500 diff --git a/tutorials/resources/dataset/atm-HargreavesWright-2007/k-HW-Fig6b-4000 b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/k-HW-Fig6b-4000 similarity index 100% rename from tutorials/resources/dataset/atm-HargreavesWright-2007/k-HW-Fig6b-4000 rename to tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/k-HW-Fig6b-4000 diff --git a/tutorials/resources/dataset/atm-HargreavesWright-2007/k-RH-Fig6b b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/k-RH-Fig6b similarity index 100% rename from tutorials/resources/dataset/atm-HargreavesWright-2007/k-RH-Fig6b rename to tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/k-RH-Fig6b diff --git a/tutorials/resources/dataset/atm-HargreavesWright-2007/mut-HW-Fig6d-2500 b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/mut-HW-Fig6d-2500 similarity index 100% rename from tutorials/resources/dataset/atm-HargreavesWright-2007/mut-HW-Fig6d-2500 rename to tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/mut-HW-Fig6d-2500 diff --git a/tutorials/resources/dataset/atm-HargreavesWright-2007/mut-HW-Fig6d-4000 b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/mut-HW-Fig6d-4000 similarity index 100% rename from tutorials/resources/dataset/atm-HargreavesWright-2007/mut-HW-Fig6d-4000 rename to tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/mut-HW-Fig6d-4000 diff --git a/tutorials/resources/dataset/atm-HargreavesWright-2007/mut-RH-Fig6d b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/mut-RH-Fig6d similarity index 100% rename from tutorials/resources/dataset/atm-HargreavesWright-2007/mut-RH-Fig6d rename to tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/resources/dataset/mut-RH-Fig6d diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allclean b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun new file mode 100755 index 0000000000..78d5debbe7 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun @@ -0,0 +1,10 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun-parallel b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..285f182dcb --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun-parallel @@ -0,0 +1,14 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun.pre b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..c8f8d2fff4 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/Allrun.pre @@ -0,0 +1,17 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/include b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/include deleted file mode 120000 index 6b9849a6bf..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/include +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/include \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/p b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/p deleted file mode 120000 index d1e1225671..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/p +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/system b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/include b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/include deleted file mode 120000 index 6b9849a6bf..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/include +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/include \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/p b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/p deleted file mode 120000 index d1e1225671..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/p +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/system b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allclean b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allclean index 4b66456e7c..2206c5fd7d 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allclean +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allclean @@ -3,12 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots -#------------------------------------------------------------------------------ \ No newline at end of file +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun index ff256f2362..ffb9845fd1 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun @@ -1,68 +1,142 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings - # operand setups (only neutral stability) + # operand setups setups=" kEpsilon kOmegaSST kL " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=true + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=false + #------------------------------------------------------------------------------ + ####################################### -# Collect results and mesh into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + printf "\n# Create the setup: %s\n" "$setup" + + if [ ! -d "$dirSetup" ] + then + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" + else + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" + fi +} + + +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" + + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" - mkdir -p "$dirSettings" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" - [ -d constant ] && mv -f constant "$dirResult" - [ -d system ] && mv -f system "$dirResult" - echo " # Cleaning up the case" + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi + + + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] && [ -d "$dirResult"/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi } @@ -71,57 +145,21 @@ collect() { for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - if [ ! -d constant/polyMesh ] + if [ "$run" = true ] then - - runApplication blockMesh - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh -allTopology -allGeometry -constant - - fi - - if [ "$parallel" = true ] - then - - runApplication decomposePar - - runParallel $(getApplication) - - runApplication reconstructPar - + run_setup "$setup" else - - runApplication $(getApplication) - + dry_run_setup "$setup" fi - - # Scale up all the dimensions of the precursor computational domain - # to encapsulate the successor domain, so that mapFields can be used - runApplication transformPoints -scale '(10 10 1)' -translate '(0 0 20)' - - collect "$setup" - done diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/plot b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/plot index a133b5896e..db693a0877 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/plot +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/plot @@ -22,7 +22,7 @@ plot_u_vs_z() { setup="$1" endTime="$2" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-Koblitz-2013/u-z-Leipzig.dat" + benchmarkFile="resources/dataset/u-z-Leipzig.dat" sampleFile="results/$setup/postProcessing/sampleLines/$endTime/lineZ1_U.xy" image="plots/$setup/u_z.png" @@ -59,7 +59,7 @@ plot_v_vs_z() { setup="$1" endTime="$2" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-Koblitz-2013/u-z-Leipzig.dat" + benchmarkFile="resources/dataset/u-z-Leipzig.dat" sampleFile="results/$setup/postProcessing/sampleLines/$endTime/lineZ1_U.xy" image="plots/$setup/v_z.png" @@ -108,23 +108,26 @@ command -v awk >/dev/null || { for setup in $setups do - echo "" echo "# Plots for the setup: $setup" echo "" + [ -d "results/$setup" ] || { + echo "No results/$setup directory found - skipping graph creation" 1>&2 + continue + } + dirPlots="plots/$setup" [ -d "$dirPlots" ] || mkdir -p "$dirPlots" endTime=$(\ - foamDictionary results/$setup/settings/controlDict \ + foamDictionary results/$setup/system/controlDict \ -disableFunctionEntries -entry endTime -value \ ) plot_u_vs_z "$setup" "$endTime" plot_v_vs_z "$setup" "$endTime" - done diff --git a/tutorials/resources/dataset/atm-Koblitz-2013/u-z-Leipzig.dat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/resources/dataset/u-z-Leipzig.dat similarity index 100% rename from tutorials/resources/dataset/atm-Koblitz-2013/u-z-Leipzig.dat rename to tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/resources/dataset/u-z-Leipzig.dat diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allclean b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun new file mode 100755 index 0000000000..cf2677f4a0 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun @@ -0,0 +1,14 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + +# Scale up all the dimensions of the precursor computational domain +# to encapsulate the successor domain, so that mapFields can be used +runApplication transformPoints -scale '(10 10 1)' -translate '(0 0 20)' + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun-parallel b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..1233ca0586 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun-parallel @@ -0,0 +1,18 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar + +# Scale up all the dimensions of the precursor computational domain +# to encapsulate the successor domain, so that mapFields can be used +runApplication transformPoints -scale '(10 10 1)' -translate '(0 0 20)' + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun.pre b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..c8f8d2fff4 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/Allrun.pre @@ -0,0 +1,17 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/system b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/system deleted file mode 120000 index 86c0ebd6e7..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/system +++ /dev/null @@ -1 +0,0 @@ -../common/system \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/system b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/system deleted file mode 120000 index 86c0ebd6e7..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/system +++ /dev/null @@ -1 +0,0 @@ -../common/system \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/system b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/system deleted file mode 120000 index 86c0ebd6e7..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/system +++ /dev/null @@ -1 +0,0 @@ -../common/system \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allclean b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allclean index 4b66456e7c..2206c5fd7d 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allclean +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allclean @@ -3,12 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots -#------------------------------------------------------------------------------ \ No newline at end of file +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun index 41edc4f60f..093b089cea 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings @@ -13,57 +12,131 @@ cd "${0%/*}" || exit # Run from this directory kL " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=true + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=false + #------------------------------------------------------------------------------ ####################################### -# Collect results and mesh into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + printf "\n# Create the setup: %s\n" "$setup" + + if [ ! -d "$dirSetup" ] + then + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" + else + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" + fi +} + + +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" + + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" - mkdir -p "$dirSettings" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" - [ -d constant ] && mv -f constant "$dirResult" - [ -d system ] && mv -f system "$dirResult" - echo " # Cleaning up the case" + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi + + + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] && [ -d "$dirResult"/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi } @@ -72,60 +145,21 @@ collect() { for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - if [ ! -d constant/polyMesh ] + if [ "$run" = true ] then - - runApplication blockMesh - - runApplication topoSet - - runApplication createPatch -overwrite - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh -allTopology -allGeometry -constant - - fi - - runApplication mapFields \ - ../precursor/results/"$setup" -sourceTime latestTime - - if [ "$parallel" = true ] - then - - runApplication decomposePar - - runParallel $(getApplication) - - runApplication reconstructPar - + run_setup "$setup" else - - runApplication $(getApplication) - + dry_run_setup "$setup" fi - - collect "$setup" - done diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allclean b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun new file mode 100755 index 0000000000..78d5debbe7 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun @@ -0,0 +1,10 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun-parallel b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..285f182dcb --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun-parallel @@ -0,0 +1,14 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun.pre b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..d6f3da0ab8 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/Allrun.pre @@ -0,0 +1,26 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication topoSet + + runApplication createPatch -overwrite + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +setup=${PWD##*/} + +runApplication mapFields \ + ../../../precursor/results/"$setup" -sourceTime latestTime + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/boundaryData b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/boundaryData deleted file mode 120000 index 12dfff1d41..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/boundaryData +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/boundaryData \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/fvOptions deleted file mode 120000 index 344e07ee88..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/fvOptions +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/fvOptions \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/system b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/boundaryData b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/boundaryData deleted file mode 120000 index 12dfff1d41..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/boundaryData +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/boundaryData \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/system b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/boundaryData b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/boundaryData deleted file mode 120000 index 12dfff1d41..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/boundaryData +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/boundaryData \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/fvOptions deleted file mode 120000 index 344e07ee88..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/fvOptions +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/fvOptions \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/system b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/system deleted file mode 120000 index 8ed134fc8c..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/system +++ /dev/null @@ -1 +0,0 @@ -../common/system/ \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allclean b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allclean index e570da4052..2206c5fd7d 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allclean +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allclean @@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun index ba202c76cc..dd82802acb 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun @@ -1,7 +1,6 @@ -#!/bin/bash +#!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings @@ -16,55 +15,131 @@ cd "${0%/*}" || exit # Run from this directory unstable " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=true + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=false + #------------------------------------------------------------------------------ ####################################### -# Collect results into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + printf "\n# Create the setup: %s\n" "$setup" + + if [ ! -d "$dirSetup" ] + then + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" + else + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" + fi +} + + +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" + + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" - mkdir -p "$dirSettings" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" - echo " # Cleaning up the case" + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi + + + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] && [ -d "$dirResult"/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi } @@ -73,61 +148,28 @@ collect() { for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - if [ ! -d constant/polyMesh ] + if [ "$run" = true ] then - - runApplication blockMesh - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh -allTopology -allGeometry -constant - - fi - - if [ "$parallel" = true ] - then - - runApplication decomposePar - - runParallel setFields - - runParallel $(getApplication) - - runParallel redistributePar -reconstruct -latestTime - + run_setup "$setup" else - - runApplication setFields - - runApplication $(getApplication) - + dry_run_setup "$setup" fi - - runApplication postProcess -funcs \ - "(minMaxComponents(U) minMaxMagnitude(U))" -latestTime - - collect "$setup" - done +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi + + #------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/plot b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/plot index cedb9528ac..0129980222 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/plot +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/plot @@ -70,14 +70,14 @@ plot_u_vs_z() { shift 2 setups=$@ - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-Arnqvist-2015/uNorm-zNorm.dat" + benchmarkFile="resources/dataset/uNorm-zNorm.dat" i=0 for setup in $setups do - endTime=$(foamDictionary results/$setup/settings/controlDict -entry endTime -value) + endTime=$(foamDictionary results/$setup/system/controlDict -disableFunctionEntries -entry endTime -value) - sampleFile="results/$setup/postProcessing/samples/$endTime/lineZ1_U.xy" + sampleFile="results/$setup/postProcessing/sampleU/$endTime/lineZ1_U.xy" # Store the ground-normal height z=($(awk '{ printf "%.16f\n", $1 }' $sampleFile)) @@ -166,14 +166,14 @@ plot_k_vs_z() { shift 2 setups=$@ - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-Arnqvist-2015/kNorm-zNorm.dat" + benchmarkFile="resources/dataset/kNorm-zNorm.dat" i=0 for setup in $setups do - endTime=$(foamDictionary results/$setup/settings/controlDict -entry endTime -value) + endTime=$(foamDictionary results/$setup/system/controlDict -disableFunctionEntries -entry endTime -value) - sampleFile="results/$setup/postProcessing/samples/$endTime/lineZ1_ObukhovLength_T_Ustar_k_p_rgh.xy" + sampleFile="results/$setup/postProcessing/sampleScalars/$endTime/lineZ1_ObukhovLength_T_Ustar_k_p_rgh.xy" # Store the ground-normal height profile z=($(awk '{ printf "%.16f\n", $1 }' $sampleFile)) @@ -265,9 +265,9 @@ print_Obukhov_length() { i=0 for setup in $setups do - endTime=$(foamDictionary results/$setup/settings/controlDict -entry endTime -value) + endTime=$(foamDictionary results/$setup/system/controlDict -disableFunctionEntries -entry endTime -value) - sampleFile="results/$setup/postProcessing/samples/$endTime/lineZ1_ObukhovLength_T_Ustar_k_p_rgh.xy" + sampleFile="results/$setup/postProcessing/sampleScalars/$endTime/lineZ1_ObukhovLength_T_Ustar_k_p_rgh.xy" # Store the ground-normal height profile z=($(awk '{ printf "%.16f\n", $1 }' $sampleFile)) @@ -299,14 +299,14 @@ plot_alpha_vs_z() { shift 2 setups=$@ - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/atm-Arnqvist-2015/veer-zNorm.dat" + benchmarkFile="resources/dataset/veer-zNorm.dat" i=0 for setup in $setups do - endTime=$(foamDictionary results/$setup/settings/controlDict -entry endTime -value) + endTime=$(foamDictionary results/$setup/system/controlDict -disableFunctionEntries -entry endTime -value) - sampleFile="results/$setup/postProcessing/samples/$endTime/lineZ1_U.xy" + sampleFile="results/$setup/postProcessing/sampleU/$endTime/lineZ1_U.xy" # Store the ground-normal height z=($(awk '{ printf "%.16f\n", $1 }' $sampleFile)) diff --git a/tutorials/resources/dataset/atm-Arnqvist-2015/kNorm-zNorm.dat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/resources/dataset/kNorm-zNorm.dat similarity index 100% rename from tutorials/resources/dataset/atm-Arnqvist-2015/kNorm-zNorm.dat rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/resources/dataset/kNorm-zNorm.dat diff --git a/tutorials/resources/dataset/atm-Arnqvist-2015/uNorm-zNorm.dat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/resources/dataset/uNorm-zNorm.dat similarity index 100% rename from tutorials/resources/dataset/atm-Arnqvist-2015/uNorm-zNorm.dat rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/resources/dataset/uNorm-zNorm.dat diff --git a/tutorials/resources/dataset/atm-Arnqvist-2015/veer-zNorm.dat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/resources/dataset/veer-zNorm.dat similarity index 100% rename from tutorials/resources/dataset/atm-Arnqvist-2015/veer-zNorm.dat rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/resources/dataset/veer-zNorm.dat diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allclean b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun new file mode 100755 index 0000000000..9a6f75a6aa --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun @@ -0,0 +1,15 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication setFields + +runApplication $(getApplication) + +runApplication postProcess -funcs \ + "(minMaxComponents(U) minMaxMagnitude(U))" -latestTime + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun-parallel b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..64ee975637 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun-parallel @@ -0,0 +1,19 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel setFields + +runParallel $(getApplication) + +runParallel redistributePar -reconstruct -latestTime + +runApplication postProcess -funcs \ + "(minMaxComponents(U) minMaxMagnitude(U))" -latestTime + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun.pre b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..c8f8d2fff4 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/Allrun.pre @@ -0,0 +1,17 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/controlDict index aab3eddbbb..6f2f4b2210 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/controlDict +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/controlDict @@ -99,7 +99,9 @@ functions } #includeFunc "turbulenceFields" - #includeFunc "samples" + #includeFunc "sampleU" + #includeFunc "sampleScalars" + #includeFunc "sampleR" } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleR b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleR new file mode 100644 index 0000000000..5479a263c3 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleR @@ -0,0 +1,28 @@ +// -*- C++ -*- + +type sets; +libs (sampling); +interpolationScheme cellPoint; +setFormat raw; + +writeControl writeTime; + +fields +( + turbulenceProperties:R +); + +sets +{ + lineZ1 + { + type midPoint; + axis z; + start (0 0 0); + end (0 0 6001); + nPoints 200; + } +} + + +// *********************************************************************** // diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/samples b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleScalars similarity index 93% rename from tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/samples rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleScalars index 4d1c4972ee..65d55fe1fc 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/samples +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleScalars @@ -11,11 +11,9 @@ fields ( T p_rgh - U k ObukhovLength Ustar - turbulenceProperties:R ); sets diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleU b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleU new file mode 100644 index 0000000000..a9f54b5e88 --- /dev/null +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/sampleU @@ -0,0 +1,28 @@ +// -*- C++ -*- + +type sets; +libs (sampling); +interpolationScheme cellPoint; +setFormat raw; + +writeControl writeTime; + +fields +( + U +); + +sets +{ + lineZ1 + { + type midPoint; + axis z; + start (0 0 0); + end (0 0 6001); + nPoints 200; + } +} + + +// *********************************************************************** // diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/epsilon deleted file mode 120000 index 7cd846dcde..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/epsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/epsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/omega deleted file mode 120000 index 57c75810a0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/omega +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/omega \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/turbulenceProperties deleted file mode 120000 index f9d514a2f3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/turbulenceProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/blockMeshDict deleted file mode 120000 index 08ff8d675b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/blockMeshDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/blockMeshDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/samples b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/samples deleted file mode 120000 index 908ab98a80..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/samples +++ /dev/null @@ -1 +0,0 @@ -../../common/system/samples \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/turbulenceFields b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/turbulenceFields deleted file mode 120000 index 0d911c415b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/turbulenceFields +++ /dev/null @@ -1 +0,0 @@ -../../common/system/turbulenceFields \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/epsilon deleted file mode 120000 index 7cd846dcde..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/epsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/epsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/omega deleted file mode 120000 index 57c75810a0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/omega +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/omega \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/turbulenceProperties deleted file mode 120000 index f9d514a2f3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/turbulenceProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/blockMeshDict deleted file mode 120000 index 08ff8d675b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/blockMeshDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/blockMeshDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/samples b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/samples deleted file mode 120000 index 908ab98a80..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/samples +++ /dev/null @@ -1 +0,0 @@ -../../common/system/samples \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/turbulenceFields b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/turbulenceFields deleted file mode 120000 index 0d911c415b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/turbulenceFields +++ /dev/null @@ -1 +0,0 @@ -../../common/system/turbulenceFields \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/epsilon deleted file mode 120000 index 7cd846dcde..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/epsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/epsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/omega deleted file mode 120000 index 57c75810a0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/omega +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/omega \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/turbulenceProperties deleted file mode 120000 index f9d514a2f3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/turbulenceProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/blockMeshDict deleted file mode 120000 index 08ff8d675b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/blockMeshDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/blockMeshDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/samples b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/samples deleted file mode 120000 index 908ab98a80..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/samples +++ /dev/null @@ -1 +0,0 @@ -../../common/system/samples \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/turbulenceFields b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/turbulenceFields deleted file mode 120000 index 0d911c415b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/turbulenceFields +++ /dev/null @@ -1 +0,0 @@ -../../common/system/turbulenceFields \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/epsilon deleted file mode 120000 index 7cd846dcde..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/epsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/epsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/omega deleted file mode 120000 index 57c75810a0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/omega +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/omega \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/turbulenceProperties deleted file mode 120000 index f9d514a2f3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/turbulenceProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/blockMeshDict deleted file mode 120000 index 08ff8d675b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/blockMeshDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/blockMeshDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/samples b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/samples deleted file mode 120000 index 908ab98a80..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/samples +++ /dev/null @@ -1 +0,0 @@ -../../common/system/samples \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/turbulenceFields b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/turbulenceFields deleted file mode 120000 index 0d911c415b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/turbulenceFields +++ /dev/null @@ -1 +0,0 @@ -../../common/system/turbulenceFields \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/epsilon deleted file mode 120000 index 7cd846dcde..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/epsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/epsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/omega deleted file mode 120000 index 57c75810a0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/omega +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/omega \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/turbulenceProperties deleted file mode 120000 index f9d514a2f3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/turbulenceProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/blockMeshDict deleted file mode 120000 index 08ff8d675b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/blockMeshDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/blockMeshDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/samples b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/samples deleted file mode 120000 index 908ab98a80..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/samples +++ /dev/null @@ -1 +0,0 @@ -../../common/system/samples \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/turbulenceFields b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/turbulenceFields deleted file mode 120000 index 0d911c415b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/turbulenceFields +++ /dev/null @@ -1 +0,0 @@ -../../common/system/turbulenceFields \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/T deleted file mode 120000 index 36acfd78fe..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/T +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/T \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/alphat deleted file mode 120000 index 013f6d3db3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/alphat +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/alphat \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/epsilon deleted file mode 120000 index 7cd846dcde..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/epsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/epsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/k deleted file mode 120000 index 3e1c38725b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/k +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/k \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/leafAreaDensity deleted file mode 120000 index 312272b4ac..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/leafAreaDensity +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/leafAreaDensity \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/nut deleted file mode 120000 index 8186897dc1..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/nut +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/nut \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/omega deleted file mode 120000 index 57c75810a0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/omega +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/omega \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/plantCd deleted file mode 120000 index b5fbd9980a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/plantCd +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/plantCd \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/turbulenceProperties deleted file mode 120000 index f9d514a2f3..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/turbulenceProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/blockMeshDict deleted file mode 120000 index 08ff8d675b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/blockMeshDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/blockMeshDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/samples b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/samples deleted file mode 120000 index 908ab98a80..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/samples +++ /dev/null @@ -1 +0,0 @@ -../../common/system/samples \ No newline at end of file diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/turbulenceFields b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/turbulenceFields deleted file mode 120000 index 0d911c415b..0000000000 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/turbulenceFields +++ /dev/null @@ -1 +0,0 @@ -../../common/system/turbulenceFields \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/Allclean b/tutorials/verificationAndValidation/multiphase/StefanProblem/Allclean index e570da4052..2206c5fd7d 100755 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/Allclean +++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/Allclean @@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/Allrun b/tutorials/verificationAndValidation/multiphase/StefanProblem/Allrun index 96b4a4285f..d160dba1e7 100755 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/Allrun +++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings @@ -12,57 +11,108 @@ cd "${0%/*}" || exit # Run from this directory interCondensatingEvaporatingFoam " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=true + # flag to enable to use a common mesh + common_mesh=true + #------------------------------------------------------------------------------ ####################################### -# Collect results into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" - dirSettings="$dirResult"/settings + printf "\n# Create the setup: %s\n" "$setup" + + if [ ! -d "$dirSetup" ] + then + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" + else + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" + fi +} + + +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" + + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" - mkdir -p "$dirSettings" + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - cp -f system/{fv*,controlDict} constant/*Properties "$dirSettings" - mv -f 0/ "$dirSettings" - - echo " # Cleaning up the case" - - cleanTimeDirectories - cleanAuxiliary - cleanPostProcessing + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi - } @@ -70,74 +120,28 @@ collect() { for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - cp -rf 0/ 1.36/ - - if [ ! -d constant/polyMesh ] + if [ "$run" = true ] then - - runApplication blockMesh - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh -allTopology -allGeometry -constant - - if [ ! -f "system/setAlphaFieldDict" ] - then - if [ -f "system/setAlphaFieldDict.liquid" ] - then - runApplication -s liquid \ - setAlphaField -dict system/setAlphaFieldDict.liquid - fi - - if [ -f "system/setAlphaFieldDict.gas" ] - then - runApplication -s gas \ - setAlphaField -dict system/setAlphaFieldDict.gas - fi - else - runApplication setAlphaField - fi - - fi - - if [ "$parallel" = true ] - then - - runApplication decomposePar - - runParallel -s parallel renumberMesh -overwrite - - runParallel $(getApplication) - - runApplication reconstructPar - + run_setup "$setup" else - - runApplication $(getApplication) - + dry_run_setup "$setup" fi - - collect "$setup" - done +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi + + #------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/plot b/tutorials/verificationAndValidation/multiphase/StefanProblem/plot index 1a457dfc24..08a5d09afc 100755 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/plot +++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/plot @@ -18,11 +18,11 @@ plot_t_vs_x() { setup="$1" - benchmarkFile="$FOAM_TUTORIALS/resources/dataset/StefanProblem.dat" + benchmarkFile="resources/dataset/StefanProblem.dat" - sampleFile0="results/$setup/postProcessing/interfaceHeight1/1.36" - sampleFile="$sampleFile0/positionClean.dat" - sed -e 's/[()]//g' "$sampleFile0/position.dat" > "$sampleFile" + sampleDir="results/$setup/postProcessing/interfaceHeight1/1.36" + sampleFile="$sampleDir/positionClean.dat" + sed -e 's/[()]//g' "$sampleDir/position.dat" > "$sampleFile" image="plots/$setup/t_vs_x.png" gnuplot</dev/null || { - echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2 + echo "gnuplot not found - skipping graph creation" 1>&2 exit 1 } # Check "results" directory [ -d "results" ] || { - echo "FOAM FATAL ERROR: No results directory found - skipping graph creation" 1>&2 + echo "No results directory found - skipping graph creation" 1>&2 exit 1 } @@ -65,16 +65,19 @@ command -v gnuplot >/dev/null || { for setup in $setups do - echo "" echo "# Plots for the setup: $setup" echo "" + [ -d "results/$setup" ] || { + echo "No results/$setup directory found - skipping graph creation" 1>&2 + continue + } + dirPlots="plots/$setup" [ -d "$dirPlots" ] || mkdir -p "$dirPlots" plot_t_vs_x "$setup" - done diff --git a/tutorials/resources/dataset/StefanProblem.dat b/tutorials/verificationAndValidation/multiphase/StefanProblem/resources/dataset/StefanProblem.dat similarity index 100% rename from tutorials/resources/dataset/StefanProblem.dat rename to tutorials/verificationAndValidation/multiphase/StefanProblem/resources/dataset/StefanProblem.dat diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allclean b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allclean new file mode 100755 index 0000000000..1402266058 --- /dev/null +++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allclean @@ -0,0 +1,10 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +rm -Rf old-processor-* + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun new file mode 100755 index 0000000000..78d5debbe7 --- /dev/null +++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun @@ -0,0 +1,10 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun-parallel b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..285f182dcb --- /dev/null +++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun-parallel @@ -0,0 +1,14 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun.pre b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..a78a284493 --- /dev/null +++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/Allrun.pre @@ -0,0 +1,36 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +restore0Dir + +cp -Rf 0 1.36/ + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +if [ ! -f "system/setAlphaFieldDict" ] +then + if [ -f "system/setAlphaFieldDict.liquid" ] + then + runApplication -s liquid \ + setAlphaField -dict system/setAlphaFieldDict.liquid + fi + + if [ -f "system/setAlphaFieldDict.gas" ] + then + runApplication -s gas \ + setAlphaField -dict system/setAlphaFieldDict.gas + fi +else + runApplication setAlphaField +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/U b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/p_rgh b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/g b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/transportProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/turbulenceProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/turbulenceProperties deleted file mode 120000 index f9d514a2f3..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/turbulenceProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/blockMeshDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/blockMeshDict deleted file mode 120000 index 08ff8d675b..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/blockMeshDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/blockMeshDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/decomposeParDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/U b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/U deleted file mode 120000 index e4dc4caaf6..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/U +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/U \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/p_rgh b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/p_rgh deleted file mode 120000 index a394ed8aa0..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/p_rgh +++ /dev/null @@ -1 +0,0 @@ -../../common/0.orig/p_rgh \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/g b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/g deleted file mode 120000 index c6fea3b1e5..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/g +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/g \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/transportProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/transportProperties deleted file mode 120000 index e6a4e4f7fc..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/transportProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/transportProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/turbulenceProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/turbulenceProperties deleted file mode 120000 index f9d514a2f3..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../../common/constant/turbulenceProperties \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/blockMeshDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/blockMeshDict deleted file mode 120000 index 08ff8d675b..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/blockMeshDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/blockMeshDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/decomposeParDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/Allclean b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/Allclean index e570da4052..2206c5fd7d 100755 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/Allclean +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/Allclean @@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/Allrun b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/Allrun index 51d093ba4a..7b9573fbf9 100755 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/Allrun +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings @@ -20,57 +19,132 @@ cd "${0%/*}" || exit # Run from this directory 85 " + # flag to enable computations + run=true + # flag to enable computations in parallel mode - parallel=true + parallel=false + + # flag to enable to use a common mesh + common_mesh=false + + # flag to enable to use a common dynamic code + common_dynamic_code=false #------------------------------------------------------------------------------ ####################################### -# Collect results into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" - dirSettings="$dirResult"/system + printf "\n# Create the setup: %s\n" "$setup" + + if [ ! -d "$dirSetup" ] + then + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" + else + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" + fi +} + + +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" + + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirSettings" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - mv -f $(foamListTimes) "$dirResult" - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - mv -f logs "$dirResult" - mv -f constant "$dirResult"/ - cp -f system/fv* system/controlDict "$dirSettings" - mv -f 0/ "$dirSettings" - echo " # Cleaning up the case" + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi + + + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi - } @@ -78,66 +152,28 @@ collect() { for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/0.orig" . - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - cp -rf 0.orig/ 0/ - - runApplication blockMesh - - runApplication renumberMesh -overwrite -constant - - runApplication checkMesh \ - -allTopology -allGeometry -constant \ - -writeAllFields -writeAllSurfaceFields - - - if [ "$parallel" = true ] + if [ "$run" = true ] then - - runApplication decomposePar - - runParallel -s parallel renumberMesh -overwrite - - runParallel $(getApplication) - - runApplication reconstructPar - + run_setup "$setup" else - - runApplication $(getApplication) - + dry_run_setup "$setup" fi - - # runtime sampling has problems in parallel mode (Apr 2021) - runApplication \ - postProcess -func sample -latestTime - - runApplication -s "epsilon" \ - postProcess -func sampleEpsilon -latestTime - - runApplication -s "G"\ - postProcess -func sampleG -latestTime - - runApplication foamLog log.$(getApplication) - - collect "$setup" - done +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi + + #------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/plot b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/plot index 4fa8369b12..95447f420c 100755 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/plot +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/plot @@ -148,7 +148,7 @@ plot_yPlus_vs_uPlus() { uTau="$4" # benchmarkFile="$FOAM_TUTORIALS/resources/dataset/planeChannelFlow/ReTau-395/chan395.means" - sampleFile="results/$setup/postProcessing/sample/$endTime/y_U.xy" + sampleFile="results/$setup/postProcessing/sampleU/$endTime/y_U.xy" image="plots/$setup/yPlus_vs_uPlus.png" gnuplot</dev/null || { for setup in $setups do - echo "" echo "# Plots for the setup: $setup" echo "" + [ -d "results/$setup" ] || { + echo "No results/$setup directory found - skipping graph creation" 1>&2 + continue + } + dirPlots="plots/$setup" [ -d "$dirPlots" ] || mkdir -p "$dirPlots" @@ -648,7 +652,6 @@ do plot_initial_iteration_residuals "$setup" plot_final_iteration_residuals "$setup" - done plot_yPlus_vs_uPlus_all_setups $setups diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/0.orig b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/0.orig deleted file mode 120000 index f9966c1c82..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/0.orig +++ /dev/null @@ -1 +0,0 @@ -../common/0.orig \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/constant b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/fvSchemes deleted file mode 120000 index 274d17e172..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSchemes \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sample deleted file mode 120000 index dd0303886f..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sample +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sample \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sampleEpsilon deleted file mode 120000 index c26b1f97d5..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sampleEpsilon +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleEpsilon \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sampleG deleted file mode 120000 index 6d73a78c84..0000000000 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/sampleG +++ /dev/null @@ -1 +0,0 @@ -../../common/system/sampleG \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allclean b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allclean new file mode 100755 index 0000000000..1402266058 --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allclean @@ -0,0 +1,10 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +rm -Rf old-processor-* + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun new file mode 100755 index 0000000000..6eff1cad57 --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun @@ -0,0 +1,18 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication $(getApplication) + + +runApplication -s "epsilon" postProcess -func sampleEpsilon -latestTime +runApplication -s "k" postProcess -func sampleK -latestTime +runApplication -s "R" postProcess -func sampleR -latestTime +runApplication -s "G" postProcess -func sampleG -latestTime +runApplication -s "U" postProcess -func sampleU -latestTime +runApplication foamLog log.$(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun-parallel b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..7dfcff4473 --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun-parallel @@ -0,0 +1,22 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar + + +runApplication -s "epsilon" postProcess -func sampleEpsilon -latestTime +runApplication -s "k" postProcess -func sampleK -latestTime +runApplication -s "R" postProcess -func sampleR -latestTime +runApplication -s "G" postProcess -func sampleG -latestTime +runApplication -s "U" postProcess -func sampleU -latestTime +runApplication foamLog log.$(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun.pre b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..c8f8d2fff4 --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/Allrun.pre @@ -0,0 +1,17 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +restore0Dir + +if [ ! -d constant/polyMesh ] +then + runApplication blockMesh + + runApplication renumberMesh -overwrite -constant + + runApplication checkMesh -allTopology -allGeometry -constant +fi + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleK similarity index 97% rename from tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sample rename to tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleK index d4ae0ff770..431c2edda1 100644 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sample +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleK @@ -23,9 +23,7 @@ writeControl writeTime; fields ( - U turbulenceProperties:k - turbulenceProperties:R ); sets diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleR b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleR new file mode 100644 index 0000000000..5d89474b14 --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleR @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2206 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object sample; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +type sets; +libs (sampling); +interpolationScheme cellPoint; +setFormat raw; +executeControl writeTime; +writeControl writeTime; + +fields +( + turbulenceProperties:R +); + +sets +{ + ref_point + { + type cloud; + axis y; + points ((0.5 1 0.5)); + } + + y + { + type midPoint; + axis y; + start (0.5 0 0.5); + end (0.5 1 0.5); + } +} + + +// ************************************************************************* // diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleU b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleU new file mode 100644 index 0000000000..5ce6f88b5b --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleU @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2206 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object sample; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +type sets; +libs (sampling); +interpolationScheme cellPoint; +setFormat raw; +executeControl writeTime; +writeControl writeTime; + +fields +( + U +); + +sets +{ + ref_point + { + type cloud; + axis y; + points ((0.5 1 0.5)); + } + + y + { + type midPoint; + axis y; + start (0.5 0 0.5); + end (0.5 1 0.5); + } +} + + +// ************************************************************************* // diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/Allclean b/tutorials/verificationAndValidation/schemes/skewnessCavity/Allclean index 4ec98749ad..2206c5fd7d 100755 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/Allclean +++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/Allclean @@ -3,12 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase0 - -rm -rf dynamicCode -rm -rf 0.orig -rm -rf system -rm -rf constant +rm -rf setups rm -rf results rm -rf plots diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/Allrun b/tutorials/verificationAndValidation/schemes/skewnessCavity/Allrun index 2e58e307ee..9a9893ed90 100755 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/Allrun +++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ # settings @@ -36,54 +35,132 @@ cd "${0%/*}" || exit # Run from this directory iterativeGauss-linear-20 " + # flag to enable computations + run=true + # flag to enable computations in parallel mode parallel=false + # flag to enable to use a common mesh + common_mesh=true + + # flag to enable to use a common dynamic code + common_dynamic_code=true + #------------------------------------------------------------------------------ ####################################### -# Collect results into a given path -# and clean the case for the next run +# Create the given setup # Arguments: -# $1 = Path to move results +# $1 = Path to create the setup # Outputs: # Writes info to stdout ####################################### -collect() { +dry_run_setup() { - [ $# -eq 0 ] && { echo "Usage: $0 dir-model"; exit 1; } + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } - collection="$1" + setup="$1" + dirSetup="setups/$setup" + dirSetupOrig="setups.orig/$setup" + dirOrig="$dirSetupOrig/0.orig" + dirConstant="$dirSetupOrig/constant" + dirSystem="$dirSetupOrig/system" - dirResult=results/"$collection" + printf "\n# Create the setup: %s\n" "$setup" + + if [ ! -d "$dirSetup" ] + then + mkdir -p "$dirSetup" + + cp -aRfL "setups.orig/common/." "$dirSetup" + cp -afL "$dirSetupOrig"/All* "$dirSetup" 2>/dev/null || : + [ -d "$dirOrig" ] && cp -aRfL "$dirOrig/." "$dirSetup/0.orig" + [ -d "$dirConstant" ] && cp -aRfL "$dirConstant/." "$dirSetup/constant" + [ -d "$dirSystem" ] && cp -aRfL "$dirSystem/." "$dirSetup/system" + else + printf "\n # Directory %s already exists\n" "$dirSetup" + printf " # Skipping the creation of a new setup\n" + fi +} + + +####################################### +# Run the given setup +# Arguments: +# $1 = Path to the setup to run +# Outputs: +# Writes info to stdout +####################################### +run_setup() { + + [ $# -eq 0 ] && { echo "Usage error: $0"; exit 1; } + + setup="$1" + dirSetup="setups/$setup" + dirResult="results/$setup" + + dry_run_setup "$setup" + [ -d results ] || mkdir -p results + + printf "\n# Run the setup: %s\n\n" "$setup" if [ ! -d "$dirResult" ] then + cp -Rf "$dirSetup" "$dirResult" - echo " # Collecting results and settings into $dirResult" + if [ "$common_mesh" = true ] + then + if [ -d results/mesh ] + then + printf "## Copy the common mesh to the setup: %s\n\n" "$setup" + cp -Rf results/mesh/polyMesh "$dirResult"/constant/. + fi + fi - mkdir -p "$dirResult" + if [ "$common_dynamic_code" = true ] + then + if [ -d results/dynamicCode ] + then + printf "## Copy the common dynamic code to the setup: %s\n\n" "$setup" + cp -Rf results/dynamicCode "$dirResult"/. + fi + fi - [ -d postProcessing ] && mv -f postProcessing "$dirResult" - [ -d processor0 ] && mv -f processor* "$dirResult" - mv -f log.* "$dirResult" - mv -f constant "$dirResult"/ - mv -f system "$dirResult"/ - mv -f 0 "$dirResult"/ - echo " # Cleaning up the case" + if [ "$parallel" = true ] + then + ( cd "$dirResult" && ./Allrun-parallel ) + else + ( cd "$dirResult" && ./Allrun ) + fi + + + if [ "$common_mesh" = true ] + then + if [ ! -d results/mesh ] + then + printf "\n## Store the mesh of %s as the common mesh\n\n" "$setup" + mkdir -p results/mesh + cp -Rf "$dirResult"/constant/polyMesh results/mesh/. + fi + fi + + if [ "$common_dynamic_code" = true ] + then + if [ ! -d results/dynamicCode ] + then + printf "\n## Store the dynamic code of %s as the common dynamic code\n\n" "$setup" + cp -Rf "$dirResult"/dynamicCode results/. + fi + fi - cleanTimeDirectories - cleanPostProcessing else - - echo " # Directory $dirResult already exists" - echo " # Skipping the computation" - + printf " # Directory %s already exists\n" "$dirResult" + printf " # Skipping the computation of the given setup\n" fi - } @@ -91,49 +168,28 @@ collect() { for setup in $setups do + dirSetupOrig="setups.orig/$setup" - echo "" - echo "# Computations for the setup: $setup" - echo "" - - dirSetup="setups.orig/$setup" - - if [ ! -d "$dirSetup" ] + if [ ! -d "$dirSetupOrig" ] then - echo "Setup directory: $dirSetup" \ + echo "Setup directory: $dirSetupOrig" \ "could not be found - skipping execution" 1>&2 - exit 1 + continue fi - cp -rfL "$dirSetup/constant" . - cp -rfL "$dirSetup/system" . - [ -d 0 ] && rm -rf 0 - mkdir 0 - - - runApplication checkMesh \ - -allTopology -allGeometry -constant \ - -writeAllFields -writeAllSurfaceFields - - - if [ "$parallel" = true ] + if [ "$run" = true ] then - - runApplication decomposePar - - runParallel postProcess -constant - - runApplication reconstructPar - + run_setup "$setup" else - - runApplication postProcess -constant - + dry_run_setup "$setup" fi - - collect "$setup" - done +if notTest "$@" && [ "$run" = true ] +then + ./plot +fi + + #------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/plot b/tutorials/verificationAndValidation/schemes/skewnessCavity/plot index 5a194b62d8..2cb9433f2c 100755 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/plot +++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/plot @@ -224,7 +224,6 @@ rm -f results/*.dat for group in $groups do - groupName="$group" collect_data "$groupName" ${!group} @@ -232,7 +231,6 @@ do plot_error_stats "$groupName" plot_mag_error_stats "$groupName" - done diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allclean b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allclean new file mode 100755 index 0000000000..1402266058 --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allclean @@ -0,0 +1,10 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +rm -Rf old-processor-* + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun new file mode 100755 index 0000000000..3a36d5b5c0 --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun @@ -0,0 +1,10 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication postProcess -constant + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun-parallel b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun-parallel new file mode 100755 index 0000000000..a91caf724e --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun-parallel @@ -0,0 +1,14 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel postProcess -constant + +runApplication reconstructPar + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun.pre b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun.pre new file mode 100755 index 0000000000..d7f9d28ce5 --- /dev/null +++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/Allrun.pre @@ -0,0 +1,15 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +if [ ! -d constant/polyMesh ] +then + cp -Rf ../../setups.orig/common/constant/polyMesh constant/. +fi + +runApplication checkMesh \ + -allTopology -allGeometry -constant \ + -writeAllFields -writeAllSurfaceFields + +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/constant b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/constant deleted file mode 120000 index f629794886..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/constant +++ /dev/null @@ -1 +0,0 @@ -../common/constant \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/controlDict deleted file mode 120000 index e38bfb1f6b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/controlDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/controlDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/cuttingPlane deleted file mode 120000 index 3dc2409e4b..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/cuttingPlane +++ /dev/null @@ -1 +0,0 @@ -../../common/system/cuttingPlane \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/decomposeParDict deleted file mode 120000 index 9276e7939a..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/decomposeParDict +++ /dev/null @@ -1 +0,0 @@ -../../common/system/decomposeParDict \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/fvSolution deleted file mode 120000 index 504f0b1c9e..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../../common/system/fvSolution \ No newline at end of file diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/runtimePostProcessing deleted file mode 120000 index ed619e223d..0000000000 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/runtimePostProcessing +++ /dev/null @@ -1 +0,0 @@ -../../common/system/runtimePostProcessing \ No newline at end of file