GIT: resolved merge conflict
Showing
- applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H 1 addition, 1 deletion...s/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
- applications/solvers/multiphase/multiphaseEulerFoam/Make/options 1 addition, 0 deletions...tions/solvers/multiphase/multiphaseEulerFoam/Make/options
- applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C 140 additions, 47 deletions...ons/utilities/mesh/manipulation/checkMesh/checkGeometry.C
- applications/utilities/mesh/manipulation/moveDynamicMesh/Make/options 2 additions, 0 deletions.../utilities/mesh/manipulation/moveDynamicMesh/Make/options
- applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C 85 additions, 1 deletion...ities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
- applications/utilities/postProcessing/wall/wallHeatFlux/Make/options 6 additions, 3 deletions...s/utilities/postProcessing/wall/wallHeatFlux/Make/options
- applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H 31 additions, 18 deletions...utilities/postProcessing/wall/wallHeatFlux/createFields.H
- applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C 10 additions, 2 deletions...utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
- applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C 5 additions, 4 deletions...ies/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
- applications/utilities/preProcessing/applyBoundaryLayer/createFields.H 3 additions, 3 deletions...utilities/preProcessing/applyBoundaryLayer/createFields.H
- bin/tools/CleanFunctions 1 addition, 1 deletionbin/tools/CleanFunctions
- src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C 30 additions, 2 deletions...hes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
- src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C 14 additions, 3 deletions...M/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
- src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C 48 additions, 3 deletionssrc/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
- src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H 27 additions, 1 deletionsrc/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
- src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C 0 additions, 1 deletion...termediate/clouds/Templates/ReactingCloud/ReactingCloud.C
- src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C 3 additions, 2 deletions...diate/parcels/Templates/KinematicParcel/KinematicParcel.C
- src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H 18 additions, 6 deletions...iate/parcels/Templates/KinematicParcel/KinematicParcelI.H
- src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H 1 addition, 0 deletions...mediate/parcels/Templates/ReactingParcel/ReactingParcel.H
- src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H 8 additions, 2 deletions...ediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
Please register or sign in to comment