Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev (3be86aa7) · Commits · Development / openfoam

Commit 3be86aa7 authored 13 years ago by

mattijs

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/lagrangian/dieselSpray/spray/findInjectorCell.H

parents ca4b8c34 8968d1d0

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/files 3 additions, 0 deletions

...ns/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/files
applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/options 30 additions, 17 deletions

.../solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/options
applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/createClouds.H 9 additions, 0 deletions

...olvers/lagrangian/sprayFoam/sprayEnginFoam/createClouds.H
applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/logSummary.H 0 additions, 0 deletions

.../solvers/lagrangian/sprayFoam/sprayEnginFoam/logSummary.H
applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/readEngineTimeControls.H 3 additions, 0 deletions

...rangian/sprayFoam/sprayEnginFoam/readEngineTimeControls.H
applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/sprayEngineFoam.C 17 additions, 19 deletions

...ers/lagrangian/sprayFoam/sprayEnginFoam/sprayEngineFoam.C
applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/startSummary.H 0 additions, 0 deletions

...olvers/lagrangian/sprayFoam/sprayEnginFoam/startSummary.H
applications/utilities/miscellaneous/foamDebugSwitches/Make/options 0 additions, 1 deletion

...ns/utilities/miscellaneous/foamDebugSwitches/Make/options
applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options 1 addition, 2 deletions

...ties/postProcessing/dataConversion/foamToGMV/Make/options
src/lagrangian/Allwmake 0 additions, 1 deletion

src/lagrangian/Allwmake
src/lagrangian/dieselSpray/Make/files 0 additions, 95 deletions

src/lagrangian/dieselSpray/Make/files
src/lagrangian/dieselSpray/Make/options 0 additions, 29 deletions

src/lagrangian/dieselSpray/Make/options
src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C 0 additions, 436 deletions

...selSpray/injector/commonRailInjector/commonRailInjector.C
src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H 0 additions, 235 deletions

...selSpray/injector/commonRailInjector/commonRailInjector.H
src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C 0 additions, 399 deletions

...an/dieselSpray/injector/definedInjector/definedInjector.C
src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H 0 additions, 240 deletions

...an/dieselSpray/injector/definedInjector/definedInjector.H
src/lagrangian/dieselSpray/injector/injector/injector.C 0 additions, 41 deletions

src/lagrangian/dieselSpray/injector/injector/injector.C
src/lagrangian/dieselSpray/injector/injector/injector.H 0 additions, 115 deletions

src/lagrangian/dieselSpray/injector/injector/injector.H
src/lagrangian/dieselSpray/injector/injector/injectorI.H 0 additions, 47 deletions

src/lagrangian/dieselSpray/injector/injector/injectorI.H
src/lagrangian/dieselSpray/injector/injector/injectorIO.C 0 additions, 56 deletions

src/lagrangian/dieselSpray/injector/injector/injectorIO.C

with 63 additions and 1733 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev