From 521f946315b7c7e64b789a7b9c2698dd88546b4e Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Fri, 15 Oct 2010 20:11:43 +0200 Subject: [PATCH 1/6] fixed blockCoupledSwirlTest tut (formerly coupledSwirlTest in the wrong place --- .../blockCoupledScalarTransportFoam/Make/files | 0 .../blockCoupledScalarTransportFoam/Make/options | 0 .../blockCoupledScalarTransportFoam.C | 0 .../blockCoupledScalarTransportFoam/blockMatrixTools.C | 0 .../blockCoupledScalarTransportFoam/blockMatrixTools.H | 0 .../blockCoupledScalarTransportFoam/blockVector2Matrix.C | 0 .../blockCoupledScalarTransportFoam/blockVector2Matrix.H | 0 .../blockCoupledScalarTransportFoam/blockVector2Solvers.C | 0 .../blockCoupledScalarTransportFoam/createFields.H | 0 .../blockCoupledScalarTransportFoam/tensor2.H | 0 .../blockCoupledScalarTransportFoam/tensor2Field.C | 0 .../blockCoupledScalarTransportFoam/tensor2Field.H | 0 .../blockCoupledScalarTransportFoam/testBlockMatrix.C | 0 .../blockCoupledScalarTransportFoam/vector2.H | 0 .../blockCoupledScalarTransportFoam/vector2Field.H | 0 .../solvers/{conjugate => coupled}/conjugateHeatFoam/Make/files | 0 .../{conjugate => coupled}/conjugateHeatFoam/Make/options | 0 .../{conjugate => coupled}/conjugateHeatFoam/attachPatches.H | 0 .../conjugateHeatFoam/conjugateHeatFoam.C | 0 .../{conjugate => coupled}/conjugateHeatFoam/createFields.H | 0 .../{conjugate => coupled}/conjugateHeatFoam/createFluidMesh.H | 0 .../conjugateHeatFoam/createSolidFields.H | 0 .../{conjugate => coupled}/conjugateHeatFoam/createSolidMesh.H | 0 .../{conjugate => coupled}/conjugateHeatFoam/detachPatches.H | 0 .../conjugateHeatFoam/readSolidControls.H | 0 .../{conjugate => coupled}/conjugateHeatFoam/solveEnergy.H | 0 .../{conjugate => coupled}/conjugateHeatFoam/solveFluid.H | 0 .../.gitignore | 0 .../blockCoupledSwirlTest}/0/T | 0 .../blockCoupledSwirlTest}/0/Ts | 0 .../blockCoupledSwirlTest}/0/U | 0 .../blockCoupledSwirlTest}/0/U.org | 0 .../blockCoupledSwirlTest}/Allrun | 2 +- .../blockCoupledSwirlTest}/constant/polyMesh/blockMeshDict | 0 .../blockCoupledSwirlTest}/constant/transportProperties | 0 .../blockCoupledSwirlTest}/system/controlDict | 0 .../blockCoupledSwirlTest}/system/fvSchemes | 0 .../blockCoupledSwirlTest}/system/fvSolution | 0 38 files changed, 1 insertion(+), 1 deletion(-) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/Make/files (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/Make/options (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/blockMatrixTools.C (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/blockMatrixTools.H (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/blockVector2Matrix.C (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/blockVector2Matrix.H (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/blockVector2Solvers.C (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/createFields.H (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/tensor2.H (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/tensor2Field.C (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/tensor2Field.H (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/testBlockMatrix.C (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/vector2.H (100%) rename applications/solvers/{conjugate => coupled}/blockCoupledScalarTransportFoam/vector2Field.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/Make/files (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/Make/options (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/attachPatches.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/conjugateHeatFoam.C (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/createFields.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/createFluidMesh.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/createSolidFields.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/createSolidMesh.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/detachPatches.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/readSolidControls.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/solveEnergy.H (100%) rename applications/solvers/{conjugate => coupled}/conjugateHeatFoam/solveFluid.H (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam}/.gitignore (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/0/T (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/0/Ts (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/0/U (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/0/U.org (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/Allrun (75%) mode change 100644 => 100755 rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/constant/polyMesh/blockMeshDict (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/constant/transportProperties (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/system/controlDict (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/system/fvSchemes (100%) rename tutorials/coupled/{coupledSwirlTest => blockCoupledScalarTransportFoam/blockCoupledSwirlTest}/system/fvSolution (100%) diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/Make/files b/applications/solvers/coupled/blockCoupledScalarTransportFoam/Make/files similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/Make/files rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/Make/files diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/Make/options b/applications/solvers/coupled/blockCoupledScalarTransportFoam/Make/options similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/Make/options rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/Make/options diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C b/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockMatrixTools.C b/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockMatrixTools.C similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockMatrixTools.C rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/blockMatrixTools.C diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockMatrixTools.H b/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockMatrixTools.H similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockMatrixTools.H rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/blockMatrixTools.H diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockVector2Matrix.C b/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockVector2Matrix.C similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockVector2Matrix.C rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/blockVector2Matrix.C diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockVector2Matrix.H b/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockVector2Matrix.H similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockVector2Matrix.H rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/blockVector2Matrix.H diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockVector2Solvers.C b/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockVector2Solvers.C similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/blockVector2Solvers.C rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/blockVector2Solvers.C diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/createFields.H b/applications/solvers/coupled/blockCoupledScalarTransportFoam/createFields.H similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/createFields.H rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/createFields.H diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/tensor2.H b/applications/solvers/coupled/blockCoupledScalarTransportFoam/tensor2.H similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/tensor2.H rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/tensor2.H diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/tensor2Field.C b/applications/solvers/coupled/blockCoupledScalarTransportFoam/tensor2Field.C similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/tensor2Field.C rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/tensor2Field.C diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/tensor2Field.H b/applications/solvers/coupled/blockCoupledScalarTransportFoam/tensor2Field.H similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/tensor2Field.H rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/tensor2Field.H diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/testBlockMatrix.C b/applications/solvers/coupled/blockCoupledScalarTransportFoam/testBlockMatrix.C similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/testBlockMatrix.C rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/testBlockMatrix.C diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/vector2.H b/applications/solvers/coupled/blockCoupledScalarTransportFoam/vector2.H similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/vector2.H rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/vector2.H diff --git a/applications/solvers/conjugate/blockCoupledScalarTransportFoam/vector2Field.H b/applications/solvers/coupled/blockCoupledScalarTransportFoam/vector2Field.H similarity index 100% rename from applications/solvers/conjugate/blockCoupledScalarTransportFoam/vector2Field.H rename to applications/solvers/coupled/blockCoupledScalarTransportFoam/vector2Field.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/Make/files b/applications/solvers/coupled/conjugateHeatFoam/Make/files similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/Make/files rename to applications/solvers/coupled/conjugateHeatFoam/Make/files diff --git a/applications/solvers/conjugate/conjugateHeatFoam/Make/options b/applications/solvers/coupled/conjugateHeatFoam/Make/options similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/Make/options rename to applications/solvers/coupled/conjugateHeatFoam/Make/options diff --git a/applications/solvers/conjugate/conjugateHeatFoam/attachPatches.H b/applications/solvers/coupled/conjugateHeatFoam/attachPatches.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/attachPatches.H rename to applications/solvers/coupled/conjugateHeatFoam/attachPatches.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/conjugateHeatFoam.C b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/conjugateHeatFoam.C rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C diff --git a/applications/solvers/conjugate/conjugateHeatFoam/createFields.H b/applications/solvers/coupled/conjugateHeatFoam/createFields.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/createFields.H rename to applications/solvers/coupled/conjugateHeatFoam/createFields.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/createFluidMesh.H b/applications/solvers/coupled/conjugateHeatFoam/createFluidMesh.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/createFluidMesh.H rename to applications/solvers/coupled/conjugateHeatFoam/createFluidMesh.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/createSolidFields.H b/applications/solvers/coupled/conjugateHeatFoam/createSolidFields.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/createSolidFields.H rename to applications/solvers/coupled/conjugateHeatFoam/createSolidFields.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/createSolidMesh.H b/applications/solvers/coupled/conjugateHeatFoam/createSolidMesh.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/createSolidMesh.H rename to applications/solvers/coupled/conjugateHeatFoam/createSolidMesh.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/detachPatches.H b/applications/solvers/coupled/conjugateHeatFoam/detachPatches.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/detachPatches.H rename to applications/solvers/coupled/conjugateHeatFoam/detachPatches.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/readSolidControls.H b/applications/solvers/coupled/conjugateHeatFoam/readSolidControls.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/readSolidControls.H rename to applications/solvers/coupled/conjugateHeatFoam/readSolidControls.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/solveEnergy.H b/applications/solvers/coupled/conjugateHeatFoam/solveEnergy.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/solveEnergy.H rename to applications/solvers/coupled/conjugateHeatFoam/solveEnergy.H diff --git a/applications/solvers/conjugate/conjugateHeatFoam/solveFluid.H b/applications/solvers/coupled/conjugateHeatFoam/solveFluid.H similarity index 100% rename from applications/solvers/conjugate/conjugateHeatFoam/solveFluid.H rename to applications/solvers/coupled/conjugateHeatFoam/solveFluid.H diff --git a/tutorials/coupled/coupledSwirlTest/.gitignore b/tutorials/coupled/blockCoupledScalarTransportFoam/.gitignore similarity index 100% rename from tutorials/coupled/coupledSwirlTest/.gitignore rename to tutorials/coupled/blockCoupledScalarTransportFoam/.gitignore diff --git a/tutorials/coupled/coupledSwirlTest/0/T b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/0/T similarity index 100% rename from tutorials/coupled/coupledSwirlTest/0/T rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/0/T diff --git a/tutorials/coupled/coupledSwirlTest/0/Ts b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/0/Ts similarity index 100% rename from tutorials/coupled/coupledSwirlTest/0/Ts rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/0/Ts diff --git a/tutorials/coupled/coupledSwirlTest/0/U b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/0/U similarity index 100% rename from tutorials/coupled/coupledSwirlTest/0/U rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/0/U diff --git a/tutorials/coupled/coupledSwirlTest/0/U.org b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/0/U.org similarity index 100% rename from tutorials/coupled/coupledSwirlTest/0/U.org rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/0/U.org diff --git a/tutorials/coupled/coupledSwirlTest/Allrun b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/Allrun old mode 100644 new mode 100755 similarity index 75% rename from tutorials/coupled/coupledSwirlTest/Allrun rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/Allrun index 27dfd85c7..cc3130442 --- a/tutorials/coupled/coupledSwirlTest/Allrun +++ b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="scalarTransportFoam" +application="blockCoupledScalarTransportFoam" runApplication blockMesh runApplication $application diff --git a/tutorials/coupled/coupledSwirlTest/constant/polyMesh/blockMeshDict b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/coupled/coupledSwirlTest/constant/polyMesh/blockMeshDict rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/blockMeshDict diff --git a/tutorials/coupled/coupledSwirlTest/constant/transportProperties b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/transportProperties similarity index 100% rename from tutorials/coupled/coupledSwirlTest/constant/transportProperties rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/transportProperties diff --git a/tutorials/coupled/coupledSwirlTest/system/controlDict b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/controlDict similarity index 100% rename from tutorials/coupled/coupledSwirlTest/system/controlDict rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/controlDict diff --git a/tutorials/coupled/coupledSwirlTest/system/fvSchemes b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/fvSchemes similarity index 100% rename from tutorials/coupled/coupledSwirlTest/system/fvSchemes rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/fvSchemes diff --git a/tutorials/coupled/coupledSwirlTest/system/fvSolution b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/fvSolution similarity index 100% rename from tutorials/coupled/coupledSwirlTest/system/fvSolution rename to tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/fvSolution From b68f37b3a3ee452ac882a19b20ead6ec466c4b20 Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Sat, 16 Oct 2010 13:06:12 +0200 Subject: [PATCH 2/6] merged conjugateCavity (still with weird fvSolution syntax) --- etc/cshrc | 6 +- etc/settings.csh | 2 +- .../conjugateCavity/Allclean | 16 +- .../conjugateHeatFoam/conjugateCavity/Allrun | 22 +- .../{constant/polyMesh => }/boundary | 0 .../conjugateCavity/constant/polyMesh/faces | 451 ----------------- .../constant/polyMesh/neighbour | 454 ------------------ .../conjugateCavity/constant/polyMesh/owner | 454 ------------------ .../conjugateCavity/constant/polyMesh/points | 273 ----------- .../conjugateCavity/system/fvSolution | 19 +- .../{constant/polyMesh => }/boundary | 0 11 files changed, 34 insertions(+), 1663 deletions(-) rename tutorials/coupled/conjugateHeatFoam/conjugateCavity/{constant/polyMesh => }/boundary (100%) delete mode 100644 tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/faces delete mode 100644 tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/neighbour delete mode 100644 tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/owner delete mode 100644 tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/points rename tutorials/coupled/conjugateHeatFoam/heatedBlock/{constant/polyMesh => }/boundary (100%) diff --git a/etc/cshrc b/etc/cshrc index a9385547b..af075e254 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -82,8 +82,8 @@ if ( ! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc -#setenv WM_COMPILER Gcc -setenv WM_COMPILER Icc +setenv WM_COMPILER Gcc +#setenv WM_COMPILER Icc setenv WM_COMPILER_ARCH setenv WM_COMPILER_LIB_ARCH @@ -91,7 +91,7 @@ setenv WM_COMPILER_LIB_ARCH # Compilation options (architecture, precision, optimised, debug or profiling) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -setenv WM_NCOMPPROCS 2 +setenv WM_NCOMPPROCS 8 # WM_ARCH_OPTION = 32 | 64 if ( ! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64 diff --git a/etc/settings.csh b/etc/settings.csh index cc5573676..0a07d9719 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -144,7 +144,7 @@ unset MPI_ARCH_PATH switch ("$WM_MPLIB") case OPENMPI: - set mpi_version=openmpi-1.4.1 + set mpi_version=openmpi-1.5 setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allclean b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allclean index 9924dc9bf..f748cbc7e 100755 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allclean +++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allclean @@ -1,14 +1,12 @@ #!/bin/sh -currDir=`pwd` -application=`basename $currDir` -cases="conjugateCavity" - -tutorialPath=`dirname $0`/.. +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -for case in $cases -do - cleanTimeDirectories $case -done +cleanCase +rm -f constant/polyMesh/boundary + +cd ../heatedBlock +rm -f constant/polyMesh/boundary +cleanCase diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allrun b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allrun index 0e0a51829..9ceb1a2d9 100755 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allrun +++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allrun @@ -1,14 +1,16 @@ #!/bin/sh - -application="conjugateHeatFoam" -cases="conjugateCavity" - -tutorialPath=`dirname $0`/.. +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -for case in $cases -do - runApplication blockMesh - runApplication $application -done +application="conjugateHeatFoam" + +runApplication blockMesh +cp boundary constant/polyMesh + +cd ../heatedBlock +runApplication blockMesh +cp boundary constant/polyMesh + +cd ../conjugateCavity +runApplication $application diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/boundary b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/boundary similarity index 100% rename from tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/boundary rename to tutorials/coupled/conjugateHeatFoam/conjugateCavity/boundary diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/faces b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/faces deleted file mode 100644 index 1f88a0e3d..000000000 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/faces +++ /dev/null @@ -1,451 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.3 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix"; - case "conjugateCavity"; - instance "constant"; - local "polyMesh"; - - class faceList; - object faces; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -420 -( -4(1 12 133 122) -4(11 132 133 12) -4(2 13 134 123) -4(12 133 134 13) -4(3 14 135 124) -4(13 134 135 14) -4(4 15 136 125) -4(14 135 136 15) -4(5 16 137 126) -4(15 136 137 16) -4(6 17 138 127) -4(16 137 138 17) -4(7 18 139 128) -4(17 138 139 18) -4(8 19 140 129) -4(18 139 140 19) -4(9 20 141 130) -4(19 140 141 20) -4(20 141 142 21) -4(12 23 144 133) -4(22 143 144 23) -4(13 24 145 134) -4(23 144 145 24) -4(14 25 146 135) -4(24 145 146 25) -4(15 26 147 136) -4(25 146 147 26) -4(16 27 148 137) -4(26 147 148 27) -4(17 28 149 138) -4(27 148 149 28) -4(18 29 150 139) -4(28 149 150 29) -4(19 30 151 140) -4(29 150 151 30) -4(20 31 152 141) -4(30 151 152 31) -4(31 152 153 32) -4(23 34 155 144) -4(33 154 155 34) -4(24 35 156 145) -4(34 155 156 35) -4(25 36 157 146) -4(35 156 157 36) -4(26 37 158 147) -4(36 157 158 37) -4(27 38 159 148) -4(37 158 159 38) -4(28 39 160 149) -4(38 159 160 39) -4(29 40 161 150) -4(39 160 161 40) -4(30 41 162 151) -4(40 161 162 41) -4(31 42 163 152) -4(41 162 163 42) -4(42 163 164 43) -4(34 45 166 155) -4(44 165 166 45) -4(35 46 167 156) -4(45 166 167 46) -4(36 47 168 157) -4(46 167 168 47) -4(37 48 169 158) -4(47 168 169 48) -4(38 49 170 159) -4(48 169 170 49) -4(39 50 171 160) -4(49 170 171 50) -4(40 51 172 161) -4(50 171 172 51) -4(41 52 173 162) -4(51 172 173 52) -4(42 53 174 163) -4(52 173 174 53) -4(53 174 175 54) -4(45 56 177 166) -4(55 176 177 56) -4(46 57 178 167) -4(56 177 178 57) -4(47 58 179 168) -4(57 178 179 58) -4(48 59 180 169) -4(58 179 180 59) -4(49 60 181 170) -4(59 180 181 60) -4(50 61 182 171) -4(60 181 182 61) -4(51 62 183 172) -4(61 182 183 62) -4(52 63 184 173) -4(62 183 184 63) -4(53 64 185 174) -4(63 184 185 64) -4(64 185 186 65) -4(56 67 188 177) -4(66 187 188 67) -4(57 68 189 178) -4(67 188 189 68) -4(58 69 190 179) -4(68 189 190 69) -4(59 70 191 180) -4(69 190 191 70) -4(60 71 192 181) -4(70 191 192 71) -4(61 72 193 182) -4(71 192 193 72) -4(62 73 194 183) -4(72 193 194 73) -4(63 74 195 184) -4(73 194 195 74) -4(64 75 196 185) -4(74 195 196 75) -4(75 196 197 76) -4(67 78 199 188) -4(77 198 199 78) -4(68 79 200 189) -4(78 199 200 79) -4(69 80 201 190) -4(79 200 201 80) -4(70 81 202 191) -4(80 201 202 81) -4(71 82 203 192) -4(81 202 203 82) -4(72 83 204 193) -4(82 203 204 83) -4(73 84 205 194) -4(83 204 205 84) -4(74 85 206 195) -4(84 205 206 85) -4(75 86 207 196) -4(85 206 207 86) -4(86 207 208 87) -4(78 89 210 199) -4(88 209 210 89) -4(79 90 211 200) -4(89 210 211 90) -4(80 91 212 201) -4(90 211 212 91) -4(81 92 213 202) -4(91 212 213 92) -4(82 93 214 203) -4(92 213 214 93) -4(83 94 215 204) -4(93 214 215 94) -4(84 95 216 205) -4(94 215 216 95) -4(85 96 217 206) -4(95 216 217 96) -4(86 97 218 207) -4(96 217 218 97) -4(97 218 219 98) -4(89 100 221 210) -4(99 220 221 100) -4(90 101 222 211) -4(100 221 222 101) -4(91 102 223 212) -4(101 222 223 102) -4(92 103 224 213) -4(102 223 224 103) -4(93 104 225 214) -4(103 224 225 104) -4(94 105 226 215) -4(104 225 226 105) -4(95 106 227 216) -4(105 226 227 106) -4(96 107 228 217) -4(106 227 228 107) -4(97 108 229 218) -4(107 228 229 108) -4(108 229 230 109) -4(100 111 232 221) -4(101 112 233 222) -4(102 113 234 223) -4(103 114 235 224) -4(104 115 236 225) -4(105 116 237 226) -4(106 117 238 227) -4(107 118 239 228) -4(108 119 240 229) -4(110 231 232 111) -4(111 232 233 112) -4(112 233 234 113) -4(113 234 235 114) -4(114 235 236 115) -4(115 236 237 116) -4(116 237 238 117) -4(117 238 239 118) -4(118 239 240 119) -4(119 240 241 120) -4(0 121 132 11) -4(11 132 143 22) -4(22 143 154 33) -4(33 154 165 44) -4(44 165 176 55) -4(55 176 187 66) -4(66 187 198 77) -4(77 198 209 88) -4(88 209 220 99) -4(99 220 231 110) -4(10 21 142 131) -4(21 32 153 142) -4(32 43 164 153) -4(43 54 175 164) -4(54 65 186 175) -4(65 76 197 186) -4(76 87 208 197) -4(87 98 219 208) -4(98 109 230 219) -4(109 120 241 230) -4(0 1 122 121) -4(1 2 123 122) -4(2 3 124 123) -4(3 4 125 124) -4(4 5 126 125) -4(5 6 127 126) -4(6 7 128 127) -4(7 8 129 128) -4(8 9 130 129) -4(9 10 131 130) -4(0 11 12 1) -4(11 22 23 12) -4(22 33 34 23) -4(33 44 45 34) -4(44 55 56 45) -4(55 66 67 56) -4(66 77 78 67) -4(77 88 89 78) -4(88 99 100 89) -4(99 110 111 100) -4(1 12 13 2) -4(12 23 24 13) -4(23 34 35 24) -4(34 45 46 35) -4(45 56 57 46) -4(56 67 68 57) -4(67 78 79 68) -4(78 89 90 79) -4(89 100 101 90) -4(100 111 112 101) -4(2 13 14 3) -4(13 24 25 14) -4(24 35 36 25) -4(35 46 47 36) -4(46 57 58 47) -4(57 68 69 58) -4(68 79 80 69) -4(79 90 91 80) -4(90 101 102 91) -4(101 112 113 102) -4(3 14 15 4) -4(14 25 26 15) -4(25 36 37 26) -4(36 47 48 37) -4(47 58 59 48) -4(58 69 70 59) -4(69 80 81 70) -4(80 91 92 81) -4(91 102 103 92) -4(102 113 114 103) -4(4 15 16 5) -4(15 26 27 16) -4(26 37 38 27) -4(37 48 49 38) -4(48 59 60 49) -4(59 70 71 60) -4(70 81 82 71) -4(81 92 93 82) -4(92 103 104 93) -4(103 114 115 104) -4(5 16 17 6) -4(16 27 28 17) -4(27 38 39 28) -4(38 49 50 39) -4(49 60 61 50) -4(60 71 72 61) -4(71 82 83 72) -4(82 93 94 83) -4(93 104 105 94) -4(104 115 116 105) -4(6 17 18 7) -4(17 28 29 18) -4(28 39 40 29) -4(39 50 51 40) -4(50 61 62 51) -4(61 72 73 62) -4(72 83 84 73) -4(83 94 95 84) -4(94 105 106 95) -4(105 116 117 106) -4(7 18 19 8) -4(18 29 30 19) -4(29 40 41 30) -4(40 51 52 41) -4(51 62 63 52) -4(62 73 74 63) -4(73 84 85 74) -4(84 95 96 85) -4(95 106 107 96) -4(106 117 118 107) -4(8 19 20 9) -4(19 30 31 20) -4(30 41 42 31) -4(41 52 53 42) -4(52 63 64 53) -4(63 74 75 64) -4(74 85 86 75) -4(85 96 97 86) -4(96 107 108 97) -4(107 118 119 108) -4(9 20 21 10) -4(20 31 32 21) -4(31 42 43 32) -4(42 53 54 43) -4(53 64 65 54) -4(64 75 76 65) -4(75 86 87 76) -4(86 97 98 87) -4(97 108 109 98) -4(108 119 120 109) -4(121 122 133 132) -4(132 133 144 143) -4(143 144 155 154) -4(154 155 166 165) -4(165 166 177 176) -4(176 177 188 187) -4(187 188 199 198) -4(198 199 210 209) -4(209 210 221 220) -4(220 221 232 231) -4(122 123 134 133) -4(133 134 145 144) -4(144 145 156 155) -4(155 156 167 166) -4(166 167 178 177) -4(177 178 189 188) -4(188 189 200 199) -4(199 200 211 210) -4(210 211 222 221) -4(221 222 233 232) -4(123 124 135 134) -4(134 135 146 145) -4(145 146 157 156) -4(156 157 168 167) -4(167 168 179 178) -4(178 179 190 189) -4(189 190 201 200) -4(200 201 212 211) -4(211 212 223 222) -4(222 223 234 233) -4(124 125 136 135) -4(135 136 147 146) -4(146 147 158 157) -4(157 158 169 168) -4(168 169 180 179) -4(179 180 191 190) -4(190 191 202 201) -4(201 202 213 212) -4(212 213 224 223) -4(223 224 235 234) -4(125 126 137 136) -4(136 137 148 147) -4(147 148 159 158) -4(158 159 170 169) -4(169 170 181 180) -4(180 181 192 191) -4(191 192 203 202) -4(202 203 214 213) -4(213 214 225 224) -4(224 225 236 235) -4(126 127 138 137) -4(137 138 149 148) -4(148 149 160 159) -4(159 160 171 170) -4(170 171 182 181) -4(181 182 193 192) -4(192 193 204 203) -4(203 204 215 214) -4(214 215 226 225) -4(225 226 237 236) -4(127 128 139 138) -4(138 139 150 149) -4(149 150 161 160) -4(160 161 172 171) -4(171 172 183 182) -4(182 183 194 193) -4(193 194 205 204) -4(204 205 216 215) -4(215 216 227 226) -4(226 227 238 237) -4(128 129 140 139) -4(139 140 151 150) -4(150 151 162 161) -4(161 162 173 172) -4(172 173 184 183) -4(183 184 195 194) -4(194 195 206 205) -4(205 206 217 216) -4(216 217 228 227) -4(227 228 239 238) -4(129 130 141 140) -4(140 141 152 151) -4(151 152 163 162) -4(162 163 174 173) -4(173 174 185 184) -4(184 185 196 195) -4(195 196 207 206) -4(206 207 218 217) -4(217 218 229 228) -4(228 229 240 239) -4(130 131 142 141) -4(141 142 153 152) -4(152 153 164 163) -4(163 164 175 174) -4(174 175 186 185) -4(185 186 197 196) -4(196 197 208 207) -4(207 208 219 218) -4(218 219 230 229) -4(229 230 241 240) -) - - -// ************************************************************************* // diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/neighbour b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/neighbour deleted file mode 100644 index 7ee98f1a2..000000000 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/neighbour +++ /dev/null @@ -1,454 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.3 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix"; - case "conjugateCavity"; - instance "constant"; - local "polyMesh"; - - class labelList; - - note "nCells:100 nActiveFaces:420 nActivePoints:242"; - - object neighbour; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -420 -( -1 -10 -2 -11 -3 -12 -4 -13 -5 -14 -6 -15 -7 -16 -8 -17 -9 -18 -19 -11 -20 -12 -21 -13 -22 -14 -23 -15 -24 -16 -25 -17 -26 -18 -27 -19 -28 -29 -21 -30 -22 -31 -23 -32 -24 -33 -25 -34 -26 -35 -27 -36 -28 -37 -29 -38 -39 -31 -40 -32 -41 -33 -42 -34 -43 -35 -44 -36 -45 -37 -46 -38 -47 -39 -48 -49 -41 -50 -42 -51 -43 -52 -44 -53 -45 -54 -46 -55 -47 -56 -48 -57 -49 -58 -59 -51 -60 -52 -61 -53 -62 -54 -63 -55 -64 -56 -65 -57 -66 -58 -67 -59 -68 -69 -61 -70 -62 -71 -63 -72 -64 -73 -65 -74 -66 -75 -67 -76 -68 -77 -69 -78 -79 -71 -80 -72 -81 -73 -82 -74 -83 -75 -84 -76 -85 -77 -86 -78 -87 -79 -88 -89 -81 -90 -82 -91 -83 -92 -84 -93 -85 -94 -86 -95 -87 -96 -88 -97 -89 -98 -99 -91 -92 -93 -94 -95 -96 -97 -98 -99 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 -) - - -// ************************************************************************* // diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/owner b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/owner deleted file mode 100644 index ca612ecdf..000000000 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/owner +++ /dev/null @@ -1,454 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.3 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix"; - case "conjugateCavity"; - instance "constant"; - local "polyMesh"; - - class labelList; - - note "nCells:100 nActiveFaces:420 nActivePoints:242"; - - object owner; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -420 -( -0 -0 -1 -1 -2 -2 -3 -3 -4 -4 -5 -5 -6 -6 -7 -7 -8 -8 -9 -10 -10 -11 -11 -12 -12 -13 -13 -14 -14 -15 -15 -16 -16 -17 -17 -18 -18 -19 -20 -20 -21 -21 -22 -22 -23 -23 -24 -24 -25 -25 -26 -26 -27 -27 -28 -28 -29 -30 -30 -31 -31 -32 -32 -33 -33 -34 -34 -35 -35 -36 -36 -37 -37 -38 -38 -39 -40 -40 -41 -41 -42 -42 -43 -43 -44 -44 -45 -45 -46 -46 -47 -47 -48 -48 -49 -50 -50 -51 -51 -52 -52 -53 -53 -54 -54 -55 -55 -56 -56 -57 -57 -58 -58 -59 -60 -60 -61 -61 -62 -62 -63 -63 -64 -64 -65 -65 -66 -66 -67 -67 -68 -68 -69 -70 -70 -71 -71 -72 -72 -73 -73 -74 -74 -75 -75 -76 -76 -77 -77 -78 -78 -79 -80 -80 -81 -81 -82 -82 -83 -83 -84 -84 -85 -85 -86 -86 -87 -87 -88 -88 -89 -90 -91 -92 -93 -94 -95 -96 -97 -98 -90 -91 -92 -93 -94 -95 -96 -97 -98 -99 -0 -10 -20 -30 -40 -50 -60 -70 -80 -90 -9 -19 -29 -39 -49 -59 -69 -79 -89 -99 -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -0 -10 -20 -30 -40 -50 -60 -70 -80 -90 -1 -11 -21 -31 -41 -51 -61 -71 -81 -91 -2 -12 -22 -32 -42 -52 -62 -72 -82 -92 -3 -13 -23 -33 -43 -53 -63 -73 -83 -93 -4 -14 -24 -34 -44 -54 -64 -74 -84 -94 -5 -15 -25 -35 -45 -55 -65 -75 -85 -95 -6 -16 -26 -36 -46 -56 -66 -76 -86 -96 -7 -17 -27 -37 -47 -57 -67 -77 -87 -97 -8 -18 -28 -38 -48 -58 -68 -78 -88 -98 -9 -19 -29 -39 -49 -59 -69 -79 -89 -99 -0 -10 -20 -30 -40 -50 -60 -70 -80 -90 -1 -11 -21 -31 -41 -51 -61 -71 -81 -91 -2 -12 -22 -32 -42 -52 -62 -72 -82 -92 -3 -13 -23 -33 -43 -53 -63 -73 -83 -93 -4 -14 -24 -34 -44 -54 -64 -74 -84 -94 -5 -15 -25 -35 -45 -55 -65 -75 -85 -95 -6 -16 -26 -36 -46 -56 -66 -76 -86 -96 -7 -17 -27 -37 -47 -57 -67 -77 -87 -97 -8 -18 -28 -38 -48 -58 -68 -78 -88 -98 -9 -19 -29 -39 -49 -59 -69 -79 -89 -99 -) - - -// ************************************************************************* // diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/points b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/points deleted file mode 100644 index 02b6678e0..000000000 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/points +++ /dev/null @@ -1,273 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.3 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix"; - case "conjugateCavity"; - instance "constant"; - local "polyMesh"; - - class vectorField; - object points; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -242 -( -(0 0 0) -(0.01 0 0) -(0.02 0 0) -(0.03 0 0) -(0.04 0 0) -(0.05 0 0) -(0.06 0 0) -(0.07 0 0) -(0.08 0 0) -(0.09 0 0) -(0.1 0 0) -(0 0.01 0) -(0.01 0.01 0) -(0.02 0.01 0) -(0.03 0.01 0) -(0.04 0.01 0) -(0.05 0.01 0) -(0.06 0.01 0) -(0.07 0.01 0) -(0.08 0.01 0) -(0.09 0.01 0) -(0.1 0.01 0) -(0 0.02 0) -(0.01 0.02 0) -(0.02 0.02 0) -(0.03 0.02 0) -(0.04 0.02 0) -(0.05 0.02 0) -(0.06 0.02 0) -(0.07 0.02 0) -(0.08 0.02 0) -(0.09 0.02 0) -(0.1 0.02 0) -(0 0.03 0) -(0.01 0.03 0) -(0.02 0.03 0) -(0.03 0.03 0) -(0.04 0.03 0) -(0.05 0.03 0) -(0.06 0.03 0) -(0.07 0.03 0) -(0.08 0.03 0) -(0.09 0.03 0) -(0.1 0.03 0) -(0 0.04 0) -(0.01 0.04 0) -(0.02 0.04 0) -(0.03 0.04 0) -(0.04 0.04 0) -(0.05 0.04 0) -(0.06 0.04 0) -(0.07 0.04 0) -(0.08 0.04 0) -(0.09 0.04 0) -(0.1 0.04 0) -(0 0.05 0) -(0.01 0.05 0) -(0.02 0.05 0) -(0.03 0.05 0) -(0.04 0.05 0) -(0.05 0.05 0) -(0.06 0.05 0) -(0.07 0.05 0) -(0.08 0.05 0) -(0.09 0.05 0) -(0.1 0.05 0) -(0 0.06 0) -(0.01 0.06 0) -(0.02 0.06 0) -(0.03 0.06 0) -(0.04 0.06 0) -(0.05 0.06 0) -(0.06 0.06 0) -(0.07 0.06 0) -(0.08 0.06 0) -(0.09 0.06 0) -(0.1 0.06 0) -(0 0.07 0) -(0.01 0.07 0) -(0.02 0.07 0) -(0.03 0.07 0) -(0.04 0.07 0) -(0.05 0.07 0) -(0.06 0.07 0) -(0.07 0.07 0) -(0.08 0.07 0) -(0.09 0.07 0) -(0.1 0.07 0) -(0 0.08 0) -(0.01 0.08 0) -(0.02 0.08 0) -(0.03 0.08 0) -(0.04 0.08 0) -(0.05 0.08 0) -(0.06 0.08 0) -(0.07 0.08 0) -(0.08 0.08 0) -(0.09 0.08 0) -(0.1 0.08 0) -(0 0.09 0) -(0.01 0.09 0) -(0.02 0.09 0) -(0.03 0.09 0) -(0.04 0.09 0) -(0.05 0.09 0) -(0.06 0.09 0) -(0.07 0.09 0) -(0.08 0.09 0) -(0.09 0.09 0) -(0.1 0.09 0) -(0 0.1 0) -(0.01 0.1 0) -(0.02 0.1 0) -(0.03 0.1 0) -(0.04 0.1 0) -(0.05 0.1 0) -(0.06 0.1 0) -(0.07 0.1 0) -(0.08 0.1 0) -(0.09 0.1 0) -(0.1 0.1 0) -(0 0 0.01) -(0.01 0 0.01) -(0.02 0 0.01) -(0.03 0 0.01) -(0.04 0 0.01) -(0.05 0 0.01) -(0.06 0 0.01) -(0.07 0 0.01) -(0.08 0 0.01) -(0.09 0 0.01) -(0.1 0 0.01) -(0 0.01 0.01) -(0.01 0.01 0.01) -(0.02 0.01 0.01) -(0.03 0.01 0.01) -(0.04 0.01 0.01) -(0.05 0.01 0.01) -(0.06 0.01 0.01) -(0.07 0.01 0.01) -(0.08 0.01 0.01) -(0.09 0.01 0.01) -(0.1 0.01 0.01) -(0 0.02 0.01) -(0.01 0.02 0.01) -(0.02 0.02 0.01) -(0.03 0.02 0.01) -(0.04 0.02 0.01) -(0.05 0.02 0.01) -(0.06 0.02 0.01) -(0.07 0.02 0.01) -(0.08 0.02 0.01) -(0.09 0.02 0.01) -(0.1 0.02 0.01) -(0 0.03 0.01) -(0.01 0.03 0.01) -(0.02 0.03 0.01) -(0.03 0.03 0.01) -(0.04 0.03 0.01) -(0.05 0.03 0.01) -(0.06 0.03 0.01) -(0.07 0.03 0.01) -(0.08 0.03 0.01) -(0.09 0.03 0.01) -(0.1 0.03 0.01) -(0 0.04 0.01) -(0.01 0.04 0.01) -(0.02 0.04 0.01) -(0.03 0.04 0.01) -(0.04 0.04 0.01) -(0.05 0.04 0.01) -(0.06 0.04 0.01) -(0.07 0.04 0.01) -(0.08 0.04 0.01) -(0.09 0.04 0.01) -(0.1 0.04 0.01) -(0 0.05 0.01) -(0.01 0.05 0.01) -(0.02 0.05 0.01) -(0.03 0.05 0.01) -(0.04 0.05 0.01) -(0.05 0.05 0.01) -(0.06 0.05 0.01) -(0.07 0.05 0.01) -(0.08 0.05 0.01) -(0.09 0.05 0.01) -(0.1 0.05 0.01) -(0 0.06 0.01) -(0.01 0.06 0.01) -(0.02 0.06 0.01) -(0.03 0.06 0.01) -(0.04 0.06 0.01) -(0.05 0.06 0.01) -(0.06 0.06 0.01) -(0.07 0.06 0.01) -(0.08 0.06 0.01) -(0.09 0.06 0.01) -(0.1 0.06 0.01) -(0 0.07 0.01) -(0.01 0.07 0.01) -(0.02 0.07 0.01) -(0.03 0.07 0.01) -(0.04 0.07 0.01) -(0.05 0.07 0.01) -(0.06 0.07 0.01) -(0.07 0.07 0.01) -(0.08 0.07 0.01) -(0.09 0.07 0.01) -(0.1 0.07 0.01) -(0 0.08 0.01) -(0.01 0.08 0.01) -(0.02 0.08 0.01) -(0.03 0.08 0.01) -(0.04 0.08 0.01) -(0.05 0.08 0.01) -(0.06 0.08 0.01) -(0.07 0.08 0.01) -(0.08 0.08 0.01) -(0.09 0.08 0.01) -(0.1 0.08 0.01) -(0 0.09 0.01) -(0.01 0.09 0.01) -(0.02 0.09 0.01) -(0.03 0.09 0.01) -(0.04 0.09 0.01) -(0.05 0.09 0.01) -(0.06 0.09 0.01) -(0.07 0.09 0.01) -(0.08 0.09 0.01) -(0.09 0.09 0.01) -(0.1 0.09 0.01) -(0 0.1 0.01) -(0.01 0.1 0.01) -(0.02 0.1 0.01) -(0.03 0.1 0.01) -(0.04 0.1 0.01) -(0.05 0.1 0.01) -(0.06 0.1 0.01) -(0.07 0.1 0.01) -(0.08 0.1 0.01) -(0.09 0.1 0.01) -(0.1 0.1 0.01) -) - - -// ************************************************************************* // diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution index acba539a4..84d091e83 100644 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution +++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution @@ -18,31 +18,34 @@ FoamFile solvers { - p PCG + p { + solver PCG; preconditioner DIC; tolerance 1e-06; relTol 0; }; - U PBiCG + U { + solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; }; - T+T BiCG + T+T { + solver BiCG; preconditioner { - type Cholesky; + preconditioner Cholesky; } - minIter 0; - maxIter 1000; - tolerance 1e-6; - relTol 0.0; + minIter 0; + maxIter 1000; + tolerance 1e-6; + relTol 0.0; }; } diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/boundary b/tutorials/coupled/conjugateHeatFoam/heatedBlock/boundary similarity index 100% rename from tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/boundary rename to tutorials/coupled/conjugateHeatFoam/heatedBlock/boundary From 052f8320788d227c8b431feb25b1be8f2810e978 Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Sat, 16 Oct 2010 13:25:27 +0200 Subject: [PATCH 3/6] reduced verbosity of blockLduMatrix --- etc/controlDict | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/controlDict b/etc/controlDict index a589f4c9b..a8651abf6 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -34,7 +34,7 @@ Documentation DebugSwitches { - BlockLduMatrix 2; + BlockLduMatrix 1; CircumferentialAveragingInterpolation 0; mixingPlanePolyPatch 1; From 03bf9da389454c74934f28a4fe3431293ed92f9d Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Sun, 17 Oct 2010 10:53:15 +0100 Subject: [PATCH 4/6] change of format: T+T --- .../conjugateHeatFoam/conjugateCavity/system/fvSolution | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution index acba539a4..df8a40cb9 100644 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution +++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution @@ -34,9 +34,7 @@ solvers T+T BiCG { - preconditioner - { - type Cholesky; + preconditioner Cholesky; } minIter 0; From a5e9993ba7b621c6088ebdfaf9167e686b0e7377 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Sun, 17 Oct 2010 10:54:16 +0100 Subject: [PATCH 5/6] Added boundary: needed for automatic un script --- .../conjugateCavity/boundary | 67 +++++++++++++++++++ .../conjugateHeatFoam/heatedBlock/boundary | 60 +++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 tutorials/coupled/conjugateHeatFoam/conjugateCavity/boundary create mode 100644 tutorials/coupled/conjugateHeatFoam/heatedBlock/boundary diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/boundary b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/boundary new file mode 100644 index 000000000..201f7ce3e --- /dev/null +++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/boundary @@ -0,0 +1,67 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.3 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix"; + case "conjugateCavity"; + instance "constant"; + local "polyMesh"; + + class polyBoundaryMesh; + object boundary; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +5 +( +movingWall +{ + type wall; + nFaces 10; + startFace 180; +} + +left +{ + type wall; + nFaces 10; + startFace 190; +} + +right +{ + type regionCouple; + nFaces 10; + startFace 200; + + shadowRegion solid; + shadowPatch left; + attached on; +} + +bottom +{ + type wall; + nFaces 10; + startFace 210; +} + +frontAndBack +{ + type empty; + nFaces 200; + startFace 220; +} +) + +// ************************************************************************* // diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/boundary b/tutorials/coupled/conjugateHeatFoam/heatedBlock/boundary new file mode 100644 index 000000000..aa00a3f77 --- /dev/null +++ b/tutorials/coupled/conjugateHeatFoam/heatedBlock/boundary @@ -0,0 +1,60 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.3 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix"; + case "heatedBlock"; + instance "constant"; + local "polyMesh"; + + class polyBoundaryMesh; + object boundary; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +4 +( +topAndBottom +{ + type patch; + nFaces 20; + startFace 180; +} + +left +{ + type regionCouple; + nFaces 10; + startFace 200; + + shadowRegion region0; + shadowPatch right; + attached on; +} + +right +{ + type patch; + nFaces 10; + startFace 210; +} + +frontAndBack +{ + type empty; + nFaces 200; + startFace 220; +} +) + +// ************************************************************************* // From 5b3578acb7d28dc6cd74c1fa115bee477be15b9d Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Sun, 17 Oct 2010 19:13:57 +0100 Subject: [PATCH 6/6] Removing duplicate model --- .../viscoelasticLaws/S-MDCPP/S-MDCPP.C | 143 ----------------- .../viscoelasticLaws/S-MDCPP/S-MDCPP.H | 147 ------------------ 2 files changed, 290 deletions(-) delete mode 100644 src/transportModels/viscoelastic/viscoelasticLaws/S-MDCPP/S-MDCPP.C delete mode 100644 src/transportModels/viscoelastic/viscoelasticLaws/S-MDCPP/S-MDCPP.H diff --git a/src/transportModels/viscoelastic/viscoelasticLaws/S-MDCPP/S-MDCPP.C b/src/transportModels/viscoelastic/viscoelasticLaws/S-MDCPP/S-MDCPP.C deleted file mode 100644 index b8bf79adb..000000000 --- a/src/transportModels/viscoelastic/viscoelasticLaws/S-MDCPP/S-MDCPP.C +++ /dev/null @@ -1,143 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "S_MDCPP.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(S_MDCPP, 0); - addToRunTimeSelectionTable(viscoelasticLaw, S_MDCPP, dictionary); -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::S_MDCPP::S_MDCPP -( - const word& name, - const volVectorField& U, - const surfaceScalarField& phi, - const dictionary& dict -) -: - viscoelasticLaw(name, U, phi), - tau_ - ( - IOobject - ( - "tau" + name, - U.time().timeName(), - U.mesh(), - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - U.mesh() - ), - I_ - ( - dimensionedSymmTensor - ( - "I", - dimensionSet(0, 0, 0, 0, 0, 0, 0), - symmTensor - ( - 1, 0, 0, - 1, 0, - 1 - ) - ) - ), - rho_(dict.lookup("rho")), - etaS_(dict.lookup("etaS")), - etaP_(dict.lookup("etaP")), - zeta_(dict.lookup("zeta")), - lambdaOb_(dict.lookup("lambdaOb")), - lambdaOs_(dict.lookup("lambdaOs")), - q_(dict.lookup("q")) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::tmp Foam::S_MDCPP::divTau(volVectorField& U) const -{ - dimensionedScalar etaPEff = etaP_; - - return - ( - fvc::div(tau_/rho_, "div(tau)") - - fvc::laplacian(etaPEff/rho_, U, "laplacian(etaPEff,U)") - + fvm::laplacian( (etaPEff + etaS_)/rho_, U, "laplacian(etaPEff+etaS,U)") - ); - -} - - -void Foam::S_MDCPP::correct() -{ - // Velocity gradient tensor - volTensorField L = fvc::grad(U()); - - // Convected derivate term - volTensorField C = tau_ & L; - - // Twice the rate of deformation tensor - volSymmTensorField twoD = twoSymm(L); - - // Lambda (Backbone stretch) - volScalarField Lambda = - Foam::sqrt(1 + tr(tau_)*lambdaOb_*(1 - zeta_)/3/etaP_); - - // Auxiliary field - volScalarField aux = Foam::exp( 2/q_*(Lambda - 1)); - - // Extra function - volScalarField fTau = - aux*(2*lambdaOb_/lambdaOs_*(1 - 1/Lambda) + 1/Foam::sqr(Lambda)); - - // Stress transport equation - fvSymmTensorMatrix tauEqn - ( - fvm::ddt(tau_) - + fvm::div(phi(), tau_) - == - etaP_/lambdaOb_*twoD - + twoSymm(C) - - zeta_/2*((tau_ & twoD) + (twoD & tau_)) - - fvm::Sp(1/lambdaOb_*fTau, tau_) - - ( - 1/lambdaOb_*( etaP_/lambdaOb_/(1 - zeta_)*(fTau - aux)*I_) - ) - ); - - tauEqn.relax(); - tauEqn.solve(); -} - - -// ************************************************************************* // diff --git a/src/transportModels/viscoelastic/viscoelasticLaws/S-MDCPP/S-MDCPP.H b/src/transportModels/viscoelastic/viscoelasticLaws/S-MDCPP/S-MDCPP.H deleted file mode 100644 index f4e32614d..000000000 --- a/src/transportModels/viscoelastic/viscoelasticLaws/S-MDCPP/S-MDCPP.H +++ /dev/null @@ -1,147 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - S_MDCPP - -Description - S-MDCPP non linear viscoelastic fluid model: - Wei Wang, Xikui Li and Xianhong Han, - Journal of Non-Newtonian Fluid Mechanics, 165,1480-1493, 2010. - -Author - Jovani L. Favero. All rights reserved - -SourceFiles - S_MDCPP.C - -\*---------------------------------------------------------------------------*/ - -#ifndef S_MDCPP_H -#define S_MDCPP_H - -#include "viscoelasticLaw.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class S_MDCPP Declaration -\*---------------------------------------------------------------------------*/ - -class S_MDCPP -: - public viscoelasticLaw -{ - // Private data - - //- Transported viscoelastic stress - volSymmTensorField tau_; - - //- Identity tensor - dimensionedSymmTensor I_; - - // Model constants - - //- Density - dimensionedScalar rho_; - - //- Solvent viscosity - dimensionedScalar etaS_; - - //- Zero shear rate polymer viscosity - dimensionedScalar etaP_; - - //- Material parameter, defining the amount of anisotropy - dimensionedScalar zeta_; - - //- Relaxation time of the backbone tube orientation - dimensionedScalar lambdaOb_; - - //- Relaxation time for the stretch - dimensionedScalar lambdaOs_; - - //- Amount of arms at the end of a backbone - dimensionedScalar q_; - - - // Private Member Functions - - //- Disallow default bitwise copy construct - S_MDCPP(const S_MDCPP&); - - //- Disallow default bitwise assignment - void operator=(const S_MDCPP&); - - -public: - - //- Runtime type information - TypeName("S-MDCPP"); - - // Constructors - - //- Construct from components - S_MDCPP - ( - const word& name, - const volVectorField& U, - const surfaceScalarField& phi, - const dictionary& dict - ); - - - // Destructor - - virtual ~S_MDCPP() - {} - - - // Member Functions - - //- Return the viscoelastic stress tensor - virtual tmp tau() const - { - return tau_; - } - - //- Return the coupling term for the momentum equation - virtual tmp divTau(volVectorField& U) const; - - //- Correct the viscoelastic stress - virtual void correct(); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* //