zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: avoid phaseSystem cyclic dependencies, reduce number of libraries

Browse Source 
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.
This commit is contained in:
Mark Olesen
2020-08-03 17:36:05 +02:00
committed by Sergio Ferraris
parent 03526e2097
commit 915c0785ae
558 changed files with 499 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options
View File

@ -5,9 +5,7 @@ EXE_INC = \
-I$(FOAM_SOLVERS)/multiphase/reactingTwoPhaseEulerFoam \
-I${phaseSystem}/twoPhaseSystem/lnInclude \
-I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \
-I${phaseSystem}/phaseSystems/lnInclude \
-I${phaseSystem}/interfacialModels/lnInclude \
-I${phaseSystem}/interfacialCompositionModels/lnInclude \
-I${phaseSystem}/multiphaseSystem/lnInclude \
-I./fluid \
-I../solid \
-I../fluid \
@ -36,6 +34,6 @@ EXE_LIBS = \
-lsolidThermo \
-lradiationModels \
-lregionModels \
-lreactingMultiphaseSystem \
-lreactingTwoPhaseSystem \
-ltwoPhaseReactingTurbulenceModels \
-lreactingPhaseSystem
-ltwoPhaseReactingTurbulenceModels

1
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
View File

@ -26,7 +26,6 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lradiationModels \
-lfluidThermophysicalModels \
-lmassTransferModels \
-lsolidThermo \
-lsolidSpecie \
-ltwoPhaseProperties \

4
applications/solvers/multiphase/multiphaseEulerFoam/Make/options
View File

@ -2,7 +2,6 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseEuler
EXE_INC = \
-I${phaseSystem}/multiphaseSystem/lnInclude \
-I${phaseSystem}/interfacialModels/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels \
@ -21,5 +20,4 @@ EXE_LIBS = \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lmultiphaseSystem \
-lcompressibleMultiphaseEulerianInterfacialModels
-lmultiphaseSystem

10
applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options
View File

@ -2,10 +2,6 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler
EXE_INC = \
-I${phaseSystem}/multiphaseSystem/lnInclude \
-I${phaseSystem}/multiphaseCompressibleTurbulenceModels/lnInclude \
-I${phaseSystem}/phaseSystems/lnInclude \
-I${phaseSystem}/interfacialModels/lnInclude \
-I${phaseSystem}/interfacialCompositionModels/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
@ -21,8 +17,4 @@ EXE_LIBS = \
-lfvOptions \
-lmeshTools \
-lsampling \
-lreactingPhaseSystem \
-lreactingMultiphaseSystem \
-lreactingEulerianInterfacialModels \
-lreactingEulerianInterfacialCompositionModels \
-lmultiphaseReactingTurbulenceModels
-lreactingMultiphaseSystem

8
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options
View File

@ -3,9 +3,7 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler
EXE_INC = \
-I${phaseSystem}/twoPhaseSystem/lnInclude \
-I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \
-I${phaseSystem}/phaseSystems/lnInclude \
-I${phaseSystem}/interfacialCompositionModels/lnInclude \
-I${phaseSystem}/interfacialModels/lnInclude \
-I${phaseSystem}/multiphaseSystem/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
@ -20,8 +18,6 @@ EXE_LIBS = \
-lfvOptions \
-lmeshTools \
-lsampling \
-lreactingPhaseSystem \
-lreactingMultiphaseSystem \
-lreactingTwoPhaseSystem \
-lreactingEulerianInterfacialModels \
-lreactingEulerianInterfacialCompositionModels \
-ltwoPhaseReactingTurbulenceModels

4
applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
View File

@ -2,7 +2,6 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/twoPhaseEuler
EXE_INC = \
-I${phaseSystem}/phaseCompressibleTurbulenceModels/lnInclude \
-I${phaseSystem}/twoPhaseEuler/interfacialModels/lnInclude \
-I${phaseSystem}/twoPhaseSystem/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
@ -25,6 +24,5 @@ EXE_LIBS = \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lphaseCompressibleTurbulenceModels \
-lcompressibleTwoPhaseSystem \
-lcompressibleEulerianInterfacialModels
-lphaseCompressibleTurbulenceModels