Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • openfoam openfoam
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 426
    • Issues 426
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 9
    • Merge requests 9
  • Deployments
    • Deployments
    • Releases
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • Development
  • openfoamopenfoam
  • Merge requests
  • !379

remove cyclic dependencies for phase systems

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Mark OLESEN requested to merge comp-cyclic-dependencies into develop Aug 04, 2020
  • Overview 7
  • Commits 5
  • Changes 872

centralize more libraries in src/phaseSystemModels

avoid phaseSystem cyclic dependencies, reduce number of libraries

Previously the phaseSystems had a number of smaller libraries to provide interface and model properties. However, the cyclic dependencies between phaseSystem and the models (and turbulence) causes extreme difficultly for mingw linking. The potential additional flexibility is not actually used anywhere.

  • libincompressibleMultiphaseSystems

    • removed: libmassTransferModels
  • libmultiphaseSystem

    • removed: libcompressibleMultiphaseEulerianInterfacialModels
  • libreactingMultiphaseSystem

    • removed: libreactingPhaseSystem
    • removed: libreactingEulerianFvPatchFields
    • removed: libreactingEulerianInterfacialCompositionModels
    • removed: libreactingEulerianInterfacialModels
    • removed: libmultiphaseReactingTurbulenceModels
  • libreactingTwoPhaseSystem

    • removed: libreactingPhaseSystem
    • removed: libreactingEulerianFvPatchFields
    • removed: libreactingEulerianInterfacialCompositionModels
    • removed: libreactingEulerianInterfacialModels

Avoid duplicate symbol for phaseCompressibleTurbulenceModels.

Common turbulence models are defined in libreactingMultiphaseSystem, and libmultiphaseReactingTurbulenceModels is now redundant.

The libtwoPhaseReactingTurbulenceModels extends the common models for reactingTwoPhaseSystem.

Edited Aug 04, 2020 by Mark OLESEN
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: comp-cyclic-dependencies