Resolve conficts
Showing
- src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H 1 addition, 8 deletions.../intermediate/parcels/include/makeParcelInjectionModels.H
- src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H 1 addition, 8 deletions...els/include/makeReactingMultiphaseParcelInjectionModels.H
- src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H 1 addition, 8 deletions...diate/parcels/include/makeReactingParcelInjectionModels.H
- src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C 69 additions, 47 deletions...ls/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
- src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H 23 additions, 23 deletions...ls/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
- src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C 0 additions, 292 deletions...inematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
- src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H 0 additions, 217 deletions...inematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
- src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C 9 additions, 9 deletions...bjects/field/fieldValues/cellSource/cellSourceTemplates.C
- src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C 8 additions, 9 deletions...bjects/field/fieldValues/faceSource/faceSourceTemplates.C
- tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Axes 0 additions, 21 deletions...actingParcelFilmFoam/hotBoxes/constant/reactingCloud1Axes
- tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Positions 0 additions, 21 deletions...gParcelFilmFoam/hotBoxes/constant/reactingCloud1Positions
- tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties 5 additions, 2 deletions...ParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
- tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes 0 additions, 21 deletions...gParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes
- tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Positions 0 additions, 21 deletions...elFilmFoam/multipleBoxes/constant/reactingCloud1Positions
- tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties 5 additions, 2 deletions...lFilmFoam/multipleBoxes/constant/reactingCloud1Properties
Please register or sign in to comment