diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
index 440d57f9a45fda687c0e55a21e36874df2c3f6b0..9efc640f005d44164eda73a0346757e03b9c266b 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
@@ -36,9 +36,9 @@ Description
Usage
\table
Property | Description | Required | Default value
- kappa | thermal conductivity option | yes |
- Cp | Heat capacity [J/Kg K]] | yes |
- mass | Total mass [Kg] | yes |
+ kappaMethod | thermal conductivity option | yes |
+ Cp | Heat capacity [J/kg.K] | yes |
+ mass | Total mass [kg] | yes |
\endtable
Example of the boundary condition specification:
@@ -47,7 +47,7 @@ Usage
{
type lumpedMassWallTemperature;
kappaMethod fluidThermo;
- kappaName none;
+ kappa none;
mass 1000;
Cp 4100;
value uniform 300.0;
@@ -86,7 +86,7 @@ private:
//- Specifc heat capacity [J/kg/K]
scalar Cp_;
- //- Mass / [kg]
+ //- Mass [kg]
scalar mass_;
//- Current time index (used for updating)
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index b3e4a17a78dc577a9e8958c8e683038816d464e4..be069684f361db58f9657d4bcb246015a89312ab 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -204,10 +204,10 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
<< "Did not find field " << kappaName_
<< " on mesh " << mesh.name() << " patch " << patch_.name()
<< nl
- << "Please set 'kappa' to one of "
+ << "Please set 'kappaMethod' to one of "
<< KMethodTypeNames_.toc()
- << " and 'kappaName' to the name of the volScalar"
- << " or volSymmTensor field (if kappa=lookup)"
+ << " and 'kappa' to the name of the volScalar"
+ << " or volSymmTensor field (if kappaMethod=lookup)"
<< exit(FatalError);
}
@@ -218,9 +218,10 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
{
FatalErrorInFunction
<< "Unimplemented method " << KMethodTypeNames_[method_] << nl
- << "Please set 'kappa' to one of " << KMethodTypeNames_.toc()
- << " and 'kappaName' to the name of the volScalar"
- << " or volSymmTensor field (if kappa=lookup)"
+ << "Please set 'kappaMethod' to one of "
+ << KMethodTypeNames_.toc()
+ << " and 'kappa' to the name of the volScalar"
+ << " or volSymmTensor field (if kappaMethod=lookup)"
<< exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 1e507a5dfd5de242cd4b90526119254643ccff3f..2c5d40f1709bef01dfc80f2f2b07b21441d26e08 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -71,7 +71,7 @@ flowRateInletVelocityFvPatchVectorField
{
volumetric_ = false;
flowRate_ = Function1<scalar>::New("massFlowRate", dict);
- rhoName_ = word(dict.lookupOrDefault<word>("rho", "rho"));
+ rhoName_ = dict.lookupOrDefault<word>("rho", "rho");
}
else
{
diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index 7f1f12c33d7096dbb30c1d09fb4a8fc62c5d77b4..4f73902c89c293675a9e5862a013ab5b128f4953 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -79,8 +79,8 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::pressure::rhoScale
FatalErrorInFunction
<< type() << " " << name() << ": "
<< "pressure identified as incompressible, but reference "
- << "density is not set. Please set rhoName to rhoInf, and "
- << "set an appropriate value for rhoInf"
+ << "density is not set. Please set 'rho' to 'rhoInf', and "
+ << "set an appropriate value for 'rhoInf'"
<< exit(FatalError);
}
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
index 6375c32c863a83208e1d890b0800d549f6a6ad76..abdd47b6b8084a996382b14975cd29a25dae43d4 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
@@ -34,9 +34,9 @@ Description
{
type filmPyrolysisRadiativeCoupledMixed;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
+ kappa none;
Qr Qr;
- kappaName none;
filmDeltaDry 0.0;
filmDeltaWet 3e-4;
value $internalField;
@@ -66,7 +66,7 @@ Description
Notes:
- - kappa and \c kappaName are inherited from temperatureCoupledBase.
+ - \c kappaMethod and \c kappa are inherited from temperatureCoupledBase.
- Qr is the radiative flux defined in the radiation model.
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
index 0bb7a092cedd9c3c6874eaf4b375324bf5ca74e6..6c4198c3adcc2072c3c81aaa8c81672411ba0c24 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
@@ -52,8 +52,8 @@ Usage
// Underlaying coupled boundary condition
Tnbr T;
- kappa fluidThermo; // or solidThermo
- KappaName none;
+ kappaMethod fluidThermo; // or solidThermo
+ kappa none;
QrNbr Qr;//or none.Name of Qr field on neighbourregion
Qr none;// or none.Name of Qr field on localregion
value uniform 300;
@@ -122,8 +122,8 @@ Usage
<slavePatchName>
{
type compressible::thermalBaffle;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
value uniform 300;
\endverbatim
@@ -132,16 +132,16 @@ Usage
bottom
{
type compressible::thermalBaffle;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 300;
}
top
{
type compressible::thermalBaffle;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 300;
}
\endverbatim
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
index 11fc5abcb0cebcb2740d0fce5998cec70a21c15b..9eea39ef7783c8c78f79f5c6a437433d2d127543 100644
--- a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,6 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
-
Foam::
compressible::
humidityTemperatureCoupledMixedFvPatchScalarField
@@ -94,8 +93,8 @@ Description
myInterfacePatchName
{
type thermalHumidityCoupledMixed;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
// Modes of operation: inert, condensation, vaporization, condEvap
mode condEvap;
@@ -137,8 +136,8 @@ Description
myInterfacePatchName
{
type thermalInertiaMassTransferCoupledMixed;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 260;
}
\endverbatim
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
similarity index 94%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
index 6dca98e236ad06a267079706515888c0c05ae08c..6b8b0724098c46fa2556c42f6746f95f66833375 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
@@ -30,10 +30,10 @@ boundaryField
{
type lumpedMassWallTemperature;
kappaMethod fluidThermo;
- kappaName none;
+ kappa none;
mass 1000;
Cp 4100;
- value uniform 300.0;
+ value uniform 300;
}
fixedWalls
@@ -42,4 +42,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.orig b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.orig
deleted file mode 100644
index 6dca98e236ad06a267079706515888c0c05ae08c..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.orig
+++ /dev/null
@@ -1,45 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: plus |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- floor
- {
- type fixedValue;
- value uniform 300;
- }
-
- ceiling
- {
- type lumpedMassWallTemperature;
- kappaMethod fluidThermo;
- kappaName none;
- mass 1000;
- Cp 4100;
- value uniform 300.0;
- }
-
- fixedWalls
- {
- type zeroGradient;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
index 778f3b399ac51ada05bbfd76cc3fe348f020dc3f..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-\cp 0/T.orig 0/T
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
index b18d70e448c13fbaf243f01cff301f0dbb1c7193..c61e8a418c5e877e323463c94419ef50726b9fd8 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
@@ -4,11 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication blockMesh
+
+restore0Dir
+
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------