Skip to content
Snippets Groups Projects

remove cyclic dependencies for phase systems

Merged remove cyclic dependencies for phase systems
comp-cyclic-dependencies into develop
Merged Mark OLESEN requested to merge comp-cyclic-dependencies into develop
  1. Aug 05, 2020
    • Mark OLESEN's avatar
      COMP: remove unused variable from phasePressureModel · a192095c
      Mark OLESEN authored
      a192095c
    • Mark OLESEN's avatar
      ENH: combine some phaseSystem selectors into regular .C files · 99e20b3b
      Mark OLESEN authored 
      - reduces the number of files, eases code refactoring
      99e20b3b
    • Mark OLESEN's avatar
      STYLE: use unitConversion degToRad() from instead of separate value · 93ed9337
      Mark OLESEN authored
      93ed9337
    • Mark OLESEN's avatar
      ENH: avoid phaseSystem cyclic dependencies, reduce number of libraries · 915c0785
      Mark OLESEN authored 
      Reduce the number of phaseSystems libraries:

- phaseSystems previously had a number of smaller libraries to provide
  interface and model properties, etc. This potential flexibility was
  never actually used anywhere, but causes cyclic dependencies between
  phaseSystem and the models (and turbulence) that causes extreme
  difficulty for mingw linking (issue #1238).

- 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.
      915c0785
    • Mark OLESEN's avatar
      ENH: centralize more libraries in src/phaseSystemModels · 03526e20
      Mark OLESEN authored 
      - prelude to code refactoring

NOTE
    no source code change in this commit, only relocation,
    renaming and adjustment of Make/{files,options}
      03526e20