zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andy
2012-12-10 15:25:24 +00:00
parent 2d3dc0b1f6 7777493411
commit b7492abbdd
17 changed files with 58 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/utilities/preProcessing/setFields/setFields.C
View File

@ -227,7 +227,11 @@ bool setFaceFieldType
// Override
bool hasWarned = false;
labelList nChanged(field.boundaryField().size(), 0);
labelList nChanged
(
returnReduce(field.boundaryField().size(), maxOp<label>()),
0
);
forAll(selectedFaces, i)
{
label facei = selectedFaces[i];

7
src/OpenFOAM/db/dictionary/entry/entryIO.C
View File

@ -117,11 +117,12 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
if (keyword.size() > 2 && keyword[1] == token::BEGIN_BLOCK)
{
// Recursive substitution mode. Replace between {} with
// expansion.
// expansion and then let standard variable expansion deal
// with rest.
string s(keyword(2, keyword.size()-3));
// Substitute dictionary and environment variables. Allow
// Substitute dictionary and environment variables. Do not allow
// empty substitutions.
stringOps::inplaceExpand(s, parentDict, true, true);
stringOps::inplaceExpand(s, parentDict, true, false);
keyword.std::string::replace(1, keyword.size()-1, s);
}
parentDict.substituteScopedKeyword(keyword);

17
src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
View File

@ -47,13 +47,11 @@ bool Foam::primitiveEntry::expandVariable
{
if (w.size() > 2 && w[0] == '$' && w[1] == token::BEGIN_BLOCK)
{
// Recursive substitution mode. Replace between {} with
// expansion.
// Recursive substitution mode. Replace between {} with expansion.
string s(w(2, w.size()-3));
// Substitute dictionary and environment variables. Allow
// Substitute dictionary and environment variables. Do not allow
// empty substitutions.
stringOps::inplaceExpand(s, dict, true, true);
stringOps::inplaceExpand(s, dict, true, false);
string newW(w);
newW.std::string::replace(1, newW.size()-1, s);
@ -83,6 +81,15 @@ bool Foam::primitiveEntry::expandVariable
if (envStr.empty())
{
FatalIOErrorIn
(
"primitiveEntry::expandVariable"
"(const string&, const dictionary&",
dict
) << "Illegal dictionary entry or environment variable name "
<< varName << endl << "Valid dictionary entries are "
<< dict.toc() << exit(FatalIOError);
return false;
}
append(tokenList(IStringStream('(' + envStr + ')')()));

2
src/OpenFOAM/primitives/strings/stringOps/stringOps.C
View File

@ -312,7 +312,7 @@ Foam::string Foam::stringOps::getVariable
" const bool\n"
")\n",
dict
) << "Cannot find environment variable "
) << "Cannot find dictionary variable "
<< name << exit(FatalIOError);
}

11
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
View File

@ -23,13 +23,7 @@ boundaryField
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type fixedValue;
value uniform 265;
}
igloo_region0
wall
{
type fixedValue;
value uniform 265;
@ -43,8 +37,7 @@ boundaryField
twoFridgeFreezers_herring_1
{
type fixedValue;
value uniform 303;
$twoFridgeFreezers_seal_0;
}
}

20
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
View File

@ -23,25 +23,7 @@ boundaryField
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type fixedValue;
value uniform (0 0 0);
}
igloo_region0
{
type fixedValue;
value uniform (0 0 0);
}
twoFridgeFreezers_seal_0
{
type fixedValue;
value uniform (0 0 0);
}
twoFridgeFreezers_herring_1
wall
{
type fixedValue;
value uniform (0 0 0);

53
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
View File

@ -1,53 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type alphatWallFunction;
value uniform 0;
}
igloo_region0
{
type alphatWallFunction;
value uniform 0;
}
twoFridgeFreezers_seal_0
{
type alphatWallFunction;
value uniform 0;
}
twoFridgeFreezers_herring_1
{
type alphatWallFunction;
value uniform 0;
}
}
// ************************************************************************* //

20
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
View File

@ -24,25 +24,7 @@ boundaryField
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type epsilonWallFunction;
value uniform 0.01;
}
igloo_region0
{
type epsilonWallFunction;
value uniform 0.01;
}
twoFridgeFreezers_seal_0
{
type epsilonWallFunction;
value uniform 0.01;
}
twoFridgeFreezers_herring_1
wall
{
type epsilonWallFunction;
value uniform 0.01;

20
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
View File

@ -24,25 +24,7 @@ boundaryField
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type kqRWallFunction;
value uniform 0.1;
}
igloo_region0
{
type kqRWallFunction;
value uniform 0.1;
}
twoFridgeFreezers_seal_0
{
type kqRWallFunction;
value uniform 0.1;
}
twoFridgeFreezers_herring_1
wall
{
type kqRWallFunction;
value uniform 0.1;

23
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat
View File

@ -24,28 +24,7 @@ boundaryField
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
igloo_region0
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
twoFridgeFreezers_seal_0
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
twoFridgeFreezers_herring_1
wall
{
type kappatJayatillekeWallFunction;
Prt 0.85;

20
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
View File

@ -24,25 +24,7 @@ boundaryField
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type nutkWallFunction;
value uniform 0;
}
igloo_region0
{
type nutkWallFunction;
value uniform 0;
}
twoFridgeFreezers_seal_0
{
type nutkWallFunction;
value uniform 0;
}
twoFridgeFreezers_herring_1
wall
{
type nutkWallFunction;
value uniform 0;

20
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
View File

@ -23,25 +23,7 @@ boundaryField
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type calculated;
value $internalField;
}
igloo_region0
{
type calculated;
value $internalField;
}
twoFridgeFreezers_seal_0
{
type calculated;
value $internalField;
}
twoFridgeFreezers_herring_1
wall
{
type calculated;
value $internalField;

23
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
View File

@ -23,28 +23,7 @@ boundaryField
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type fixedFluxPressure;
rho rhok;
value uniform 0;
}
igloo_region0
{
type fixedFluxPressure;
rho rhok;
value uniform 0;
}
twoFridgeFreezers_seal_0
{
type fixedFluxPressure;
rho rhok;
value uniform 0;
}
twoFridgeFreezers_herring_1
wall
{
type fixedFluxPressure;
rho rhok;

3
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
View File

@ -78,7 +78,8 @@ boundary
ground
{
type wall;
type wall;
inGroups (wall);
faces
(
(0 3 2 1)

7
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
View File

@ -15,6 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs
(
"libincompressibleTurbulenceModel.so"
"libincompressibleRASModels.so"
"libincompressibleTransportModels.so"
);
application buoyantBoussinesqSimpleFoam;
startFrom startTime;

4
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
View File

@ -15,9 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 6;
numberOfSubdomains 2;
method hierarchical;
method scotch;
simpleCoeffs
{

16
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
View File

@ -148,12 +148,28 @@ castellatedMeshControls
level (3 3);
}
}
// Optional specification of patch type (default is wall). No
// constraint types (cyclic, symmetry) etc. are allowed.
patchInfo
{
type wall;
inGroups (wall);
}
}
"iglo.*"
{
// Surface-wise min and max refinement level
level (1 1);
// Optional specification of patch type (default is wall). No
// constraint types (cyclic, symmetry) etc. are allowed.
patchInfo
{
type wall;
inGroups (wall);
}
}
}