exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'testLoop/PhilipposeRajan' into mergeInterTuts

Browse source
This commit is contained in:
Henrik Rusche 2010-10-17 18:11:26 +02:00
commit 68e9a28eda
32 changed files with 297 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
testHarness/OpenFOAM/1.6-ext/README.txt
View file

@ -48,14 +48,14 @@ a) You can set your local system identifier using the environment variable
b) Install the CMakeLists.txt and CTestConfig.cmake files by executing the following commands:
cp ./CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR
cp ./CMakeFiles/CTestConfig.cmake.openfoam-extend $WM_PROJECT_DIR/CTestConfig.cmake
cp ./CMakeFiles/CTestConfig.cmake.openfoam-extend_of-1.6-ext-testing $WM_PROJECT_DIR/CTestConfig.cmake
c) Run the test harness and push your results on the CDash server on openfoam-extend
cd ./runDir; ./Allrun_Experimental
cd ./runDir; ./Allclean; ./Allrun_Experimental
or
cd ./runDir; ./Allrun_Nightly
cd ./runDir; ./Allclean; ./Allrun_Nightly
2: Instructions for restarting your setup from scratch:
@ -74,5 +74,5 @@ To submit your results to the CDash server on openfoam-extend, just use
the file CTestConfig.cmake.openfoam-extend.
If submitted to the CDash server on openfoam-extend, your results will be displayed here:
http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.5-dev
http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext_testing

2
testHarness/OpenFOAM/1.6-ext/scripts/prepareCasesForTestHarness.sh
View file

@ -44,9 +44,11 @@ ADDITIONAL_SHELL_FUNCTIONS=$2
for AR in `find ${TEST_RUN_DIR} -name Allrun`
do
# Make sure we are using /bin/bash as the activation shell
# Replace the macro runApplication with runApplicationAndReportOnError
mv ${AR} ${AR}.org
sed \
-e s/"#!\/bin\/sh"/"#!\/bin\/bash"/g \
-e s/"runApplication "/"runApplicationAndReportOnError "/g \
-e /RunFunctions/r${ADDITIONAL_SHELL_FUNCTIONS} \
${AR}.org > ${AR}

2
testHarness/README.txt
View file

@ -7,7 +7,7 @@ Directory Structure
===================
OpenFOAM : CMake/CTest scripts for compilation and execution test harness for OpenFOAM.
OpenFOAM/1.5-dev : Test harness for OpenFOAM version 1.5-dev. See the file OpenFOAM/1.5-dev/README.txt for more information
OpenFOAM/1.6-dev : Test harness for OpenFOAM version 1.6-dev. See the file OpenFOAM/1.6-dev/README.txt for more information
OSIG : CMake/CTest scripts for OpenFOAM Special Interest Group (OSIG) test harness
OSIG/TurboMachinery : Test harness for the TurboMachinery OSIG. See the file OSIG/Turbomachinery/README.txt for more information.

14
tutorials/coupled/conjugateHeatFoam/heatedBlock/Allrun Executable file
View file

@ -0,0 +1,14 @@
#!/bin/bash
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name
application=`getApplication`
# Disabling the tutorial.
# Using an exit code != 0 will still flag the tutorial as failed
echo "Warning: This tutorial is currently disabled."
exit -1
runApplication blockMesh
runApplication $application

2
tutorials/incompressible/icoDyMFoam/movingCone/system/controlDict
View file

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
application icoFoamAutoMotion;
application icoDyMFoam;
startFrom startTime;

2
tutorials/incompressible/icoDyMFoam/movingConeMotion/Allrun
View file

@ -6,6 +6,6 @@
application="icoDyMFoam"
compileApplication setMotionMovingCone
runApplication setMotionMovingCone
runApplication blockMesh
runApplication setMotionMovingCone
runApplication $application

2
tutorials/incompressible/pimpleFoam/t-junction/0/U
View file

