Commit 050bcfaf authored 14 years ago by andy

GIT: Conflict resolution

parents 29c48536 61d21f76

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

applications/test/dataEntry/Make/options 2 additions, 1 deletion

applications/test/dataEntry/Make/options
applications/test/maxMem/Make/options 1 addition, 1 deletion

applications/test/maxMem/Make/options
bin/foamRunTutorials 25 additions, 24 deletions

bin/foamRunTutorials
src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H 4 additions, 4 deletions

src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H
src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C 1 addition, 1 deletion

...s/multiComponentSolidMixture/multiComponentSolidMixture.C
src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C 1 addition, 1 deletion

...mo/mixtures/multiComponentMixture/multiComponentMixture.C
tutorials/basic/potentialFoam/cylinder/Allrun 4 additions, 10 deletions

tutorials/basic/potentialFoam/cylinder/Allrun
tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean 2 additions, 1 deletion

...ls/combustion/fireFoam/les/oppositeBurningPanels/Allclean
tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun 3 additions, 0 deletions

...ials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
tutorials/compressible/rhoCentralFoam/Allclean 0 additions, 1 deletion

tutorials/compressible/rhoCentralFoam/Allclean
tutorials/compressible/rhoCentralFoam/Allrun 0 additions, 1 deletion

tutorials/compressible/rhoCentralFoam/Allrun
tutorials/incompressible/simpleFoam/motorBike/system/controlDict 3 additions, 2 deletions

...ls/incompressible/simpleFoam/motorBike/system/controlDict
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/H2O 0 additions, 36 deletions

...ls/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/H2O
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/N2 0 additions, 36 deletions

...als/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/N2
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/O2 0 additions, 36 deletions

...als/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/O2
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/T 0 additions, 36 deletions

...ials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/T
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/U 0 additions, 37 deletions

...ials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/U
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p 0 additions, 36 deletions

...ials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p_rgh 0 additions, 34 deletions

.../lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p_rgh
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/Tf 0 additions, 41 deletions

...reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/Tf

with 46 additions and 339 deletions

Please register or to comment