diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options index ced67af4db..7ecfb0fa3e 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options @@ -36,5 +36,6 @@ EXE_LIBS = \ -lradiationModels \ -lregionModels \ -lsampling \ - -lreactingPhaseSystem \ - -lreactingTwoPhaseSystem + -lreactingTwoPhaseSystem \ + -lreactingPhaseSystem + diff --git a/src/phaseSystemModels/Allwmake b/src/phaseSystemModels/Allwmake index 5e5d00632b..686604a701 100755 --- a/src/phaseSystemModels/Allwmake +++ b/src/phaseSystemModels/Allwmake @@ -4,9 +4,7 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ -wmakeLnInclude reactingEulerFoam/interfacialCompositionModels -wmakeLnInclude reactingEulerFoam/interfacialModels -wmakeLnInclude reactingEulerFoam/derivedFvPatchFields +wmakeLnInclude reactingEulerFoam/phaseSystems case "$WM_COMPILER" in Mingw*) @@ -18,7 +16,6 @@ esac #------------------------------------------------------------------------------ -wmake $targetType reactingEulerFoam/phaseSystems wmake $targetType reactingEulerFoam/interfacialModels wmake $targetType reactingEulerFoam/interfacialCompositionModels wmake $targetType reactingEulerFoam/derivedFvPatchFields @@ -29,4 +26,6 @@ wmake $targetType reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompr wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels +wmake $targetType reactingEulerFoam/phaseSystems + #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options index 9ba3e3ab4f..24fb0f28dc 100644 --- a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options +++ b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options @@ -15,7 +15,6 @@ LIB_LIBS = \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ - -lreactingPhaseSystem \ -lreactingEulerianInterfacialModels \ -lreactingEulerianInterfacialCompositionModels \ -lturbulenceModels \ diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options b/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options index 9af2da489d..2a0f82bd25 100644 --- a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options +++ b/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options @@ -15,6 +15,5 @@ LIB_LIBS = \ -lfluidThermophysicalModels \ -lcompressibleTransportModels \ -lspecie \ - -lreactingPhaseSystem \ -lturbulenceModels \ -lcompressibleTurbulenceModels diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options index 8d823cafb9..1e1eaf3f1d 100644 --- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options +++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options @@ -24,4 +24,9 @@ LIB_LIBS = \ -lcompressibleTransportModels \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ - -lcombustionModels + -lcombustionModels \ + -lreactingEulerianInterfacialCompositionModels \ + -lreactingEulerianInterfacialModels \ + -lreactingEulerianFvPatchFields \ + -lmultiphaseReactingTurbulenceModels \ + -ltwoPhaseReactingTurbulenceModels diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options index b032af9139..7033569050 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options +++ b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options @@ -19,7 +19,6 @@ LIB_LIBS = \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ - -lreactingPhaseSystem \ -lreactingMultiphaseSystem \ -lreactingEulerianInterfacialModels \ -lreactingEulerianInterfacialCompositionModels \ diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options index 500708f45a..06b3f1356c 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options +++ b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options @@ -22,5 +22,4 @@ LIB_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lcombustionModels \ - -lreactingPhaseSystem + -lcombustionModels diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options index f0f539eeed..c4ed27c34f 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options +++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options @@ -17,7 +17,6 @@ LIB_LIBS = \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ - -lreactingPhaseSystem \ -lreactingTwoPhaseSystem \ -lreactingEulerianInterfacialModels \ -lreactingEulerianInterfacialCompositionModels \ diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options index 650650dab1..a19dce92ba 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options +++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options @@ -21,6 +21,5 @@ LIB_LIBS = \ -lmeshTools \ -lsampling \ -lcombustionModels \ - -lreactingPhaseSystem \ -lturbulenceModels \ -lcompressibleTurbulenceModels