resolving conflict
Showing
- Allwmake 8 additions, 8 deletionsAllwmake
- applications/Allwmake 4 additions, 1 deletionapplications/Allwmake
- applications/solvers/compressible/rhoPimpleFoam/UEqn.H 30 additions, 19 deletionsapplications/solvers/compressible/rhoPimpleFoam/UEqn.H
- applications/solvers/compressible/rhoPimpleFoam/pEqn.H 14 additions, 3 deletionsapplications/solvers/compressible/rhoPimpleFoam/pEqn.H
- applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C 3 additions, 5 deletions...ations/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
- applications/solvers/incompressible/pimpleFoam/Make/files 3 additions, 0 deletionsapplications/solvers/incompressible/pimpleFoam/Make/files
- applications/solvers/incompressible/pimpleFoam/Make/options 10 additions, 0 deletionsapplications/solvers/incompressible/pimpleFoam/Make/options
- applications/solvers/incompressible/pimpleFoam/UEqn.H 36 additions, 0 deletionsapplications/solvers/incompressible/pimpleFoam/UEqn.H
- applications/solvers/incompressible/pimpleFoam/createFields.H 42 additions, 0 deletions...ications/solvers/incompressible/pimpleFoam/createFields.H
- applications/solvers/incompressible/pimpleFoam/pEqn.H 53 additions, 0 deletionsapplications/solvers/incompressible/pimpleFoam/pEqn.H
- applications/solvers/incompressible/pimpleFoam/pimpleFoam.C 93 additions, 0 deletionsapplications/solvers/incompressible/pimpleFoam/pimpleFoam.C
- applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H 5 additions, 0 deletions...neticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
- applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C 1 addition, 1 deletion...s/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
- applications/utilities/mesh/conversion/Optional/Allwmake 4 additions, 2 deletionsapplications/utilities/mesh/conversion/Optional/Allwmake
- applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C 0 additions, 7 deletions...mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
- applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C 129 additions, 74 deletions...ons/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
- applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasLagrangian.H 0 additions, 19 deletions...ng/dataConversion/foamToEnsightParts/checkHasLagrangian.H
- applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasSprayField.H 0 additions, 15 deletions...ng/dataConversion/foamToEnsightParts/checkHasSprayField.H
- applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasValidField.H 0 additions, 23 deletions...ng/dataConversion/foamToEnsightParts/checkHasValidField.H
- applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightCaseTimes.H 0 additions, 91 deletions...sing/dataConversion/foamToEnsightParts/ensightCaseTimes.H
Please register or sign in to comment