Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev
Conflicts: src/meshTools/coordinateSystems/coordinateRotation/localAxesRotation.C
Showing
- applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C 0 additions, 1 deletion...olvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
- 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/Make/files 2 additions, 1 deletionsrc/finiteVolume/Make/files
- src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C 1 addition, 1 deletion...general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
- src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H 1 addition, 1 deletion...general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
- src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimerTemplates.C 1 addition, 1 deletion...orosityModel/DarcyForchheimer/DarcyForchheimerTemplates.C
- src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C 1 addition, 1 deletion...me/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
- src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H 1 addition, 1 deletion...me/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
- src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C 1 addition, 1 deletion...Tools/general/porosityModel/porosityModel/porosityModel.C
- src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H 1 addition, 1 deletion...Tools/general/porosityModel/porosityModel/porosityModel.H
- src/finiteVolume/cfdTools/general/porosityModel/pressureDrop/pressureDrop.C 143 additions, 0 deletions...fdTools/general/porosityModel/pressureDrop/pressureDrop.C
- src/finiteVolume/cfdTools/general/porosityModel/pressureDrop/pressureDrop.H 203 additions, 0 deletions...fdTools/general/porosityModel/pressureDrop/pressureDrop.H
- src/finiteVolume/cfdTools/general/porosityModel/pressureDrop/pressureDropTemplates.C 89 additions, 0 deletions...eneral/porosityModel/pressureDrop/pressureDropTemplates.C
- src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C 3 additions, 3 deletions...an/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
- src/meshTools/coordinateSystems/cartesianCS.C 1 addition, 1 deletionsrc/meshTools/coordinateSystems/cartesianCS.C
Please register or sign in to comment