Merge commit 'origin/master' into olesenm

This commit is contained in:
Mark Olesen
2008-06-18 13:14:13 +02:00
79 changed files with 86 additions and 86 deletions

View File

@ -20,7 +20,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lmeshTools \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \

View File

@ -12,7 +12,7 @@ EXE_LIBS = \
-lengine \
-lfiniteVolume \
-lmeshTools \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \

View File

@ -11,6 +11,6 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lfiniteVolume \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lspecie

View File

@ -18,7 +18,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-llagrangian \

View File

@ -16,7 +16,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
EXE_LIBS = \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-llagrangian \

View File

@ -11,7 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lfiniteVolume \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \

View File

@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
EXE_LIBS = \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-lspecie \

View File

@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -10,4 +10,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -7,6 +7,6 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lspecie

View File

@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -11,4 +11,4 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lradiation \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -13,4 +13,4 @@ EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools \

View File

@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools \

View File

@ -10,6 +10,6 @@ EXE_LIBS = \
-ldynamicFvMesh \
-ldynamicMesh \
-lmeshTools \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume

View File

@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools

View File

@ -13,7 +13,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lfiniteVolume \
-ldynamicMesh \
-lmeshTools \

View File

@ -8,7 +8,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lfiniteVolume \
-lbarotropicCompressibilityModel

View File

@ -9,5 +9,5 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lfiniteVolume

View File

@ -0,0 +1,4 @@
hexBlock.C
cfx4ToFoam.C
EXE = $(FOAM_APPBIN)/cfx4ToFoam

View File

@ -23,10 +23,10 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Application
cfxToFoam
cfx4ToFoam
Description
Converts a CFX mesh to FOAM format
Converts a CFX 4 mesh to FOAM format
\*---------------------------------------------------------------------------*/

View File

@ -1,4 +0,0 @@
hexBlock.C
cfxToFoam.C
EXE = $(FOAM_APPBIN)/cfxToFoam

View File

@ -4,7 +4,7 @@ EXE_LIBS = \
-lchemistryModel \
-lcombustionThermophysicalModels \
-lcompressibleLESmodels \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-ldecompositionMethods \
-ldieselSpray \
-ldynamicFvMesh \
@ -17,7 +17,7 @@ EXE_LIBS = \
-lfvMotionSolvers \
-lincompressibleLESmodels \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-linterfaceProperties \
-llagrangianIntermediate \
-llagrangian \

View File

@ -11,9 +11,9 @@ EXE_LIBS = \
$(FOAM_LIBBIN)/postCalc.o \
-lfiniteVolume \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleLESmodels \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lcompressibleLESmodels

View File

@ -5,5 +5,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels

View File

@ -5,6 +5,6 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume

View File

@ -5,5 +5,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels

View File

@ -14,9 +14,9 @@ EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleLESmodels \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lcompressibleLESmodels

View File

@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume

View File

@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
EXE_LIBS = \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-lspecie \

View File

@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume

View File

@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume

View File

@ -124,7 +124,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
};

View File

@ -117,7 +117,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
) = 0;
//- Initialise swap of patch point values

View File

@ -183,7 +183,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);

View File

@ -163,7 +163,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);

View File

@ -154,7 +154,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
)
{}

View File

@ -165,7 +165,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
)
{}

View File

@ -128,7 +128,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
};

View File

@ -140,7 +140,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
)
{}

View File

@ -353,14 +353,14 @@ public:
//- Initialise evaluation of the patch field (do nothing)
virtual void initEvaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
)
{}
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);

View File

@ -131,7 +131,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return face-gradient transform diagonal

View File

@ -196,7 +196,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return face-gradient transform diagonal

View File

@ -168,7 +168,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return the matrix diagonal coefficients corresponding to the

View File

@ -201,7 +201,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return the matrix diagonal coefficients corresponding to the

View File

@ -163,14 +163,14 @@ public:
//- Initialise the evaluation of the patch field
virtual void initEvaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
)
{}
//- Evaluate the patch field, sets Updated to false
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
)
{}

View File

@ -137,7 +137,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return the matrix diagonal coefficients corresponding to the

View File

@ -131,7 +131,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return face-gradient transform diagonal

View File

@ -202,7 +202,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return the matrix diagonal coefficients corresponding to the

View File

@ -165,7 +165,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return face-gradient transform diagonal

View File

@ -127,7 +127,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);

View File

@ -164,7 +164,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Return face-gradient transform diagonal

View File

@ -349,14 +349,14 @@ public:
//- Initialise the evaluation of the patch field
virtual void initEvaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
)
{}
//- Evaluate the patch field, sets Updated to false
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);

View File

@ -223,7 +223,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
//- Write

View File

@ -15,7 +15,7 @@ EXE_INC = \
LIB_LIBS = \
-llagrangian \
-lfiniteVolume \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lcompressibleLESmodels \
-lLESdeltas \
-lliquids \

View File

@ -23,4 +23,4 @@ LIB_LIBS = \
-lspecie \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -12,9 +12,9 @@ LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleLESmodels \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels \
-lcompressibleRASmodels \
-lcompressibleLESmodels

View File

@ -141,7 +141,7 @@ public:
//- Evaluate the patchField
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
};

View File

@ -131,7 +131,7 @@ public:
//- Evaluate the patchField
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
};

View File

@ -12,4 +12,4 @@ kOmegaSST/kOmegaSST.C
wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels
LIB = $(FOAM_LIBBIN)/libcompressibleRASmodels

View File

@ -172,8 +172,8 @@ bool RASmodel::read()
lookup("turbulence") >> turbulence_;
RASmodelCoeffs_ = subDict(type() + "Coeffs");
subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
subDict("wallFunctionCoeffs").lookup("E") >> E_;
subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_);
subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_);
yPlusLam_ = yPlusLam(kappa_, E_);

View File

@ -178,7 +178,7 @@ public:
//- Evaluate the patchField
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);

View File

@ -20,4 +20,4 @@ wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField
wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModels
LIB = $(FOAM_LIBBIN)/libincompressibleRASmodels

View File

@ -169,8 +169,8 @@ bool RASmodel::read()
lookup("turbulence") >> turbulence_;
RASmodelCoeffs_ = subDict(type() + "Coeffs");
subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
subDict("wallFunctionCoeffs").lookup("E") >> E_;
subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_);
subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_);
yPlusLam_ = yPlusLam(kappa_, E_);

View File

@ -178,7 +178,7 @@ public:
//- Evaluate the patchField
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);

View File

@ -133,7 +133,7 @@ public:
//- Evaluate the patchField
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
};

View File

@ -133,7 +133,7 @@ public:
//- Evaluate the patchField
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::Pstream::blocking
const Pstream::commsTypes commsType=Pstream::blocking
);
};

View File

@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume

View File

@ -18,4 +18,4 @@ EXE_LIBS = \
-lcombustionThermophysicalModels \
-lspecie \
-lradiation \
-lcompressibleTurbulenceModels
-lcompressibleRASmodels

View File

@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools