-
-
Notifications
You must be signed in to change notification settings - Fork 32
/
Copy pathOpenFOAM-2.2.x-1f35a0ff.patch
16015 lines (15068 loc) · 509 KB
/
OpenFOAM-2.2.x-1f35a0ff.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
.gitignore | 1 +
Allwmake | 27 +-
applications/Allwmake | 14 +-
.../solvers/combustion/reactingFoam/Allwmake | 2 +-
.../solvers/compressible/rhoCentralFoam/Allwclean | 2 +-
.../solvers/compressible/rhoCentralFoam/Allwmake | 2 +-
.../solvers/compressible/rhoPimpleFoam/Allwmake | 2 +-
.../solvers/compressible/rhoSimpleFoam/Allwclean | 2 +-
.../solvers/compressible/rhoSimpleFoam/Allwmake | 2 +-
.../solvers/compressible/sonicFoam/Allwmake | 2 +-
.../heatTransfer/chtMultiRegionFoam/Allwclean | 2 +-
.../heatTransfer/chtMultiRegionFoam/Allwmake | 2 +-
.../solvers/incompressible/pimpleFoam/Allwmake | 2 +-
.../solvers/incompressible/simpleFoam/Allwmake | 2 +-
applications/solvers/lagrangian/DPMFoam/Allwclean | 2 +-
applications/solvers/lagrangian/DPMFoam/Allwmake | 2 +-
.../icoUncoupledKinematicParcelFoam/Allwmake | 2 +-
.../solvers/lagrangian/reactingParcelFoam/Allwmake | 2 +-
applications/solvers/lagrangian/sprayFoam/Allwmake | 2 +-
.../solvers/multiphase/cavitatingFoam/Allwclean | 2 +-
.../solvers/multiphase/cavitatingFoam/Allwmake | 2 +-
.../multiphase/compressibleInterFoam/Allwclean | 2 +-
.../multiphase/compressibleInterFoam/Allwmake | 2 +-
.../compressibleTwoPhaseEulerFoam/Allwclean | 2 +-
.../compressibleTwoPhaseEulerFoam/Allwmake | 2 +-
.../solvers/multiphase/interFoam/Allwclean | 2 +-
applications/solvers/multiphase/interFoam/Allwmake | 2 +-
.../threePhaseMixture.C | 2 +-
.../threePhaseMixture.H | 2 +-
.../multiphase/interPhaseChangeFoam/Allwclean | 2 +-
.../multiphase/interPhaseChangeFoam/Allwmake | 2 +-
.../multiphase/multiphaseEulerFoam/Allwclean | 2 +-
.../multiphase/multiphaseEulerFoam/Allwmake | 2 +-
.../multiphase/multiphaseInterFoam/Allwclean | 2 +-
.../multiphase/multiphaseInterFoam/Allwmake | 2 +-
.../solvers/multiphase/twoPhaseEulerFoam/Allwclean | 2 +-
.../solvers/multiphase/twoPhaseEulerFoam/Allwmake | 2 +-
.../utilities/mesh/conversion/Optional/Allwmake | 2 +-
.../mesh/conversion/kivaToFoam/readKivaGrid.H | 2 +-
applications/utilities/mesh/generation/Allwmake | 2 +-
.../utilities/mesh/generation/extrude/Allwclean | 2 +-
.../utilities/mesh/generation/extrude/Allwmake | 2 +-
.../mesh/generation/extrude2DMesh/Allwclean | 2 +-
.../mesh/generation/extrude2DMesh/Allwmake | 2 +-
.../mesh/generation/snappyHexMesh/Make/options | 1 -
.../mesh/manipulation/renumberMesh/Allwmake | 11 +-
.../mesh/manipulation/renumberMesh/Make/options | 1 -
.../miscellaneous/foamDebugSwitches/Make/options | 2 -
.../dataConversion/foamToEnsight/Make/options | 1 -
.../dataConversion/foamToVTK/surfaceMeshWriter.C | 1 -
.../dataConversion/foamToVTK/surfaceMeshWriter.H | 2 +-
.../postProcessing/graphics/PV3Readers/Allwclean | 2 +-
.../postProcessing/graphics/PV3Readers/Allwmake | 7 +-
.../graphics/PV3Readers/PV3FoamReader/Allwclean | 2 +-
.../graphics/PV3Readers/PV3FoamReader/Allwmake | 2 +-
.../PV3Readers/PV3blockMeshReader/Allwclean | 2 +-
.../PV3Readers/PV3blockMeshReader/Allwmake | 2 +-
.../preProcessing/wallFunctionTable/Allwmake | 2 +-
.../surface/surfaceFeatureExtract/Allwmake | 43 +-
.../surface/surfaceFeatureExtract/Make/options | 1 +
.../surfaceFeatureExtract/surfaceFeatureExtract.C | 16 +-
bin/foamEtcFile | 3 +
bin/foamInstallationTest | 37 +-
bin/foamJob | 8 +
bin/paraFoam | 10 +-
bin/tools/RunFunctions | 121 ++-
bin/tools/replaceAllShellSun | 2 +-
doc/Allwmake | 2 +-
doc/Doxygen/Allwmake | 2 +-
etc/bashrc | 135 ++-
etc/config/paraview-osx.sh | 15 +
etc/config/scotch.sh | 14 +-
etc/config/settings.sh | 83 +-
src/Allwmake | 16 +-
src/OSspecific/POSIX/POSIX.C | 37 +
src/OSspecific/POSIX/clockTime/clockTime.H | 3 +
src/OSspecific/POSIX/fileStat.C | 2 +
src/OSspecific/POSIX/printStack.C | 332 +++----
src/OSspecific/POSIX/signals/sigFpe.C | 87 +-
src/OSspecific/POSIX/signals/sigFpe.H | 20 +-
.../Lists/CompactListList/CompactListListI.H | 2 +-
.../containers/Lists/FixedList/FixedListI.H | 2 +-
src/OpenFOAM/containers/Lists/List/ListI.H | 2 +-
src/OpenFOAM/containers/Lists/SubList/SubListI.H | 2 +-
src/OpenFOAM/containers/Lists/UList/UList.H | 1 +
src/OpenFOAM/containers/Lists/UList/UListI.H | 2 +-
src/OpenFOAM/db/IOobject/IOobject.H | 2 +-
src/OpenFOAM/db/IOobject/IOobjectI.H | 18 +-
src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C | 1 +
src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C | 3 +
.../functionEntries/codeStream/codeStream.C | 3 +
.../db/dynamicLibrary/dynamicCode/dynamicCode.C | 4 +
.../db/dynamicLibrary/dynamicCode/dynamicCode.H | 4 +
.../db/objectRegistry/objectRegistryTemplates.C | 2 +-
.../DimensionedField/DimensionedFieldI.H | 2 +-
.../DimensionedField/SubDimensionedFieldI.H | 2 +-
src/OpenFOAM/fields/Fields/Field/Field.C | 4 +-
src/OpenFOAM/fields/Fields/Field/Field.H | 2 +-
src/OpenFOAM/fields/Fields/Field/SubFieldI.H | 2 +-
.../GeometricField/GeometricFieldI.H | 2 +-
src/OpenFOAM/global/foamDoc.H | 2 +-
src/OpenFOAM/global/global.Cver | 2 +
src/OpenFOAM/matrices/Matrix/MatrixI.H | 2 +-
src/OpenFOAM/memory/Xfer/XferI.H | 4 +-
.../meshes/meshShapes/cellShape/cellShapeIO.C | 2 +-
src/OpenFOAM/meshes/polyMesh/polyMesh.C | 8 +-
src/OpenFOAM/primitives/Scalar/doubleFloat.H | 9 +
src/OpenFOAM/primitives/nullObject/nullObject.C | 34 +
src/OpenFOAM/primitives/nullObject/nullObject.H | 110 +++
src/OpenFOAM/primitives/nullObject/nullObjectI.H | 65 ++
.../primitives/ranges/labelRange/labelRangeI.H | 4 +-
.../primitives/ranges/labelRange/labelRangesI.H | 2 +-
src/Pstream/Allwmake | 16 +-
src/Pstream/mpi/Make/options | 4 +
src/conversion/Allwmake | 2 +-
src/conversion/ensight/part/ensightPartCells.C | 6 +-
src/conversion/ensight/part/ensightPartIO.C | 2 +-
src/dummyThirdParty/Allwmake | 2 +-
src/dummyThirdParty/metisDecomp/metis.h | 18 +-
src/edgeMesh/edgeMesh.C | 4 +-
.../DarcyForchheimer/DarcyForchheimer.C | 4 +-
.../DarcyForchheimer/DarcyForchheimer.H | 2 +-
.../general/porosityModel/fixedCoeff/fixedCoeff.C | 4 +-
.../general/porosityModel/fixedCoeff/fixedCoeff.H | 2 +-
.../porosityModel/porosityModel/porosityModel.C | 2 +-
.../porosityModel/porosityModelList.C | 2 +-
.../general/porosityModel/powerLaw/powerLaw.C | 4 +-
.../general/porosityModel/powerLaw/powerLaw.H | 2 +-
.../fixedGradient/fixedGradientFvPatchField.H | 2 +-
.../flowRateInletVelocityFvPatchVectorField.H | 2 +-
...inletOutletTotalTemperatureFvPatchScalarField.H | 2 +-
.../mappedFixedValueFvPatchField.H | 4 +-
...essureDirectedInletVelocityFvPatchVectorField.H | 2 +-
...PressureInletOutletVelocityFvPatchVectorField.H | 4 +-
.../rotatingTotalPressureFvPatchScalarField.H | 4 +-
.../rotatingWallVelocityFvPatchVectorField.H | 4 +-
.../supersonicFreestreamFvPatchVectorField.H | 2 +-
.../fvPatchFields/fvPatchField/fvPatchField.C | 6 +-
src/fvAgglomerationMethods/Allwmake | 19 +-
.../MGridGenGamgAgglomeration/Make/options | 10 +
src/fvOptions/Make/options | 1 -
src/lagrangian/Allwmake | 2 +-
.../COxidationHurtMitchell.H | 2 +-
.../distributionModels/uniform/uniform.C | 3 +-
.../distributionModels/uniform/uniform.H | 2 +-
.../InjectionModel/InjectionModelList.H | 2 +-
src/lagrangian/molecularDynamics/Allwmake | 2 +-
.../BreakupModel/PilchErdman/PilchErdman.H | 2 +-
src/mesh/Allwmake | 2 +-
.../edgeFaceCirculator/edgeFaceCirculator.C | 2 +-
.../momentOfInertia/volumeIntegration/volInt.c | 28 +-
src/parallel/Allwmake | 2 +-
src/parallel/decompose/Allwmake | 26 +-
src/parallel/decompose/AllwmakeLnInclude | 2 +-
src/parallel/decompose/ptscotchDecomp/Make/options | 10 +-
src/parallel/decompose/scotchDecomp/Make/options | 8 +-
src/parallel/reconstruct/Allwmake | 2 +-
src/postProcessing/Allwmake | 2 +-
src/postProcessing/functionObjects/Allwmake | 2 +-
.../field/fieldValues/faceSource/faceSource.H | 4 +-
src/regionModels/Allwclean | 2 +-
src/regionModels/Allwmake | 2 +-
.../pyrolysisModel/pyrolysisModelCollection.C | 2 +-
.../pyrolysisModel/pyrolysisModelNew.C | 2 +-
.../thermalBaffleModels/noThermo/noThermo.C | 2 +-
src/renumber/Allwmake | 26 +-
src/renumber/SloanRenumber/Make/options | 9 +-
src/sampling/cuttingPlane/cuttingPlane.C | 6 +-
.../sampledSurface/sampledPatch/sampledPatch.C | 2 +-
.../writers/nastran/nastranSurfaceWriter.C | 2 +-
src/surfMesh/MeshedSurface/MeshedSurface.C | 20 +-
src/surfMesh/MeshedSurface/MeshedSurface.H | 2 +-
.../MeshedSurfaceIOAllocator.C | 8 +-
.../UnsortedMeshedSurface/UnsortedMeshedSurface.C | 6 +-
src/surfMesh/surfMesh/surfMesh.C | 2 +-
src/thermophysicalModels/Allwmake | 2 +-
src/thermophysicalModels/properties/Allwmake | 2 +-
src/thermophysicalModels/reactionThermo/Make/files | 2 +-
.../chemistryReaders/chemkinReader/chemkinReader.C | 9 +
.../specie/reaction/Reactions/Reaction/Reaction.C | 6 +-
src/transportModels/Allwmake | 2 +-
src/turbulenceModels/Allwmake | 2 +-
src/turbulenceModels/LES/Allwmake | 2 +-
src/turbulenceModels/compressible/Allwmake | 2 +-
.../compressible/LES/DESModel/DESModelDoc.H | 2 +-
.../compressible/LES/GenEddyVisc/GenEddyVisc.H | 2 +-
.../compressible/LES/GenSGSStress/GenSGSStress.H | 4 +-
.../compressible/LES/LESModel/LESModelDoc.H | 2 +-
.../compressible/RAS/RASModel/RASModelDoc.H | 2 +-
...gLengthDissipationRateInletFvPatchScalarField.H | 2 +-
...tMixingLengthFrequencyInletFvPatchScalarField.H | 2 +-
.../turbulenceModel/turbulenceModelDoc.H | 2 +-
src/turbulenceModels/incompressible/Allwmake | 2 +-
.../incompressible/LES/DESModel/DESModelDoc.H | 2 +-
.../incompressible/LES/GenEddyVisc/GenEddyVisc.H | 2 +-
.../incompressible/LES/GenSGSStress/GenSGSStress.H | 6 +-
.../incompressible/LES/LESModel/LESModelDoc.H | 2 +-
.../incompressible/RAS/RASModel/RASModelDoc.H | 2 +-
...tmBoundaryLayerInletEpsilonFvPatchScalarField.H | 2 +-
...urbulentHeatFluxTemperatureFvPatchScalarField.H | 2 +-
...gLengthDissipationRateInletFvPatchScalarField.H | 2 +-
...tMixingLengthFrequencyInletFvPatchScalarField.H | 2 +-
.../turbulenceModel/turbulenceModelDoc.H | 2 +-
wmake/MakefileOptions | 54 --
wmake/makeWmake | 65 --
wmake/{MakefileApps => makefiles/apps} | 15 +-
wmake/{MakefileFiles => makefiles/files} | 67 +-
wmake/{Makefile => makefiles/general} | 172 ++--
wmake/rules/General/CGAL | 8 +-
wmake/rules/General/X | 2 +
wmake/rules/General/bison | 20 +-
wmake/rules/General/btyacc | 13 +-
wmake/rules/General/btyacc++ | 8 +-
wmake/rules/General/byacc | 13 +-
wmake/rules/General/coco-cpp | 15 -
wmake/rules/General/flex | 11 +-
wmake/rules/General/flex++ | 11 +-
wmake/rules/General/general | 46 +-
wmake/rules/General/moc | 11 +-
wmake/rules/General/mplib | 2 +
wmake/rules/General/mplibGAMMA | 3 -
wmake/rules/General/mplibMPICH | 4 +-
wmake/rules/General/mplibMPICH-GM | 4 +-
wmake/rules/General/mplibOPENMPI | 3 +-
wmake/rules/General/mplibQSMPI | 3 +-
wmake/rules/General/mplibSGIMPI | 4 +-
wmake/rules/General/mplibSYSTEMMPI | 7 +
wmake/rules/General/mplibSYSTEMOPENMPI | 2 +
wmake/rules/General/sourceToDep | 24 -
wmake/rules/General/standard | 9 +-
wmake/rules/General/transform | 17 +
wmake/rules/General/version | 21 +-
wmake/rules/General/yacc | 24 +-
wmake/rules/SiCortex64Gcc/c | 17 -
wmake/rules/SiCortex64Gcc/c++ | 22 -
wmake/rules/SiCortex64Gcc/c++Opt | 4 -
wmake/rules/SiCortex64Gcc/general | 10 -
wmake/rules/SiCortex64Gcc/mplibMPI | 3 -
wmake/rules/SunOS64Gcc/c++ | 21 -
wmake/rules/SunOS64Gcc/c++Opt | 2 -
wmake/rules/darwin64Clang/c | 23 +
wmake/rules/darwin64Clang/c++ | 35 +
wmake/rules/darwin64Clang/c++Debug | 4 +
wmake/rules/darwin64Clang/c++Opt | 5 +
wmake/rules/darwin64Clang/c++Prof | 4 +
wmake/rules/darwin64Clang/cDebug | 4 +
wmake/rules/darwin64Clang/cOpt | 4 +
wmake/rules/darwin64Clang/cProf | 4 +
wmake/rules/darwin64Clang/general | 12 +
wmake/rules/linux64Clang/c | 8 +-
wmake/rules/linux64Clang/c++ | 16 +-
wmake/rules/linux64Clang/c++Debug | 2 +
wmake/rules/linux64Clang/c++Opt | 3 +-
wmake/rules/linux64Clang/c++Prof | 2 +
wmake/rules/linux64Clang/cDebug | 2 +
wmake/rules/linux64Clang/cOpt | 2 +
wmake/rules/linux64Clang/cProf | 2 +
wmake/rules/linux64Clang/general | 6 +-
wmake/rules/linux64Clang/mplibHPMPI | 4 +-
wmake/rules/linux64Clang/mplibINTELMPI | 4 +-
wmake/rules/linux64Gcc++0x/c++Opt | 3 -
wmake/rules/linux64Gcc++0x/general | 8 -
wmake/rules/linux64Gcc++0x/mplibHPMPI | 3 -
wmake/rules/linux64Gcc/c | 8 +-
wmake/rules/linux64Gcc/c++ | 15 +-
wmake/rules/linux64Gcc/c++Debug | 2 +
wmake/rules/linux64Gcc/c++Opt | 5 +-
wmake/rules/linux64Gcc/c++Prof | 2 +
wmake/rules/linux64Gcc/cDebug | 2 +
wmake/rules/linux64Gcc/cOpt | 3 +-
wmake/rules/linux64Gcc/cProf | 2 +
wmake/rules/linux64Gcc/general | 6 +-
wmake/rules/linux64Gcc/mplibHPMPI | 4 +-
wmake/rules/linux64Gcc/mplibINTELMPI | 4 +-
wmake/rules/linux64Gcc43/c | 16 -
wmake/rules/linux64Gcc43/c++ | 21 -
wmake/rules/linux64Gcc43/c++Debug | 2 -
wmake/rules/linux64Gcc43/c++Opt | 4 -
wmake/rules/linux64Gcc43/cDebug | 2 -
wmake/rules/linux64Gcc43/cOpt | 2 -
wmake/rules/linux64Gcc44/c++ | 21 -
wmake/rules/linux64Gcc44/c++Debug | 2 -
wmake/rules/linux64Gcc44/c++Opt | 4 -
wmake/rules/linux64Gcc44/c++Prof | 2 -
wmake/rules/linux64Gcc44/cDebug | 2 -
wmake/rules/linux64Gcc44/cOpt | 2 -
wmake/rules/linux64Gcc44/cProf | 2 -
wmake/rules/linux64Gcc44/mplibINTELMPI | 3 -
wmake/rules/linux64Gcc45/c | 16 -
wmake/rules/linux64Gcc45/c++ | 21 -
wmake/rules/linux64Gcc45/c++Debug | 2 -
wmake/rules/linux64Gcc45/c++Opt | 4 -
wmake/rules/linux64Gcc45/c++Prof | 2 -
wmake/rules/linux64Gcc45/cDebug | 2 -
wmake/rules/linux64Gcc45/cOpt | 2 -
wmake/rules/linux64Gcc45/cProf | 2 -
wmake/rules/linux64Gcc45/general | 8 -
wmake/rules/linux64Gcc45/mplibINTELMPI | 3 -
wmake/rules/linux64Gcc46/c | 16 -
wmake/rules/linux64Gcc46/c++ | 21 -
wmake/rules/linux64Gcc46/c++Debug | 2 -
wmake/rules/linux64Gcc46/c++Opt | 4 -
wmake/rules/linux64Gcc46/c++Prof | 2 -
wmake/rules/linux64Gcc46/cDebug | 2 -
wmake/rules/linux64Gcc46/cOpt | 2 -
wmake/rules/linux64Gcc46/cProf | 2 -
wmake/rules/linux64Gcc46/general | 8 -
wmake/rules/linux64Gcc46/mplibHPMPI | 3 -
wmake/rules/linux64Gcc46/mplibINTELMPI | 3 -
wmake/rules/linux64Gcc47/c | 16 -
wmake/rules/linux64Gcc47/c++Debug | 2 -
wmake/rules/linux64Gcc47/c++Opt | 2 -
wmake/rules/linux64Gcc47/c++Prof | 2 -
wmake/rules/linux64Gcc47/cDebug | 2 -
wmake/rules/linux64Gcc47/cOpt | 2 -
wmake/rules/linux64Gcc47/cProf | 2 -
wmake/rules/linux64Gcc47/general | 8 -
wmake/rules/linux64Gcc47/mplibHPMPI | 3 -
wmake/rules/linux64Gcc47/mplibINTELMPI | 3 -
wmake/rules/{linux64Gcc44 => linux64GccKNL}/c | 8 +-
wmake/rules/linux64GccKNL/c++ | 24 +
.../{SiCortex64Gcc => linux64GccKNL}/c++Debug | 0
wmake/rules/linux64GccKNL/c++Opt | 4 +
.../rules/{SiCortex64Gcc => linux64GccKNL}/c++Prof | 0
.../rules/{SiCortex64Gcc => linux64GccKNL}/cDebug | 0
wmake/rules/{SiCortex64Gcc => linux64GccKNL}/cOpt | 0
wmake/rules/{SiCortex64Gcc => linux64GccKNL}/cProf | 0
.../rules/{linux64Gcc43 => linux64GccKNL}/general | 4 +-
.../{linux64Gcc45 => linux64GccKNL}/mplibHPMPI | 2 +-
.../mplibINTELMPI | 2 +-
wmake/rules/linux64Icc/c | 6 +-
wmake/rules/linux64Icc/c++ | 14 +-
wmake/rules/linux64Icc/c++Opt | 2 +-
wmake/rules/linux64Icc/cOpt | 2 +-
wmake/rules/linux64Icc/general | 4 +-
wmake/rules/linux64Icc/mplibHPMPI | 2 +-
wmake/rules/linux64Icc/mplibINTELMPI | 2 +-
wmake/rules/linux64IccKNL/c | 16 +
wmake/rules/linux64IccKNL/c++ | 25 +
wmake/rules/linux64IccKNL/c++Debug | 2 +
wmake/rules/linux64IccKNL/c++Opt | 2 +
wmake/rules/{SunOS64Gcc => linux64IccKNL}/c++Prof | 0
wmake/rules/linux64IccKNL/cDebug | 2 +
wmake/rules/linux64IccKNL/cOpt | 2 +
wmake/rules/{SunOS64Gcc => linux64IccKNL}/cProf | 0
wmake/rules/linux64IccKNL/general | 8 +
.../{linux64Gcc44 => linux64IccKNL}/mplibHPMPI | 2 +-
.../{linux64Gcc43 => linux64IccKNL}/mplibINTELMPI | 2 +-
wmake/rules/linuxARM7Gcc/c | 6 +-
wmake/rules/linuxARM7Gcc/c++ | 13 +-
wmake/rules/linuxARM7Gcc/c++Opt | 2 +
wmake/rules/linuxARM7Gcc/general | 4 +-
wmake/rules/linuxARM7Gcc/mplibHPMPI | 2 +-
wmake/rules/linuxClang/c | 6 +-
wmake/rules/linuxClang/c++ | 14 +-
wmake/rules/linuxClang/general | 4 +-
wmake/rules/linuxClang/mplibHPMPI | 2 +-
wmake/rules/linuxGcc/c | 6 +-
wmake/rules/linuxGcc/c++ | 13 +-
wmake/rules/linuxGcc/c++Opt | 2 +
wmake/rules/linuxGcc/general | 4 +-
wmake/rules/linuxGcc/mplibHPMPI | 2 +-
wmake/rules/linuxGcc43/c | 16 -
wmake/rules/linuxGcc43/c++ | 21 -
wmake/rules/linuxGcc43/c++Debug | 2 -
wmake/rules/linuxGcc43/c++Opt | 2 -
wmake/rules/linuxGcc43/c++Prof | 2 -
wmake/rules/linuxGcc43/cDebug | 2 -
wmake/rules/linuxGcc43/cOpt | 2 -
wmake/rules/linuxGcc43/cProf | 2 -
wmake/rules/linuxGcc43/general | 9 -
wmake/rules/linuxGcc43/mplibHPMPI | 3 -
wmake/rules/linuxGcc44/c | 16 -
wmake/rules/linuxGcc44/c++ | 21 -
wmake/rules/linuxGcc44/c++Debug | 2 -
wmake/rules/linuxGcc44/c++Opt | 2 -
wmake/rules/linuxGcc44/c++Prof | 2 -
wmake/rules/linuxGcc44/cDebug | 2 -
wmake/rules/linuxGcc44/cOpt | 2 -
wmake/rules/linuxGcc44/cProf | 2 -
wmake/rules/linuxGcc44/general | 9 -
wmake/rules/linuxGcc44/mplibHPMPI | 3 -
wmake/rules/linuxGcc45/c | 16 -
wmake/rules/linuxGcc45/c++ | 21 -
wmake/rules/linuxGcc45/c++Debug | 2 -
wmake/rules/linuxGcc45/c++Opt | 2 -
wmake/rules/linuxGcc45/c++Prof | 2 -
wmake/rules/linuxGcc45/cDebug | 2 -
wmake/rules/linuxGcc45/cOpt | 2 -
wmake/rules/linuxGcc45/cProf | 2 -
wmake/rules/linuxGcc45/general | 9 -
wmake/rules/linuxGcc45/mplibHPMPI | 3 -
wmake/rules/linuxGcc46/c | 16 -
wmake/rules/linuxGcc46/c++ | 21 -
wmake/rules/linuxGcc46/c++Debug | 2 -
wmake/rules/linuxGcc46/c++Opt | 2 -
wmake/rules/linuxGcc46/c++Prof | 2 -
wmake/rules/linuxGcc46/cDebug | 2 -
wmake/rules/linuxGcc46/cOpt | 2 -
wmake/rules/linuxGcc46/cProf | 2 -
wmake/rules/linuxGcc46/general | 9 -
wmake/rules/linuxGcc46/mplibHPMPI | 3 -
wmake/rules/linuxGcc47/c | 16 -
wmake/rules/linuxGcc47/c++ | 21 -
wmake/rules/linuxGcc47/c++Debug | 2 -
wmake/rules/linuxGcc47/c++Opt | 2 -
wmake/rules/linuxGcc47/c++Prof | 2 -
wmake/rules/linuxGcc47/cDebug | 2 -
wmake/rules/linuxGcc47/cOpt | 2 -
wmake/rules/linuxGcc47/cProf | 2 -
wmake/rules/linuxGcc47/general | 9 -
wmake/rules/linuxGcc47/mplibHPMPI | 3 -
wmake/rules/linuxIA64Gcc/c | 6 +-
wmake/rules/linuxIA64Gcc/c++ | 13 +-
wmake/rules/linuxIA64Gcc/general | 6 +-
wmake/rules/linuxIA64Gcc/mplibHPMPI | 2 +-
wmake/rules/linuxIA64Icc/c | 6 +-
wmake/rules/linuxIA64Icc/c++ | 14 +-
wmake/rules/linuxIA64Icc/general | 6 +-
wmake/rules/linuxIA64Icc/mplibHPMPI | 2 +-
wmake/rules/linuxIA64Icc/mplibINTELMPI | 2 +-
wmake/rules/linuxIcc/c | 6 +-
wmake/rules/linuxIcc/c++ | 16 +-
wmake/rules/linuxIcc/c++Opt | 2 +-
wmake/rules/linuxIcc/cOpt | 2 +-
wmake/rules/linuxIcc/general | 4 +-
wmake/rules/linuxIcc/mplibHPMPI | 2 +-
wmake/rules/linuxPPC64Gcc/c | 6 +-
wmake/rules/linuxPPC64Gcc/c++ | 13 +-
wmake/rules/linuxPPC64Gcc/c++Opt | 2 +
wmake/rules/linuxPPC64Gcc/general | 6 +-
wmake/rules/linuxPPC64Gcc/mplibHPMPI | 2 +-
wmake/rules/{SiCortex64Gcc => linuxPPC64leGcc}/X | 0
wmake/rules/{SunOS64Gcc => linuxPPC64leGcc}/c | 8 +-
wmake/rules/{linux64Gcc47 => linuxPPC64leGcc}/c++ | 13 +-
.../rules/{SunOS64Gcc => linuxPPC64leGcc}/c++Debug | 0
wmake/rules/linuxPPC64leGcc/c++Opt | 4 +
.../{linux64Gcc++0x => linuxPPC64leGcc}/c++Prof | 0
wmake/rules/{SunOS64Gcc => linuxPPC64leGcc}/cDebug | 0
wmake/rules/{SunOS64Gcc => linuxPPC64leGcc}/cOpt | 0
.../{linux64Gcc++0x => linuxPPC64leGcc}/cProf | 0
.../{linux64Gcc44 => linuxPPC64leGcc}/general | 6 +-
.../{linux64Gcc43 => linuxPPC64leGcc}/mplibHPMPI | 2 +-
wmake/rules/{SunOS64Gcc => solaris64Gcc}/X | 0
wmake/rules/{linux64Gcc++0x => solaris64Gcc}/c | 6 +-
wmake/rules/{linux64Gcc++0x => solaris64Gcc}/c++ | 13 +-
.../{linux64Gcc++0x => solaris64Gcc}/c++Debug | 0
wmake/rules/solaris64Gcc/c++Opt | 4 +
wmake/rules/{linux64Gcc43 => solaris64Gcc}/c++Prof | 0
.../rules/{linux64Gcc++0x => solaris64Gcc}/cDebug | 0
wmake/rules/{linux64Gcc++0x => solaris64Gcc}/cOpt | 0
wmake/rules/{linux64Gcc43 => solaris64Gcc}/cProf | 0
wmake/rules/{SunOS64Gcc => solaris64Gcc}/general | 6 +-
.../rules/{SunOS64Gcc => solaris64Gcc}/mplibFJMPI | 2 +-
wmake/rules/solarisGcc/c | 6 +-
wmake/rules/solarisGcc/c++ | 13 +-
wmake/rules/solarisGcc/c++Opt | 6 +-
wmake/rules/solarisGcc/general | 6 +-
wmake/rules/solarisGcc/mplibMPI | 2 +-
wmake/rules/solarisGcc/mplibMPICH | 2 +-
wmake/scripts/AllwmakeParseArguments | 184 ++++
wmake/scripts/addCompile | 64 --
wmake/scripts/makeDerivedFiles | 133 ---
wmake/scripts/makeDir | 40 -
wmake/scripts/makeFiles | 4 +-
wmake/scripts/wmakeFunctions | 113 +++
wmake/src/Makefile | 43 +-
wmake/src/makeParserCode | 54 --
wmake/src/wmkdep.l | 197 ++--
wmake/src/wmkdepend.cpp | 176 ----
wmake/src/wmkdependParser.atg | 366 -------
wmake/src/wmkdependParser.cpp | 575 -----------
wmake/src/wmkdependParser.h | 176 ----
wmake/src/wmkdependScanner.cpp | 1021 --------------------
wmake/src/wmkdependScanner.h | 476 ---------
wmake/wclean | 180 +++-
wmake/wcleanAll | 80 --
wmake/wcleanLnIncludeAll | 30 +-
wmake/wcleanMachine | 80 --
wmake/wcleanPlatform | 127 +++
wmake/wdep | 118 +++
wmake/wmake | 299 ++++--
wmake/wmakeCheckPwd | 49 +-
wmake/wmakeFilesAndOptions | 33 +-
wmake/wmakeFindEmptyMake | 87 --
wmake/wmakeLnInclude | 80 +-
wmake/wmakeLnIncludeAll | 38 +-
wmake/wmakePrintBuild | 82 +-
wmake/wmakeScheduler | 71 +-
wmake/wmakeSchedulerUptime | 70 +-
wmake/wrmdep | 230 +++++
wmake/wrmo | 116 +++
492 files changed, 3662 insertions(+), 5539 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7c8bce03..039c3703 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ linuxming*/
SiCortex*Gcc*/
solaris*Gcc*/
SunOS*Gcc*/
+darwin*Clang*/
platforms/
# reinstate wmake/rules that might look like build folders
diff --git a/Allwmake b/Allwmake
index 16edfd1f..0f3e419d 100755
--- a/Allwmake
+++ b/Allwmake
@@ -2,17 +2,19 @@
cd ${0%/*} || exit 1 # run from this directory
wmakeCheckPwd "$WM_PROJECT_DIR" || {
- echo "Error: Current directory is not \$WM_PROJECT_DIR"
- echo " The environment variables are inconsistent with the installation."
- echo " Check the OpenFOAM entries in your dot-files and source them."
- exit 1
+ echo "Error: Current directory is not \$WM_PROJECT_DIR"
+ echo " The environment variables are inconsistent with the installation."
+ echo " Check the OpenFOAM entries in your dot-files and source them."
+ exit 1
}
-[ -n "$FOAM_EXT_LIBBIN" ] || {
- echo "Error: FOAM_EXT_LIBBIN not set"
- echo " Check the OpenFOAM entries in your dot-files and source them."
- exit 1
-}
+if [ "$(uname -s)" != "Darwin" ]; then
+ [ -n "$FOAM_EXT_LIBBIN" ] || {
+ echo "Error: FOAM_EXT_LIBBIN not set"
+ echo " Check the OpenFOAM entries in your dot-files and source them."
+ exit 1
+ }
+fi
# wmake is required for subsequent targets
( cd wmake/src && make )
@@ -20,9 +22,10 @@ wmakeCheckPwd "$WM_PROJECT_DIR" || {
# build ThirdParty sources
if [ -d "$WM_THIRD_PARTY_DIR" ]
then
- $WM_THIRD_PARTY_DIR/Allwmake
+ $WM_THIRD_PARTY_DIR/Allwmake
else
- echo "no ThirdParty sources found - skipping"
+ [ "$(uname -s)" != "Darwin" ] \
+ && echo "no ThirdParty sources found - skipping"
fi
# build OpenFOAM libraries and applications
@@ -31,7 +34,7 @@ applications/Allwmake
if [ "$1" = doc ]
then
- doc/Allwmake
+ doc/Allwmake
fi
# ----------------------------------------------------------------- end-of-file
diff --git a/applications/Allwmake b/applications/Allwmake
index 00bc3266..112e2a3d 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -8,13 +8,15 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
exit 1
}
-[ -n "$FOAM_EXT_LIBBIN" ] || {
- echo "Error: FOAM_EXT_LIBBIN not set"
- echo " Check the OpenFOAM entries in your dot-files and source them."
- exit 1
-}
+if [ "$(uname -s)" != "Darwin" ]; then
+ [ -n "$FOAM_EXT_LIBBIN" ] || {
+ echo "Error: FOAM_EXT_LIBBIN not set"
+ echo " Check the OpenFOAM entries in your dot-files and source them."
+ exit 1
+ }
+fi
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake all utilities
wmake all solvers
diff --git a/applications/solvers/combustion/reactingFoam/Allwmake b/applications/solvers/combustion/reactingFoam/Allwmake
index 0512e534..6346914d 100755
--- a/applications/solvers/combustion/reactingFoam/Allwmake
+++ b/applications/solvers/combustion/reactingFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake rhoReactingFoam
diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwclean b/applications/solvers/compressible/rhoCentralFoam/Allwclean
index cc5398c0..83011c5e 100755
--- a/applications/solvers/compressible/rhoCentralFoam/Allwclean
+++ b/applications/solvers/compressible/rhoCentralFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean libso BCs
wclean
diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake
index 33e08e10..eae5225a 100755
--- a/applications/solvers/compressible/rhoCentralFoam/Allwmake
+++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
(wmake libso BCs && wmake && wmake rhoCentralDyMFoam)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Allwmake b/applications/solvers/compressible/rhoPimpleFoam/Allwmake
index 1b272c17..967f701a 100755
--- a/applications/solvers/compressible/rhoPimpleFoam/Allwmake
+++ b/applications/solvers/compressible/rhoPimpleFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake rhoPimplecFoam
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwclean b/applications/solvers/compressible/rhoSimpleFoam/Allwclean
index a1fd479e..a12d86a2 100755
--- a/applications/solvers/compressible/rhoSimpleFoam/Allwclean
+++ b/applications/solvers/compressible/rhoSimpleFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean
wclean rhoPorousSimpleFoam
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwmake b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
index dc0fd648..39a2e0e9 100755
--- a/applications/solvers/compressible/rhoSimpleFoam/Allwmake
+++ b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake rhoPorousSimpleFoam
diff --git a/applications/solvers/compressible/sonicFoam/Allwmake b/applications/solvers/compressible/sonicFoam/Allwmake
index 27c1194e..84ffc478 100755
--- a/applications/solvers/compressible/sonicFoam/Allwmake
+++ b/applications/solvers/compressible/sonicFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake sonicDyMFoam
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Allwclean b/applications/solvers/heatTransfer/chtMultiRegionFoam/Allwclean
index c583a8de..411f1c2b 100755
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Allwclean
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean
wclean chtMultiRegionSimpleFoam
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Allwmake b/applications/solvers/heatTransfer/chtMultiRegionFoam/Allwmake
index f65ba118..e929be82 100755
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Allwmake
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake chtMultiRegionSimpleFoam
diff --git a/applications/solvers/incompressible/pimpleFoam/Allwmake b/applications/solvers/incompressible/pimpleFoam/Allwmake
index 8727bdb2..15edf19c 100755
--- a/applications/solvers/incompressible/pimpleFoam/Allwmake
+++ b/applications/solvers/incompressible/pimpleFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake SRFPimpleFoam
diff --git a/applications/solvers/incompressible/simpleFoam/Allwmake b/applications/solvers/incompressible/simpleFoam/Allwmake
index 801fd3b7..6d19cb31 100755
--- a/applications/solvers/incompressible/simpleFoam/Allwmake
+++ b/applications/solvers/incompressible/simpleFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
diff --git a/applications/solvers/lagrangian/DPMFoam/Allwclean b/applications/solvers/lagrangian/DPMFoam/Allwclean
index ed697d99..684c898b 100755
--- a/applications/solvers/lagrangian/DPMFoam/Allwclean
+++ b/applications/solvers/lagrangian/DPMFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean dragModels
wclean
diff --git a/applications/solvers/lagrangian/DPMFoam/Allwmake b/applications/solvers/lagrangian/DPMFoam/Allwmake
index 17722925..55121e54 100755
--- a/applications/solvers/lagrangian/DPMFoam/Allwmake
+++ b/applications/solvers/lagrangian/DPMFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake dragModels
wmake
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Allwmake b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Allwmake
index 845cebd7..69d13764 100755
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Allwmake
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake icoUncoupledKinematicParcelDyMFoam
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Allwmake b/applications/solvers/lagrangian/reactingParcelFoam/Allwmake
index f615df21..b24f69b7 100755
--- a/applications/solvers/lagrangian/reactingParcelFoam/Allwmake
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake simpleReactingParcelFoam
diff --git a/applications/solvers/lagrangian/sprayFoam/Allwmake b/applications/solvers/lagrangian/sprayFoam/Allwmake
index 542509db..b62792e4 100755
--- a/applications/solvers/lagrangian/sprayFoam/Allwmake
+++ b/applications/solvers/lagrangian/sprayFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
diff --git a/applications/solvers/multiphase/cavitatingFoam/Allwclean b/applications/solvers/multiphase/cavitatingFoam/Allwclean
index 62548246..a06cc1f0 100755
--- a/applications/solvers/multiphase/cavitatingFoam/Allwclean
+++ b/applications/solvers/multiphase/cavitatingFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean
wclean cavitatingDyMFoam
diff --git a/applications/solvers/multiphase/cavitatingFoam/Allwmake b/applications/solvers/multiphase/cavitatingFoam/Allwmake
index 211c1978..2d4eaa83 100755
--- a/applications/solvers/multiphase/cavitatingFoam/Allwmake
+++ b/applications/solvers/multiphase/cavitatingFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake cavitatingDyMFoam
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwclean b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
index aa0f3c01..2ce4befb 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwclean
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean libso twoPhaseMixtureThermo
wclean
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
index a93da26c..7a20e329 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake libso twoPhaseMixtureThermo
wmake
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/Allwclean
index cc138bc0..42d8d983 100755
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean libso phaseModel
wclean libso interfacialModels
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/Allwmake
index 29294d16..aca0b8d7 100755
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake libso phaseModel
wmake libso interfacialModels
diff --git a/applications/solvers/multiphase/interFoam/Allwclean b/applications/solvers/multiphase/interFoam/Allwclean
index 8b080006..39e9c740 100755
--- a/applications/solvers/multiphase/interFoam/Allwclean
+++ b/applications/solvers/multiphase/interFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean
wclean interDyMFoam
diff --git a/applications/solvers/multiphase/interFoam/Allwmake b/applications/solvers/multiphase/interFoam/Allwmake
index cc883614..a0b8cea1 100755
--- a/applications/solvers/multiphase/interFoam/Allwmake
+++ b/applications/solvers/multiphase/interFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake
wmake interDyMFoam
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
index 4d8ead85..6c7cd896 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
@@ -92,7 +92,7 @@ Foam::threePhaseMixture::threePhaseMixture
rho3_(nuModel3_->viscosityProperties().lookup("rho")),
U_(U),
- phi_(phi),
+ // phi_(phi),
alpha1_(U_.db().lookupObject<const volScalarField> ("alpha1")),
alpha2_(U_.db().lookupObject<const volScalarField> ("alpha2")),
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
index 67743ad2..e72c0e17 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
@@ -67,7 +67,7 @@ class threePhaseMixture
dimensionedScalar rho3_;
const volVectorField& U_;
- const surfaceScalarField& phi_;
+ // const surfaceScalarField& phi_;
const volScalarField& alpha1_;
const volScalarField& alpha2_;
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean b/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean
index 99c52e59..e17cd5aa 100755
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean libso phaseChangeTwoPhaseMixtures
wclean
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
index 414ed904..6c35a136 100755
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake libso phaseChangeTwoPhaseMixtures
wmake
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean b/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean
index a1a5b83b..79f4af9e 100755
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean libso phaseModel
wclean libso multiphaseSystem
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
index 4ab7ebbf..12d6884a 100755
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake libso phaseModel
wmake libso interfacialModels
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwclean b/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
index 6f55580c..2b7313d3 100755
--- a/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean
wclean MRFMultiphaseInterFoam
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
index 6e47f91d..9b0ba460 100755
--- a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake libso multiphaseMixture
wmake
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
index cc138bc0..42d8d983 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wclean libso phaseModel
wclean libso interfacialModels
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
index 29294d16..aca0b8d7 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-set -x
+[ -z "$WM_SILENT_RULES" ] && set -x
wmake libso phaseModel
wmake libso interfacialModels
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index 25800377..1afa0291 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake