Henrik Rusche
|
ec515b441f
|
Merged vanilla compatibility branch. Author: Henrik Rusche, FSB team. Merge: Henrik Rusche
Conflicts:
applications/solvers/incompressible/channelFoam/channelFoam.C
applications/solvers/incompressible/icoFoam/icoFoam.C
applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
applications/solvers/incompressible/pimpleFoam/UEqn.H
applications/solvers/incompressible/pimpleFoam/pEqn.H
applications/solvers/incompressible/simpleFoam/UEqn.H
applications/solvers/incompressible/simpleFoam/pEqn.H
src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.H
src/turbulenceModels/compressible/RAS/LRR/LRR.C
src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
src/turbulenceModels/incompressible/LES/laminar/laminar.C
src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C
src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
src/turbulenceModels/incompressible/RAS/laminar/laminar.C
src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes
tutorials/compressible/dbnsFoam/forwardStep/system/fvSchemes
tutorials/compressible/dbnsFoam/shockTube/system/fvSchemes
tutorials/compressible/dbnsTurbFoam/naca0012/system/fvSchemes
tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSchemes
tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSchemes
tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSchemes
tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSchemes
tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSchemes
tutorials/immersedBoundary/porousBumpChannelIb/system/fvSchemes
tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/fvSchemes
tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
tutorials/incompressible/channelFoam/channel395/system/fvSchemes
tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes
tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
tutorials/incompressible/porousSimpleFoam/beaverJoseph/system/fvSchemes
tutorials/incompressible/porousSimpleFoam/porousPlug/system/fvSchemes
tutorials/incompressible/simpleFoam/mixingPlaneAxial/system/fvSchemes
tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes
tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSchemes
tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
Fixing compilation of DBNS
|
2016-05-25 10:31:13 +02:00 |
|