Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
Conflicts: applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/Make/options
Showing
- applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H 1 addition, 1 deletion.../solvers/lagrangian/reactingParcelFilmFoam/createFields.H
- applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H 1 addition, 1 deletion...ications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
- applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/Make/options 1 addition, 0 deletions...s/lagrangian/reactingParcelFilmPyrolysisFoam/Make/options
- applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/YhsEqn.H 2 additions, 4 deletions...lvers/lagrangian/reactingParcelFilmPyrolysisFoam/YhsEqn.H
- applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/createFields.H 1 addition, 1 deletion...lagrangian/reactingParcelFilmPyrolysisFoam/createFields.H
- applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/pEqn.H 1 addition, 1 deletion...solvers/lagrangian/reactingParcelFilmPyrolysisFoam/pEqn.H
- applications/utilities/miscellaneous/foamDebugSwitches/Make/options 0 additions, 1 deletion...ns/utilities/miscellaneous/foamDebugSwitches/Make/options
- bin/paraFoam 2 additions, 1 deletionbin/paraFoam
- bin/tools/MakefileDirs 1 addition, 1 deletionbin/tools/MakefileDirs
- bin/tools/RunFunctions 6 additions, 6 deletionsbin/tools/RunFunctions
- src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C 5 additions, 3 deletions...nModels/infinitelyFastChemistry/infinitelyFastChemistry.C
- src/finiteVolume/fields/fvPatchFields/derived/directMappedFlowRate/directMappedFlowRateFvPatchVectorField.C 2 additions, 2 deletions...ctMappedFlowRate/directMappedFlowRateFvPatchVectorField.C
- src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C 0 additions, 1 deletion...n/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
- src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H 1 addition, 1 deletion...ntermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
- src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C 3 additions, 0 deletions...atic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
- src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C 1 addition, 1 deletion...lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C
- src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C 1 addition, 1 deletion...h/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
- src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C 1 addition, 1 deletion...esh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
- src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C 19 additions, 13 deletions...ionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
- src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C 1 addition, 1 deletion...yCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
Please register or sign in to comment