GIT: merge conflict resolution
Showing
- applications/utilities/mesh/advanced/collapseEdges/collapseDict 15 additions, 10 deletions...ations/utilities/mesh/advanced/collapseEdges/collapseDict
- src/dynamicMesh/polyMeshFilter/polyMeshFilter.C 109 additions, 93 deletionssrc/dynamicMesh/polyMeshFilter/polyMeshFilter.C
- src/dynamicMesh/polyMeshFilter/polyMeshFilter.H 6 additions, 2 deletionssrc/dynamicMesh/polyMeshFilter/polyMeshFilter.H
- src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C 6 additions, 3 deletions...dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
- src/engine/enginePiston/enginePiston.C 1 addition, 1 deletionsrc/engine/enginePiston/enginePiston.C
- src/engine/engineValve/engineValve.C 1 addition, 1 deletionsrc/engine/engineValve/engineValve.C
- src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C 49 additions, 50 deletions...general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
- src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H 3 additions, 6 deletions...general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
- src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimerTemplates.C 13 additions, 8 deletions...orosityModel/DarcyForchheimer/DarcyForchheimerTemplates.C
- src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C 58 additions, 57 deletions...me/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
- src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H 3 additions, 7 deletions...me/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
- src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C 14 additions, 2 deletions...Tools/general/porosityModel/porosityModel/porosityModel.C
- src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H 7 additions, 0 deletions...Tools/general/porosityModel/porosityModel/porosityModel.H
- src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C 4 additions, 4 deletions...Options/sources/derived/rotorDiskSource/rotorDiskSource.C
- src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C 3 additions, 3 deletions...d/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
- src/meshTools/Make/files 4 additions, 3 deletionssrc/meshTools/Make/files
- src/meshTools/coordinateSystems/cartesianCS.C 162 additions, 0 deletionssrc/meshTools/coordinateSystems/cartesianCS.C
- src/meshTools/coordinateSystems/cartesianCS.H 26 additions, 33 deletionssrc/meshTools/coordinateSystems/cartesianCS.H
- src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C 165 additions, 5 deletions...inateSystems/coordinateRotation/EulerCoordinateRotation.C
- src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H 97 additions, 0 deletions...inateSystems/coordinateRotation/EulerCoordinateRotation.H
Please register or sign in to comment