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/noisy3/OpenFOAM/OpenFOAM-2.0.0/

Browse Source
This commit is contained in:
mattijs
2011-06-10 17:23:40 +01:00
parent 4f47ff0219 1bf6d30f47
commit d357f9163b
7 changed files with 4 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
View File

@ -6,9 +6,9 @@
+ turbulence->divDevReff(U)
);
UEqn().relax();
// Add resistance on the actuation disks
actuationDisks.addSu(UEqn());
UEqn().relax();
solve(UEqn() == -fvc::grad(p));

39
src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
View File

@ -24,51 +24,12 @@ License
\*---------------------------------------------------------------------------*/
#include "coalCloud.H"
#include "makeParcelCloudFunctionObjects.H"
// Kinematic
#include "makeThermoParcelForces.H" // thermo variant
#include "makeParcelDispersionModels.H"
#include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
#include "makeParcelPatchInteractionModels.H"
// Thermodynamic
#include "makeParcelHeatTransferModels.H"
// Reacting
#include "makeReactingMultiphaseParcelCompositionModels.H" // MP variant
#include "makeReactingParcelPhaseChangeModels.H"
#include "makeReactingParcelSurfaceFilmModels.H"
// Reacting multiphase
#include "makeReactingMultiphaseParcelDevolatilisationModels.H"
// Coal specific
#include "makeCoalParcelSurfaceReactionModels.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelCloudFunctionObjects(coalCloud);
// Kinematic sub-models
makeThermoParcelForces(coalCloud);
makeParcelDispersionModels(coalCloud);
makeReactingMultiphaseParcelInjectionModels(coalCloud);
makeParcelPatchInteractionModels(coalCloud);
// Thermo sub-models
makeParcelHeatTransferModels(coalCloud);
// Reacting sub-models
makeReactingMultiphaseParcelCompositionModels(coalCloud);
makeReactingParcelPhaseChangeModels(coalCloud);
// Reacting multiphase sub-models
makeReactingMultiphaseParcelDevolatilisationModels(coalCloud);
makeReactingParcelSurfaceFilmModels(coalCloud);
makeCoalParcelSurfaceReactionModels(coalCloud);
}

2
src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
View File

@ -37,8 +37,6 @@ License
#define makeCoalParcelSurfaceReactionModels(CloudType) \
\
makeSurfaceReactionModel(CloudType); \
makeSurfaceReactionModelType(NoSurfaceReaction, CloudType); \
makeSurfaceReactionModelType(COxidationDiffusionLimitedRate, CloudType); \
makeSurfaceReactionModelType \
( \

11
src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
View File

@ -327,17 +327,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define defineParcelTypeNameAndDebug(Type, DebugSwitch) \
template<> \
const Foam::word DsmcParcel<Type>::typeName(#Type); \
template<> \
int DsmcParcel<Type>::debug \
( \
Foam::debug::debugSwitch(#Type, DebugSwitch) \
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "DsmcParcel.C"
#endif

1
src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
View File

@ -31,7 +31,6 @@ namespace Foam
{
// defineTypeNameAndDebug(dsmcParcel, 0);
// defineParticleTypeNameAndDebug(dsmcParcel, 0);
// defineParcelTypeNameAndDebug(dsmcParcel, 0);
}

11
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
View File

@ -687,17 +687,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define defineParcelTypeNameAndDebug(Type, DebugSwitch) \
template<> \
const Foam::word KinematicParcel<Type>::typeName(#Type); \
template<> \
int KinematicParcel<Type>::debug \
( \
Foam::debug::debugSwitch(#Type, DebugSwitch) \
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "KinematicParcel.C"
#endif

3
wmake/rules/linux64Icc/c++Opt
View File

@ -1,2 +1,3 @@
c++DBUG =
c++OPT = -xSSE3 -O3 -no-prec-div
#c++OPT = -xSSE3 -O3 -no-prec-div
c++OPT = -xSSE3 -O1 -no-prec-div