changeDictionary: Simplified by removing the need for the superfluous dictionaryReplacement sub-dictionary

Added the option '-subDict' to specify a sub-dictionary if multiple
replacement sets are present in the same file.  This also provides
backward compatibility by setting '-subDict dictionaryReplacement'
This commit is contained in:
Henry Weller
2016-06-15 09:03:05 +01:00
parent 344f435f54
commit 3d98d6e5c6
25 changed files with 1653 additions and 1711 deletions

View File

@ -14,157 +14,154 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
U
{
U
internalField uniform (0.001 0 0);
boundaryField
{
internalField uniform (0.001 0 0);
boundaryField
minX
{
minX
{
type fixedValue;
value uniform (0.001 0 0);
}
type fixedValue;
value uniform (0.001 0 0);
}
maxX
{
type inletOutlet;
inletValue uniform (0 0 0);
}
maxX
{
type inletOutlet;
inletValue uniform (0 0 0);
}
".*"
{
type fixedValue;
value uniform (0 0 0);
}
".*"
{
type fixedValue;
value uniform (0 0 0);
}
}
}
T
T
{
internalField uniform 300;
boundaryField
{
internalField uniform 300;
boundaryField
minX
{
minX
{
type fixedValue;
value uniform 300;
}
type fixedValue;
value uniform 300;
}
maxX
{
type inletOutlet;
inletValue uniform 300;
}
maxX
{
type inletOutlet;
inletValue uniform 300;
}
".*"
{
type zeroGradient;
value uniform 300;
}
".*"
{
type zeroGradient;
value uniform 300;
}
"bottomWater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod fluidThermo;
value uniform 300;
}
"bottomWater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod fluidThermo;
value uniform 300;
}
}
}
epsilon
epsilon
{
internalField uniform 0.01;
boundaryField
{
internalField uniform 0.01;
boundaryField
minX
{
minX
{
type fixedValue;
value uniform 0.01;
}
type fixedValue;
value uniform 0.01;
}
maxX
{
type inletOutlet;
inletValue uniform 0.01;
}
maxX
{
type inletOutlet;
inletValue uniform 0.01;
}
".*"
{
type epsilonWallFunction;
value uniform 0.01;
}
".*"
{
type epsilonWallFunction;
value uniform 0.01;
}
}
}
k
k
{
internalField uniform 0.1;
boundaryField
{
internalField uniform 0.1;
boundaryField
minX
{
minX
{
type inletOutlet;
inletValue uniform 0.1;
}
type inletOutlet;
inletValue uniform 0.1;
}
maxX
{
type zeroGradient;
value uniform 0.1;
}
maxX
{
type zeroGradient;
value uniform 0.1;
}
".*"
{
type kqRWallFunction;
value uniform 0.1;
}
".*"
{
type kqRWallFunction;
value uniform 0.1;
}
}
}
p_rgh
p_rgh
{
internalField uniform 0;
boundaryField
{
internalField uniform 0;
boundaryField
minX
{
minX
{
type zeroGradient;
value uniform 0;
}
type zeroGradient;
value uniform 0;
}
maxX
{
type fixedValue;
value uniform 0;
}
maxX
{
type fixedValue;
value uniform 0;
}
".*"
{
type fixedFluxPressure;
value uniform 0;
}
".*"
{
type fixedFluxPressure;
value uniform 0;
}
}
}
p
p
{
internalField uniform 0;
boundaryField
{
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type calculated;
value uniform 0;
}
type calculated;
value uniform 0;
}
}
}

View File

@ -14,58 +14,55 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
boundary
{
boundary
minY
{
type patch;
}
minZ
{
type patch;
}
maxZ
{
type patch;
}
}
T
{
internalField uniform 300;
boundaryField
{
".*"
{
type zeroGradient;
value uniform 300;
}
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
heater_to_leftSolid
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
}
minY
{
type patch;
}
minZ
{
type patch;
}
maxZ
{
type patch;
}
}
T
{
internalField uniform 300;
boundaryField
{
".*"
{
type zeroGradient;
value uniform 300;
}
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
heater_to_leftSolid
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
}
minY
{
type fixedValue;
value uniform 500;
}
type fixedValue;
value uniform 500;
}
}
}

View File