@ -22,7 +22,7 @@ boundaryField
{
inlet
{
type pressureInletOutletVelocity;
type pressureInletVelocity;
value uniform (0 0 0);
}

12
tutorials/multiphase/cavitatingFoam/throttle/0/k
View file

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -2 0 0];
dimensions [0 2 -2 0 0 0 0];
internalField uniform 10.0;
@ -34,7 +35,8 @@ boundaryField
walls
{
type zeroGradient;
type kqRWallFunction;
value uniform 10.0;
}
frontBack

51
tutorials/multiphase/cavitatingFoam/throttle/0/nut Normal file
View file

@ -0,0 +1,51 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object nut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
inlet
{
type calculated;
value uniform 0;
}
outlet
{
type calculated;
value uniform 0;
}
walls
{
type nutWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
}
frontBack
{
type empty;
}
}
// ************************************************************************* //

18
tutorials/multiphase/cavitatingFoam/throttle/0/omega
View file

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object omega;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 -1 0 0];
dimensions [0 0 -1 0 0 0 0];
internalField uniform 77200;
@ -23,7 +24,7 @@ boundaryField
inlet
{
type turbulentMixingLengthFrequencyInlet;
mixingLength 0.5e-03;
mixingLength 0.0005;
k k;
value uniform 77200;
}
@ -35,7 +36,12 @@ boundaryField
walls
{
type zeroGradient;
type omegaWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
beta1 0.075;
value uniform 77200;
}
frontBack

2
tutorials/multiphase/cavitatingFoam/throttle/Allrun
View file

