GIT: resolved merge conflict (c909a5df) · Commits · Development / openfoam

Commit c909a5df authored 6 years ago by

Andrew Heather

Browse files

GIT: resolved merge conflict

parents 9258b558 616b91c0

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/DNS/dnsFoam/dnsFoam.C 1 addition, 1 deletion

applications/solvers/DNS/dnsFoam/dnsFoam.C
applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H 7 additions, 0 deletions

applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
applications/solvers/combustion/PDRFoam/PDRFoam.C 0 additions, 1 deletion

applications/solvers/combustion/PDRFoam/PDRFoam.C
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C 0 additions, 1 deletion

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C 3 additions, 3 deletions

.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H 1 addition, 1 deletion

.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C 2 additions, 2 deletions

...RFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C 2 additions, 2 deletions

...ers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
applications/solvers/combustion/chemFoam/createControls.H 3 additions, 2 deletions

applications/solvers/combustion/chemFoam/createControls.H
applications/solvers/combustion/chemFoam/readControls.H 2 additions, 2 deletions

applications/solvers/combustion/chemFoam/readControls.H
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createZones.H 1 addition, 1 deletion

...pressible/rhoSimpleFoam/rhoPorousSimpleFoam/createZones.H
applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H 4 additions, 2 deletions

...ressible/shallowWaterFoam/readGravitationalAcceleration.H
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/createPorousZones.H 1 addition, 1 deletion

...pressible/simpleFoam/porousSimpleFoam/createPorousZones.H
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C 2 additions, 2 deletions

...malPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H 1 addition, 2 deletions

...malPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H 1 addition, 1 deletion

...vers/stressAnalysis/solidDisplacementFoam/createControl.H
applications/solvers/stressAnalysis/solidDisplacementFoam/createControls.H 1 addition, 1 deletion

...ers/stressAnalysis/solidDisplacementFoam/createControls.H
applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H 1 addition, 3 deletions

...Analysis/solidDisplacementFoam/readMechanicalProperties.H
applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H 2 additions, 2 deletions

...solidDisplacementFoam/readSolidDisplacementFoamControls.H
applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H 1 addition, 2 deletions

...essAnalysis/solidDisplacementFoam/readThermalProperties.H

with 36 additions and 32 deletions

Please register or to comment

Admin message

GIT: resolved merge conflict