@ -14,48 +14,45 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
boundary
{
boundary
minZ
{
minZ
{
type patch;
}
maxZ
{
type patch;
}
type patch;
}
T
maxZ
{
internalField uniform 300;
type patch;
}
}
boundaryField
T
{
internalField uniform 300;
boundaryField
{
".*"
{
".*"
{
type zeroGradient;
value uniform 300;
}
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
type zeroGradient;
value uniform 300;
}
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
leftSolid_to_heater
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
}
leftSolid_to_heater
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
}
}
}

View File

@ -14,38 +14,35 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
boundary
{
boundary
minZ
{
minZ
{
type patch;
}
maxZ
{
type patch;
}
type patch;
}
T
maxZ
{
internalField uniform 300;
type patch;
}
}
boundaryField
T
{
internalField uniform 300;
boundaryField
{
".*"
{
".*"
{
type zeroGradient;
value uniform 300;
}
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
type zeroGradient;
value uniform 300;
}
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
}
}

View File

@ -14,155 +14,152 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
U
{
U
{
internalField uniform (0.1 0 0);
internalField uniform (0.1 0 0);
boundaryField
boundaryField
{
".*"
{
".*"
{
type fixedValue;
value uniform (0 0 0);
}
minX
{
type fixedValue;
value uniform (0.1 0 0);
}
maxX
{
type inletOutlet;
inletValue uniform (0 0 0);
value uniform (0.1 0 0);
}
type fixedValue;
value uniform (0 0 0);
}
minX
{
type fixedValue;
value uniform (0.1 0 0);
}
maxX
{
type inletOutlet;
inletValue uniform (0 0 0);
value uniform (0.1 0 0);
}
}
}
T
T
{
internalField uniform 300;
boundaryField
{
internalField uniform 300;
boundaryField
".*"
{
".*"
{
type zeroGradient;
}
type zeroGradient;
}
minX
{
type fixedValue;
value uniform 300;
}
maxX
{
type inletOutlet;
inletValue uniform 300;
value uniform 300;
}
minX
{
type fixedValue;
value uniform 300;
}
maxX
{
type inletOutlet;
inletValue uniform 300;
value uniform 300;
}
"topAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod fluidThermo;
value uniform 300;
}
"topAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod fluidThermo;
value uniform 300;
}
}
}
epsilon
epsilon
{
internalField uniform 0.01;
boundaryField
{
internalField uniform 0.01;
boundaryField
".*"
{
".*"
{
type epsilonWallFunction;
value uniform 0.01;
}
type epsilonWallFunction;
value uniform 0.01;
}
minX
{
type fixedValue;
value uniform 0.01;
}
maxX
{
type inletOutlet;
inletValue uniform 0.01;
value uniform 0.01;
}
minX
{
type fixedValue;
value uniform 0.01;
}
maxX
{
type inletOutlet;
inletValue uniform 0.01;
value uniform 0.01;
}
}
}
k
k
{
internalField uniform 0.1;
boundaryField
{
internalField uniform 0.1;
boundaryField
".*"
{
".*"
{
type kqRWallFunction;
value uniform 0.1;
}
type kqRWallFunction;
value uniform 0.1;
}
minX
{
type fixedValue;
value uniform 0.1;
}
maxX
{
type inletOutlet;
inletValue uniform 0.1;
value uniform 0.1;
}
minX
{
type fixedValue;
value uniform 0.1;
}
maxX
{
type inletOutlet;
inletValue uniform 0.1;
value uniform 0.1;
}
}
}
p_rgh
p_rgh
{
internalField uniform 1e5;
boundaryField
{
internalField uniform 1e5;
boundaryField
".*"
{
".*"
{
type fixedFluxPressure;
value uniform 1e5;
}
type fixedFluxPressure;
value uniform 1e5;
}
maxX
{
type fixedValue;
value uniform 1e5;
}
maxX
{
type fixedValue;
value uniform 1e5;
}
}
}
p
p
{
internalField uniform 1e5;
boundaryField
{
internalField uniform 1e5;
boundaryField
".*"
{
".*"
{
type calculated;
value uniform 1e5;
}
type calculated;
value uniform 1e5;
}
maxX
{
type calculated;
value uniform 1e5;
}
maxX
{
type calculated;
value uniform 1e5;
}
}
}