Skip to content

Commit e9a2fa5

Browse files
wyldckatwyldckat
committed
Rectified how the reactingEulerFoam-type solvers are built on Windows, making them more reliant on the original Make files.
1 parent f4c4f80 commit e9a2fa5

File tree

17 files changed

+37
-185
lines changed

17 files changed

+37
-185
lines changed

‎applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make.multiphase/options

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
1-
EXE_INC = \
2-
-I../phaseSystems/lnInclude \
3-
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
4-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
5-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
6-
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
7-
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
8-
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
9-
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
10-
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
11-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
12-
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
13-
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
14-
-I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
15-
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
16-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
17-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
18-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
19-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
20-
-I$(LIB_SRC)/finiteVolume/lnInclude \
21-
-I$(LIB_SRC)/meshTools/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
224

235
LIB_LIBS = \
246
-lfluidThermophysicalModels \

‎applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make.twoPhase/options

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
1-
EXE_INC = \
2-
-I../phaseSystems/lnInclude \
3-
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
4-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
5-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
6-
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
7-
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
8-
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
9-
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
10-
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
11-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
12-
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
13-
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
14-
-I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
15-
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
16-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
17-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
18-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
19-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
20-
-I$(LIB_SRC)/finiteVolume/lnInclude \
21-
-I$(LIB_SRC)/meshTools/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
224

235
LIB_LIBS = \
246
-lfluidThermophysicalModels \
257
-lreactionThermophysicalModels \
26-
-lspecie
27-
28-
LIB_LIBS += \
8+
-lspecie \
299
-lreactingPhaseSystemBuiltForTwoPhase \
3010
-lfiniteVolume

‎applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@ LIB_LIBS = \
2020
-lfluidThermophysicalModels \
2121
-lreactionThermophysicalModels \
2222
-lspecie
23-
24-
LIB_LIBS += \
25-
-lreactingPhaseSystem \
26-
-lfiniteVolume

‎applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make.multiphase/options

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
EXE_INC = \
2-
-I$(LIB_SRC)/finiteVolume/lnInclude \
3-
-I../phaseSystems/lnInclude \
4-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
5-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
6-
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
7-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
8-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
9-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
10-
-I$(LIB_SRC)/meshTools/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
114

125
LIB_LIBS = \
136
-lcompressibleTransportModels \

‎applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make.twoPhase/options

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
EXE_INC = \
2-
-I$(LIB_SRC)/finiteVolume/lnInclude \
3-
-I../phaseSystems/lnInclude \
4-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
5-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
6-
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
7-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
8-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
9-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
10-
-I$(LIB_SRC)/meshTools/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
114

125
LIB_LIBS = \
136
-lcompressibleTransportModels \

‎applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,3 @@ LIB_LIBS = \
1313
-lcompressibleTransportModels \
1414
-lfluidThermophysicalModels \
1515
-lspecie
16-
17-
LIB_LIBS += \
18-
-lreactingPhaseSystem \
19-
-lfiniteVolume

‎applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make.multiphase/options

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
EXE_INC = \
2-
-I../interfacialModels/lnInclude \
3-
-I../interfacialCompositionModels/lnInclude \
4-
-I$(LIB_SRC)/finiteVolume/lnInclude \
5-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
6-
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
7-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
8-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
9-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
10-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
11-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
12-
-I$(LIB_SRC)/combustionModels/lnInclude \
13-
-I$(LIB_SRC)/meshTools/lnInclude \
14-
-I$(LIB_SRC)/sampling/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
154

165
LIB_LIBS = \
176
-lcombustionModels \
@@ -25,5 +14,4 @@ LIB_LIBS = \
2514
-lfiniteVolume \
2615
-lfluidThermophysicalModels \
2716
-lspecie \
28-
-lreactionThermophysicalModels \
29-
-lthermophysicalFunctions
17+
-lreactionThermophysicalModels

‎applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make.twoPhase/options

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
EXE_INC = \
2-
-I../interfacialModels/lnInclude \
3-
-I../interfacialCompositionModels/lnInclude \
4-
-I$(LIB_SRC)/finiteVolume/lnInclude \
5-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
6-
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
7-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
8-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
9-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
10-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
11-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
12-
-I$(LIB_SRC)/combustionModels/lnInclude \
13-
-I$(LIB_SRC)/meshTools/lnInclude \
14-
-I$(LIB_SRC)/sampling/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
154

165
LIB_LIBS = \
176
-lcombustionModels \
@@ -25,5 +14,4 @@ LIB_LIBS = \
2514
-lfiniteVolume \
2615
-lfluidThermophysicalModels \
2716
-lspecie \
28-
-lreactionThermophysicalModels \
29-
-lthermophysicalFunctions
17+
-lreactionThermophysicalModels

‎applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,3 @@ EXE_INC = \
1515

1616
LIB_LIBS = \
1717
-lcombustionModels
18-
19-
LIB_LIBS += \
20-
-lreactingEulerianInterfacialModels \
21-
-lreactingEulerianInterfacialCompositionModels \
22-
-lcompressibleTransportModels \
23-
-lcompressibleTurbulenceModels \
24-
-lturbulenceModels \
25-
-lchemistryModel \
26-
-lfiniteVolume \
27-
-lfluidThermophysicalModels \
28-
-lspecie \
29-
-lreactionThermophysicalModels \
30-
-lthermophysicalFunctions

