resolving conflict
Showing
- applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H 0 additions, 4 deletions...ons/solvers/Lagrangian/kinematicParcelFoam/createFields.H
- applications/solvers/combustion/dieselEngineFoam/createSpray.H 0 additions, 4 deletions...cations/solvers/combustion/dieselEngineFoam/createSpray.H
- applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C 5 additions, 1 deletion...ns/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
- applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C 1 addition, 2 deletions...s/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
- applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C 1 addition, 2 deletions...essing/dataConversion/foamToFieldview9/foamToFieldview9.C
- applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C 6 additions, 6 deletions...ities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
- applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C 0 additions, 1 deletion...ilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
- applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H 1 addition, 27 deletions...ilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
- applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C 1 addition, 2 deletions...sing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
- etc/settings.csh 4 additions, 15 deletionsetc/settings.csh
- src/OpenFOAM/db/objectRegistry/objectRegistry.C 6 additions, 2 deletionssrc/OpenFOAM/db/objectRegistry/objectRegistry.C
- src/OpenFOAM/meshes/MeshObject/MeshObject.C 23 additions, 0 deletionssrc/OpenFOAM/meshes/MeshObject/MeshObject.C
- src/OpenFOAM/meshes/MeshObject/MeshObject.H 2 additions, 0 deletionssrc/OpenFOAM/meshes/MeshObject/MeshObject.H
- src/OpenFOAM/meshes/pointMesh/pointMesh.C 6 additions, 1 deletionsrc/OpenFOAM/meshes/pointMesh/pointMesh.C
- src/OpenFOAM/meshes/pointMesh/pointMesh.H 10 additions, 2 deletionssrc/OpenFOAM/meshes/pointMesh/pointMesh.H
- src/OpenFOAM/meshes/polyMesh/polyMesh.C 24 additions, 0 deletionssrc/OpenFOAM/meshes/polyMesh/polyMesh.C
- src/OpenFOAM/meshes/polyMesh/polyMeshClear.C 6 additions, 0 deletionssrc/OpenFOAM/meshes/polyMesh/polyMeshClear.C
- src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C 21 additions, 0 deletionssrc/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
- src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C 0 additions, 1 deletion...utoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
- src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C 1 addition, 1 deletionsrc/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
Please register or sign in to comment