GIT: Resolved conflict on merge from upstream
Showing
- applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H 24 additions, 0 deletions...ons/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
- applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H 46 additions, 7 deletionsapplications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
- applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H 2 additions, 2 deletions...ons/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
- applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H 18 additions, 2 deletionsapplications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
- applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H 20 additions, 7 deletions...ions/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
- applications/solvers/lagrangian/simpleCoalParcelFoam/Make/files 3 additions, 0 deletions...ations/solvers/lagrangian/simpleCoalParcelFoam/Make/files
- applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options 57 additions, 0 deletions...ions/solvers/lagrangian/simpleCoalParcelFoam/Make/options
- applications/solvers/lagrangian/simpleCoalParcelFoam/createClouds.H 9 additions, 0 deletions...ns/solvers/lagrangian/simpleCoalParcelFoam/createClouds.H
- applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C 100 additions, 0 deletions...rs/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
- applications/utilities/mesh/advanced/collapseEdges/collapseDict 2 additions, 9 deletions...ations/utilities/mesh/advanced/collapseEdges/collapseDict
- applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C 2 additions, 2 deletions...VoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
- applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C 22 additions, 1 deletion...s/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
- applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict 22 additions, 5 deletions...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
- applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C 2 additions, 0 deletions...ies/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
- applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C 1 addition, 1 deletion...ties/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
- applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C 1 addition, 1 deletion...ies/parallelProcessing/decomposePar/domainDecomposition.C
- applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H 1 addition, 1 deletion...ies/parallelProcessing/decomposePar/domainDecomposition.H
- applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C 2 additions, 2 deletions...elProcessing/decomposePar/domainDecompositionDistribute.C
- applications/utilities/parallelProcessing/decomposePar/readFields.C 2 additions, 2 deletions...ns/utilities/parallelProcessing/decomposePar/readFields.C
- applications/utilities/parallelProcessing/decomposePar/readFields.H 1 addition, 1 deletion...ns/utilities/parallelProcessing/decomposePar/readFields.H
Please register or sign in to comment