From 11965904b729a59e5ded6ccc6cbd36cd989fb2c3 Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 22 May 2020 11:01:55 -0700 Subject: [PATCH] COMP: Avoiding double entry in runTime table TurbulenceModel multiphaseReactingTurbulenceModels and twoPhaseReactingTurbulenceModels add models to the same table TurbulenceModel. These two libs were removed from libreactingPhaseSystem which created the conflict. The multiphaseReactingTurbulenceModels was added to reactingMultiPhaseEulerFoam solver and twoPhaseReactingTurbulenceModels to twoPhaseReactingEulerFoam solver The FO heatTransferCoeffs for libfieldFunctionObjects needs twoPhaseReactingTurbulenceModels. These change avoids linking conflict from multiphaseReactingTurbulenceModels and twoPhaseReactingTurbulenceModels being linked in the same lib. --- .../reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean | 2 -- src/functionObjects/field/Make/options | 3 ++- .../reactingEulerFoam/phaseSystems/Make/options | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean index 4e69bd6372..909e0eed6a 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean @@ -1,8 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory -wclean libso multiphaseSystem -wclean libso multiphaseCompressibleTurbulenceModels wclean #------------------------------------------------------------------------------ diff --git a/src/functionObjects/field/Make/options b/src/functionObjects/field/Make/options index 1146a65d49..aab29bbf95 100644 --- a/src/functionObjects/field/Make/options +++ b/src/functionObjects/field/Make/options @@ -39,4 +39,5 @@ LIB_LIBS = \ -lchemistryModel \ -lreactionThermophysicalModels \ -lpairPatchAgglomeration \ - -lreactingPhaseSystem + -lreactingPhaseSystem \ + -ltwoPhaseReactingTurbulenceModels diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options index 1e1eaf3f1d..1718582935 100644 --- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options +++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options @@ -27,6 +27,5 @@ LIB_LIBS = \ -lcombustionModels \ -lreactingEulerianInterfacialCompositionModels \ -lreactingEulerianInterfacialModels \ - -lreactingEulerianFvPatchFields \ - -lmultiphaseReactingTurbulenceModels \ - -ltwoPhaseReactingTurbulenceModels + -lreactingEulerianFvPatchFields +