Conflicts:
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
applications/utilities/surface/surfaceCheck/surfaceCheck.C
src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
NOTE: also needed to strip trailing space/lines in various files
- allows better inheritance of models, since the coefficients
dictionary can be made to match the derived class.
related to commits 9544280e65 + 14b4c3849c
Relaxation and solution parameters for the final iteration in PIMPLE loops are
now selected according to the value of the "finalIteration" entry in the
mesh::data dictionary.
rhoPimpleFoam significantly updates and now replaces rhoPisoFoam.
- "cpp -traditional-cpp" doesn't strip C++-style comments
Probably need a workaround with sed -e 's@^ *//@@' if we
wish to support C++-style comments in Make/{files,options}
- lduMatrixTests.C:121:1:
error: ‘Foam::lduMatrix::solverPerformance::solverPerformance’ names
the constructor, not the type
- edgeFaceCirculatorI.H:355:1:
error: ‘Foam::edgeFaceCirculator::edgeFaceCirculator’ names the
constructor, not the type
- patchPointEdgeCirculatorI.H:236:1:
error: ‘Foam::patchPointEdgeCirculator::patchPointEdgeCirculator’
names the constructor, not the type
- objToVTK.C:116:5:
error: ‘Foam::argList::argList’ names the constructor, not the type
same in surfaceClean.C, surfaceRefineRedGreen.C, surfaceSplitByPatch.C
- fireFoam/createFields.H:74:41:
error: type/value mismatch at argument 1 in template parameter list
for ‘template<class T> class Foam::autoPtr’
before:
- 'new' prefixed to camel-cased class name: eg, someClass -> newSomeClass
- 'New' prefixed to templated class name: eg, TmplClass -> NewTmplClass
- 'New' suffixed to class name: eg, someClass -> someClassNew
after:
- consistent 'New' suffixed to class name, no change of case
eg, someClass -> someClassNew
eg, TmplClass -> TmplClassNew
- remove epsilonSmall, omegaSmall
- k0/epsilon0/omega0 become kMin/epsilonMin/omegaMin
- add qMin/zetaMin for consistency
These files still need some attention:
dynOneEqEddy.C
NonlinearKEShih.C
settlingFoam
BUG: incompressible::LESModels:dynOneEqEddy::correct()
- avoid tmp field destruction for consistency with the compressible
version
Possible TODO:
- set kMin to zero (instead of SMALL) and introduce kSmall
to avoid division by zero
