ENH: Re-ordering compilation phaseSystemModels

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options

@@ -36,5 +36,6 @@ EXE_LIBS = \
     -lradiationModels \
     -lregionModels \
     -lsampling \
-    -lreactingPhaseSystem \
-    -lreactingTwoPhaseSystem
+    -lreactingTwoPhaseSystem \
+    -lreactingPhaseSystem
+

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
+
 #------------------------------------------------------------------------------

src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options

@@ -15,7 +15,6 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
-    -lreactingPhaseSystem \
     -lreactingEulerianInterfacialModels \
     -lreactingEulerianInterfacialCompositionModels \
     -lturbulenceModels \

src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options

@@ -15,6 +15,5 @@ LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lcompressibleTransportModels \
     -lspecie \
-    -lreactingPhaseSystem \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels

src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options

@@ -24,4 +24,9 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lcombustionModels
+    -lcombustionModels \
+    -lreactingEulerianInterfacialCompositionModels \
+    -lreactingEulerianInterfacialModels \
+    -lreactingEulerianFvPatchFields \
+    -lmultiphaseReactingTurbulenceModels \
+    -ltwoPhaseReactingTurbulenceModels

src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options

@@ -19,7 +19,6 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
-    -lreactingPhaseSystem \
     -lreactingMultiphaseSystem \
     -lreactingEulerianInterfacialModels \
     -lreactingEulerianInterfacialCompositionModels \

src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options

@@ -22,5 +22,4 @@ LIB_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lcombustionModels \
-    -lreactingPhaseSystem
+    -lcombustionModels

src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options

@@ -17,7 +17,6 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
-    -lreactingPhaseSystem \
     -lreactingTwoPhaseSystem \
     -lreactingEulerianInterfacialModels \
     -lreactingEulerianInterfacialCompositionModels \

src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options

@@ -21,6 +21,5 @@ LIB_LIBS = \
     -lmeshTools \
     -lsampling \
     -lcombustionModels \
-    -lreactingPhaseSystem \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels