Merge branch 'feature-regionModels' into 'develop' (5c73c0a0) · Commits · Development / openfoam

Commit 5c73c0a0 authored 9 years ago by

Mattijs Janssens

Merge branch 'feature-regionModels' into 'develop'

ENH: Updated regionModels from internal development line



See merge request !23

parents 8b591276 edec4d13

Hide whitespace changes

Inline Side-by-side

Showing

src/OSspecific/POSIX/signals/sigFpe.C 4 additions, 8 deletions

src/OSspecific/POSIX/signals/sigFpe.C
src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C 8 additions, 8 deletions

src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H 3 additions, 6 deletions

src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C 3 additions, 14 deletions

...pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C
src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C 17 additions, 6 deletions

...sseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H 4 additions, 1 deletion

...sseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C 17 additions, 6 deletions

...city/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H 4 additions, 1 deletion

...city/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C 17 additions, 3 deletions

...lmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H 4 additions, 1 deletion

...lmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H
src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C 17 additions, 3 deletions

...FilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H 5 additions, 2 deletions

...FilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H
src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C 25 additions, 8 deletions

...aceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H 7 additions, 1 deletion

...aceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H 15 additions, 3 deletions

...ceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C 5 additions, 20 deletions

...matic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C 3 additions, 2 deletions

...nematic/force/thermocapillaryForce/thermocapillaryForce.C
src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C 37 additions, 21 deletions

...s/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSchemes 14 additions, 18 deletions

...ngParcelFilmFoam/cylinder/system/wallFilmRegion/fvSchemes
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSchemes 10 additions, 14 deletions

...rcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSchemes

with 219 additions and 146 deletions

Please register or to comment

Admin message

Merge branch 'feature-regionModels' into 'develop'