Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Sergio Ferraris
2011-11-23 10:38:41 +00:00
30 changed files with 85 additions and 1150 deletions

View File

@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
div(U,p) Gauss linear;
div(phi,K) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,K) Gauss upwind;

View File

@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
div(U,p) Gauss linear;
div(phi,K) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,K) Gauss upwind;

View File

@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
div(U,p) Gauss linear;
div(phi,K) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,K) Gauss upwind;

View File

@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
div(U,p) Gauss linear;
div(phi,K) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,K) Gauss upwind;

View File

@ -26,7 +26,7 @@ disk1
actuationDiskSourceCoeffs
{
fieldName U;
fieldNames (U);
diskDir (-1 0 0); // orientation of the disk
Cp 0.53; // Cp
Ct 0.58; // Ct
@ -45,7 +45,7 @@ disk2
actuationDiskSourceCoeffs
{
fieldName U;
fieldNames (U);
diskDir (-1 0 0);
Cp 0.53;
Ct 0.58;

View File

@ -31,8 +31,8 @@ dictionaryReplacement
outlet
{
type uniformFixedValue;
uniformValue constant $pressure;
value $pressure;
uniformValue $pressure;
}
inlet
{
@ -67,7 +67,7 @@ dictionaryReplacement
inlet
{
type uniformFixedValue;
uniformValue $turbulentKE;
uniformValue constant $turbulentKE;
}
"terrain_.*"
{
@ -110,12 +110,12 @@ dictionaryReplacement
"terrain_.*"
{
type uniformFixedValue;
uniformValue $flowVelocity;
uniformValue constant $flowVelocity;
}
ground
{
type uniformFixedValue;
uniformValue $flowVelocity;
uniformValue constant $flowVelocity;
}
#include "$FOAM_CASE/0/include/sideAndTopPatches"
"procBoundary.*"