Merge branch 'ccm-bugfixes' into 'develop' (79ea7823) · Commits · Development / openfoam

Commit 79ea7823 authored 7 years ago by

Mark OLESEN

Merge branch 'ccm-bugfixes' into 'develop'

ccm conversion bugfixes

See merge request !115

parents 3fd1c473 8da6e8eb

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H 2 additions, 2 deletions

...System/diameterModels/constantDiameter/constantDiameter.H
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H 1 addition, 1 deletion

...aceTensionCoefficient/constantSurfaceTensionCoefficient.H
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H 1 addition, 1 deletion

...pectRatioModels/constantAspectRatio/constantAspectRatio.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H 1 addition, 1 deletion

...pectRatioModels/constantAspectRatio/constantAspectRatio.H
applications/test/unitConversion/Make/files 3 additions, 0 deletions

applications/test/unitConversion/Make/files
applications/test/unitConversion/Make/options 0 additions, 0 deletions

applications/test/unitConversion/Make/options
applications/test/unitConversion/Test-unitConversion.C 16 additions, 39 deletions

applications/test/unitConversion/Test-unitConversion.C
applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C 1 addition, 11 deletions

...tions/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C 1 addition, 1 deletion

...nFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
src/OpenFOAM/containers/Lists/ListOps/ListOps.H 34 additions, 10 deletions

src/OpenFOAM/containers/Lists/ListOps/ListOps.H
src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C 67 additions, 22 deletions

src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
src/OpenFOAM/global/unitConversion/unitConversion.H 20 additions, 6 deletions

src/OpenFOAM/global/unitConversion/unitConversion.H
src/OpenFOAM/meshes/meshTools/mergePoints.C 25 additions, 17 deletions

src/OpenFOAM/meshes/meshTools/mergePoints.C
src/OpenFOAM/meshes/meshTools/mergePoints.H 9 additions, 8 deletions

src/OpenFOAM/meshes/meshTools/mergePoints.H
src/OpenFOAM/primitives/enums/NamedEnum.H 3 additions, 0 deletions

src/OpenFOAM/primitives/enums/NamedEnum.H
src/OpenFOAM/primitives/enums/NamedEnumI.H 10 additions, 0 deletions

src/OpenFOAM/primitives/enums/NamedEnumI.H
src/conversion/ccm/Make/files 0 additions, 2 deletions

src/conversion/ccm/Make/files
src/conversion/ccm/common/ccmBase.H 1 addition, 1 deletion

src/conversion/ccm/common/ccmBase.H
src/conversion/ccm/misc/ListOps1.H 0 additions, 84 deletions

src/conversion/ccm/misc/ListOps1.H
src/conversion/ccm/misc/ListOps1Templates.C 0 additions, 117 deletions

src/conversion/ccm/misc/ListOps1Templates.C

with 195 additions and 323 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'ccm-bugfixes' into 'develop'