Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop
Conflicts: src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
Showing
- applications/solvers/lagrangian/DPMFoam/DPMFoam.C 1 addition, 1 deletionapplications/solvers/lagrangian/DPMFoam/DPMFoam.C
- applications/solvers/lagrangian/DPMFoam/createFields.H 2 additions, 2 deletionsapplications/solvers/lagrangian/DPMFoam/createFields.H
- applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H 1 addition, 1 deletion...lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
- applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C 1 addition, 1 deletion...nematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
- applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C 1 addition, 1 deletion...pledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
- applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H 1 addition, 1 deletion...rs/lagrangian/uncoupledKinematicParcelFoam/createFields.H
- applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C 1 addition, 1 deletion...coupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
- applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C 2 additions, 2 deletions...lds/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
- applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H 1 addition, 0 deletions...lds/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
- applications/test/dimensionedType/Test-dimensionedType.C 4 additions, 0 deletionsapplications/test/dimensionedType/Test-dimensionedType.C
- applications/test/objectRegistry/Make/files 3 additions, 0 deletionsapplications/test/objectRegistry/Make/files
- applications/test/objectRegistry/Make/options 2 additions, 0 deletionsapplications/test/objectRegistry/Make/options
- applications/test/objectRegistry/Test-objectRegistry.C 278 additions, 0 deletionsapplications/test/objectRegistry/Test-objectRegistry.C
- applications/test/passiveParticle/Test-passiveParticle.C 1 addition, 1 deletionapplications/test/passiveParticle/Test-passiveParticle.C
- applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C 2 additions, 2 deletionsapplications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
- applications/utilities/mesh/generation/blockMesh/blockMesh.C 10 additions, 1 deletionapplications/utilities/mesh/generation/blockMesh/blockMesh.C
- applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C 32 additions, 23 deletions...s/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
- applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict 5 additions, 1 deletion...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
- applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C 233 additions, 60 deletions...sh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
- applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBafflesDict 39 additions, 0 deletions.../manipulation/mergeOrSplitBaffles/mergeOrSplitBafflesDict
Please register or sign in to comment