@ -3,7 +3,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application="rasCavitatingFoam"
application="cavitatingFoam"
refineMeshByCellSet()
{

19
tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties Normal file
View file

@ -0,0 +1,19 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType RASModel;
// ************************************************************************* //

32
tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution
View file

@ -16,36 +16,58 @@ FoamFile
solvers
{
omega PBiCG
omega
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
k PBiCG
k
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
rho PBiCG
rho
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
U PBiCG
U
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
p GAMG
p
{
solver GAMG;
tolerance 1e-8;
relTol 0;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
};
pFinal
{
solver GAMG;
tolerance 1e-8;
relTol 0;

2
tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org → tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/p.org
View file

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object pd;
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

5
tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allclean Executable file
View file

@ -0,0 +1,5 @@
#!/bin/sh
foamCleanTutorials cases
rm -rf processor*
rm -rf 0/p.gz 0/alpha1.gz

4
tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allrun
View file

@ -3,10 +3,10 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory
application="compressibleLesInterFoam"
application="compressibleInterFoam"
runApplication blockMesh
cp 0/alpha1.org 0/alpha1
cp 0/pd.org 0/pd
cp 0/p.org 0/p
runApplication setFields
runApplication $application

22
tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/g Normal file
View file

@ -0,0 +1,22 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class uniformDimensionedVectorField;
location "constant";
object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
value ( 0 -9.81 0 );
// ************************************************************************* //

7
tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
View file

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

21
tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties Normal file
View file

@ -0,0 +1,21 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType LESModel;
// ************************************************************************* //

4
tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes
View file

@ -31,7 +31,7 @@ divSchemes
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss interfaceCompression 1.0;
div(phi,pd) Gauss upwind; //vanLeer; //linear;
div(phi,p) Gauss upwind; //vanLeer; //linear;
div(phi,k) Gauss vanLeer;
@ -56,7 +56,7 @@ snGradSchemes
fluxRequired
{
default no;
pd;
p;
pcorr;
gamma;
}

31
tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution
View file

@ -16,8 +16,9 @@ FoamFile
solvers
{
pcorr PCG
pcorr
{
solver PCG;
preconditioner
{
type GAMG;
@ -40,11 +41,14 @@ solvers
maxIter 100;
};
rho diagonal
{};
pd GAMG
rho
{
solver diagonal;
};
p
{
solver GAMG;
tolerance 1e-7;
relTol 0.01;
@ -59,8 +63,9 @@ solvers
mergeLevels 1;
};
pdFinal PCG
pFinal
{
solver PCG;
preconditioner
{
type GAMG;
@ -85,28 +90,32 @@ solvers
maxIter 20;
};
U smoothSolver
U
{
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-6;
relTol 0;
nSweeps 1;
};
k PBiCG
k
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
B PBiCG
B
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
nuTilda PBiCG
nuTilda
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
@ -122,7 +131,7 @@ PISO
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;
cGamma 1;
cAlpha 4;
}
// ************************************************************************* //

4
tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict
View file

@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
volScalarFieldValue alpha1 1
volScalarFieldValue pd 1e5
volScalarFieldValue p 1e5
);
regions
@ -30,7 +30,7 @@ regions
fieldValues
(
volScalarFieldValue alpha1 0
volScalarFieldValue pd 10e5
volScalarFieldValue p 10e5
);
}

2
tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org → tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/p.org
View file

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object pd.org;
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allclean
View file

@ -2,4 +2,4 @@
foamCleanTutorials cases
rm -rf processor*
rm -rf 0/pd.gz 0/alpha1.gz
rm -rf 0/p.gz 0/alpha1.gz

5
tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allrun
View file

@ -3,12 +3,13 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory
application="compressibleLesInterFoam"
application="compressibleInterFoam"
runApplication blockMesh
cp 0/alpha1.org 0/alpha1
cp 0/pd.org 0/pd
cp 0/p.org 0/p
runApplication setFields
# runApplication $application
runApplication decomposePar
hostname > system/machines
runParallel $application 4 system/machines

22
tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/g Normal file
View file

@ -0,0 +1,22 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class uniformDimensionedVectorField;
location "constant";
object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
value ( 0 -9.81 0 );
// ************************************************************************* //

7
tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
View file

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

21
tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties Normal file
View file

@ -0,0 +1,21 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType LESModel;
// ************************************************************************* //

4
tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes
View file

@ -31,7 +31,7 @@ divSchemes
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss interfaceCompression 1.0;
div(phi,pd) Gauss upwind; //vanLeer; //linear;
div(phi,p) Gauss upwind; //vanLeer; //linear;
div(phi,k) Gauss vanLeer;
@ -56,7 +56,7 @@ snGradSchemes
fluxRequired
{
default no;
pd;
p;
pcorr;
gamma;
}

31
tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution
View file

@ -16,8 +16,9 @@ FoamFile
solvers
{
pcorr PCG
pcorr
{
solver PCG;
preconditioner
{
type GAMG;
@ -40,11 +41,14 @@ solvers
maxIter 100;
};
rho diagonal
{};
pd GAMG
rho
{
solver diagonal;
};
p
{
solver GAMG;
tolerance 1e-7;
relTol 0.01;
@ -59,8 +63,9 @@ solvers
mergeLevels 1;
};
pdFinal PCG
pFinal
{
solver PCG;
preconditioner
{
type GAMG;
@ -85,28 +90,32 @@ solvers
maxIter 20;
};
U smoothSolver
U
{
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-6;
relTol 0;
nSweeps 1;
};
k PBiCG
k
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
B PBiCG
B
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
nuTilda PBiCG
nuTilda
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
@ -122,7 +131,7 @@ PISO
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;
cGamma 1;
cAlpha 4;
}
// ************************************************************************* //

4
tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict
View file

@ -17,7 +17,7 @@ FoamFile
defaultFieldValues
(
volScalarFieldValue alpha1 1
volScalarFieldValue pd 1e5
volScalarFieldValue p 1e5
);
regions
@ -30,7 +30,7 @@ regions
fieldValues
(
volScalarFieldValue alpha1 0
volScalarFieldValue pd 10e5
volScalarFieldValue p 10e5
);
}

2
wmake/rules/linuxGcc/general
View file

@ -1,4 +1,4 @@
CPP = cpp $(GFLAGS)
CPP = cpp $(GFLAGS) -P
LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -ldl