‎applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make.win/options

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
1-
EXE_INC = \
2-
-I$(LIB_SRC)/finiteVolume/lnInclude \
3-
-I../multiphaseSystem/lnInclude \
4-
-I../../phaseSystems/lnInclude \
5-
-I../../interfacialModels/lnInclude\
6-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
7-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
8-
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
9-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
10-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
11-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
12-
-I$(LIB_SRC)/fvOptions/lnInclude \
13-
-I$(LIB_SRC)/meshTools/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
144

155
LIB_LIBS = \
166
-lfiniteVolume \

‎applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
EXE_INC = \
2+
-I$(LIB_SRC)/finiteVolume/lnInclude \
23
-I../multiphaseSystem/lnInclude \
34
-I../../phaseSystems/lnInclude \
45
-I../../interfacialModels/lnInclude\
@@ -8,7 +9,6 @@ EXE_INC = \
89
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
910
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
1011
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
11-
-I$(LIB_SRC)/finiteVolume/lnInclude \
1212
-I$(LIB_SRC)/meshTools/lnInclude
1313

1414
LIB_LIBS = \

‎applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make.win/options

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
1-
EXE_INC = \
2-
-I$(LIB_SRC)/finiteVolume/lnInclude \
3-
-I../../interfacialModels/lnInclude \
4-
-I../../interfacialCompositionModels/lnInclude \
5-
-I../../phaseSystems/lnInclude \
6-
-IalphaContactAngle \
7-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
8-
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
9-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
10-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
11-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
12-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
13-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
14-
-I$(LIB_SRC)/combustionModels/lnInclude \
15-
-I$(LIB_SRC)/fvOptions/lnInclude \
16-
-I$(LIB_SRC)/meshTools/lnInclude \
17-
-I$(LIB_SRC)/sampling/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
184

195
LIB_LIBS = \
206
-lcombustionModels \

‎applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
EXE_INC = \
2+
-I$(LIB_SRC)/finiteVolume/lnInclude \
23
-I../../interfacialModels/lnInclude \
34
-I../../interfacialCompositionModels/lnInclude \
45
-I../../phaseSystems/lnInclude \
@@ -11,7 +12,6 @@ EXE_INC = \
1112
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
1213
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
1314
-I$(LIB_SRC)/combustionModels/lnInclude \
14-
-I$(LIB_SRC)/finiteVolume/lnInclude \
1515
-I$(LIB_SRC)/meshTools/lnInclude \
1616
-I$(LIB_SRC)/sampling/lnInclude
1717

‎applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make.win/options

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
1-
EXE_INC = \
2-
-I$(LIB_SRC)/finiteVolume/lnInclude \
3-
-I../twoPhaseSystem/lnInclude \
4-
-I../../phaseSystems/lnInclude \
5-
-I../../interfacialModels/lnInclude\
6-
-I../../interfacialCompositionModels/lnInclude \
7-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
8-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
9-
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
10-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
11-
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
12-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
13-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
14-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
15-
-I$(LIB_SRC)/combustionModels/lnInclude \
16-
-I$(LIB_SRC)/fvOptions/lnInclude \
17-
-I$(LIB_SRC)/meshTools/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
184

195
LIB_LIBS = \
206
-lfiniteVolume \

‎applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
EXE_INC = \
2+
-I$(LIB_SRC)/finiteVolume/lnInclude \
23
-I../twoPhaseSystem/lnInclude \
34
-I../../phaseSystems/lnInclude \
45
-I../../interfacialModels/lnInclude\
@@ -9,7 +10,6 @@ EXE_INC = \
910
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
1011
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
1112
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
12-
-I$(LIB_SRC)/finiteVolume/lnInclude \
1313
-I$(LIB_SRC)/meshTools/lnInclude
1414

1515
LIB_LIBS = \

‎applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make.win/options

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1-
EXE_INC = \
2-
-I$(LIB_SRC)/finiteVolume/lnInclude \
3-
-I../../interfacialModels/lnInclude \
4-
-I../../interfacialCompositionModels/lnInclude \
5-
-I../../phaseSystems/lnInclude \
6-
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
7-
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
8-
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
9-
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
10-
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
11-
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
12-
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
13-
-I$(LIB_SRC)/combustionModels/lnInclude \
14-
-I$(LIB_SRC)/fvOptions/lnInclude \
15-
-I$(LIB_SRC)/meshTools/lnInclude \
16-
-I$(LIB_SRC)/sampling/lnInclude
1+
#include "../Make/options"
2+
3+
/* We override only the LIB_LIBS entry for Windows */
174

185
LIB_LIBS = \
196
-lcombustionModels \

‎applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
EXE_INC = \
2+
-I$(LIB_SRC)/finiteVolume/lnInclude \
23
-I../../interfacialModels/lnInclude \
34
-I../../interfacialCompositionModels/lnInclude \
45
-I../../phaseSystems/lnInclude \
@@ -10,7 +11,6 @@ EXE_INC = \
1011
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
1112
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
1213
-I$(LIB_SRC)/combustionModels/lnInclude \
13-
-I$(LIB_SRC)/finiteVolume/lnInclude \
1414
-I$(LIB_SRC)/meshTools/lnInclude \
1515
-I$(LIB_SRC)/sampling/lnInclude
1616

0 commit comments

Comments
 (0)