diff --git a/.gitignore b/.gitignore
index e557737ab..2f2a48379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # git-ls-files --others --exclude-from=.git/info/exclude
 # Lines that start with '#' are comments.
 
+#HJ, local modifications of setup
+etc/bashrc
+
 # editor and misc backup files - anywhere
 *~
 .*~
@@ -37,6 +40,7 @@ lnInclude
 # build folders - anywhere
 linux*Gcc*/
 linux*Icc*/
+darwin*Gcc*/
 linuxming*/
 SiCortex*Gcc*/
 solaris*Gcc*/
diff --git a/etc/bashrc b/etc/bashrc
index 965a08265..82f09648b 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -95,7 +95,7 @@ export WM_COMPILER_LIB_ARCH=
 
 # Compilation options (architecture, precision, optimised, debug or profiling)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-export WM_NCOMPPROCS=2
+export WM_NCOMPPROCS=12
 
 # WM_ARCH_OPTION = 32 | 64
 : ${WM_ARCH_OPTION:=64}; export WM_ARCH_OPTION
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1
deleted file mode 120000
index 998d3c766..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.05 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.05
deleted file mode 120000
index e850ca454..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.05
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.05/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.1 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.1
deleted file mode 120000
index 0c88430e6..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.1
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.1/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.15 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.15
deleted file mode 120000
index 93f99b948..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.15
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.15/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.2 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.2
deleted file mode 120000
index 549cfe85a..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.2
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.2/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.25 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.25
deleted file mode 120000
index 03b2e15d8..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.25
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.25/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.3 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.3
deleted file mode 120000
index 1800834c0..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.3
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.3/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.35 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.35
deleted file mode 120000
index ead85d075..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.35
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.35/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.4 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.4
deleted file mode 120000
index 731b34e22..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.4
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.4/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.45 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.45
deleted file mode 120000
index 6a26fdd5d..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.45
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.45/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.5 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.5
deleted file mode 120000
index b5bff76de..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.5
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.5/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.55 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.55
deleted file mode 120000
index 31454870e..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.55
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.55/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.6 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.6
deleted file mode 120000
index 58100c3c8..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.6
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.6/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.65 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.65
deleted file mode 120000
index 40461a343..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.65
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.65/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.7 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.7
deleted file mode 120000
index 7c4815ec4..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.7
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.7/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.75 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.75
deleted file mode 120000
index 924bb39a3..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.75
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.75/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.8 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.8
deleted file mode 120000
index 03d19db79..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.8
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.8/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.85 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.85
deleted file mode 120000
index f0c6640a9..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.85
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.85/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.9 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.9
deleted file mode 120000
index af5a04607..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.9
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.9/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.95 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.95
deleted file mode 120000
index 3dae44f01..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/1.95
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/1.95/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/2 b/tutorials/coupled/conjugateHeatFoam/heatedBlock/2
deleted file mode 120000
index 686496d7e..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/2
+++ /dev/null
@@ -1 +0,0 @@
-../conjugateCavity/2/solid
\ No newline at end of file
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/faces b/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/faces
deleted file mode 100644
index 37164db9a..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/faces
+++ /dev/null
@@ -1,451 +0,0 @@
-/*---------------------------------------------------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.3                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-FoamFile
-{
-    version 2.0;
-    format ascii;
-
-    root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix";
-    case "heatedBlock";
-    instance "constant";
-    local "polyMesh";
-
-    class faceList;
-    object faces;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-420
-(
-4(1 12 133 122)
-4(11 132 133 12)
-4(2 13 134 123)
-4(12 133 134 13)
-4(3 14 135 124)
-4(13 134 135 14)
-4(4 15 136 125)
-4(14 135 136 15)
-4(5 16 137 126)
-4(15 136 137 16)
-4(6 17 138 127)
-4(16 137 138 17)
-4(7 18 139 128)
-4(17 138 139 18)
-4(8 19 140 129)
-4(18 139 140 19)
-4(9 20 141 130)
-4(19 140 141 20)
-4(20 141 142 21)
-4(12 23 144 133)
-4(22 143 144 23)
-4(13 24 145 134)
-4(23 144 145 24)
-4(14 25 146 135)
-4(24 145 146 25)
-4(15 26 147 136)
-4(25 146 147 26)
-4(16 27 148 137)
-4(26 147 148 27)
-4(17 28 149 138)
-4(27 148 149 28)
-4(18 29 150 139)
-4(28 149 150 29)
-4(19 30 151 140)
-4(29 150 151 30)
-4(20 31 152 141)
-4(30 151 152 31)
-4(31 152 153 32)
-4(23 34 155 144)
-4(33 154 155 34)
-4(24 35 156 145)
-4(34 155 156 35)
-4(25 36 157 146)
-4(35 156 157 36)
-4(26 37 158 147)
-4(36 157 158 37)
-4(27 38 159 148)
-4(37 158 159 38)
-4(28 39 160 149)
-4(38 159 160 39)
-4(29 40 161 150)
-4(39 160 161 40)
-4(30 41 162 151)
-4(40 161 162 41)
-4(31 42 163 152)
-4(41 162 163 42)
-4(42 163 164 43)
-4(34 45 166 155)
-4(44 165 166 45)
-4(35 46 167 156)
-4(45 166 167 46)
-4(36 47 168 157)
-4(46 167 168 47)
-4(37 48 169 158)
-4(47 168 169 48)
-4(38 49 170 159)
-4(48 169 170 49)
-4(39 50 171 160)
-4(49 170 171 50)
-4(40 51 172 161)
-4(50 171 172 51)
-4(41 52 173 162)
-4(51 172 173 52)
-4(42 53 174 163)
-4(52 173 174 53)
-4(53 174 175 54)
-4(45 56 177 166)
-4(55 176 177 56)
-4(46 57 178 167)
-4(56 177 178 57)
-4(47 58 179 168)
-4(57 178 179 58)
-4(48 59 180 169)
-4(58 179 180 59)
-4(49 60 181 170)
-4(59 180 181 60)
-4(50 61 182 171)
-4(60 181 182 61)
-4(51 62 183 172)
-4(61 182 183 62)
-4(52 63 184 173)
-4(62 183 184 63)
-4(53 64 185 174)
-4(63 184 185 64)
-4(64 185 186 65)
-4(56 67 188 177)
-4(66 187 188 67)
-4(57 68 189 178)
-4(67 188 189 68)
-4(58 69 190 179)
-4(68 189 190 69)
-4(59 70 191 180)
-4(69 190 191 70)
-4(60 71 192 181)
-4(70 191 192 71)
-4(61 72 193 182)
-4(71 192 193 72)
-4(62 73 194 183)
-4(72 193 194 73)
-4(63 74 195 184)
-4(73 194 195 74)
-4(64 75 196 185)
-4(74 195 196 75)
-4(75 196 197 76)
-4(67 78 199 188)
-4(77 198 199 78)
-4(68 79 200 189)
-4(78 199 200 79)
-4(69 80 201 190)
-4(79 200 201 80)
-4(70 81 202 191)
-4(80 201 202 81)
-4(71 82 203 192)
-4(81 202 203 82)
-4(72 83 204 193)
-4(82 203 204 83)
-4(73 84 205 194)
-4(83 204 205 84)
-4(74 85 206 195)
-4(84 205 206 85)
-4(75 86 207 196)
-4(85 206 207 86)
-4(86 207 208 87)
-4(78 89 210 199)
-4(88 209 210 89)
-4(79 90 211 200)
-4(89 210 211 90)
-4(80 91 212 201)
-4(90 211 212 91)
-4(81 92 213 202)
-4(91 212 213 92)
-4(82 93 214 203)
-4(92 213 214 93)
-4(83 94 215 204)
-4(93 214 215 94)
-4(84 95 216 205)
-4(94 215 216 95)
-4(85 96 217 206)
-4(95 216 217 96)
-4(86 97 218 207)
-4(96 217 218 97)
-4(97 218 219 98)
-4(89 100 221 210)
-4(99 220 221 100)
-4(90 101 222 211)
-4(100 221 222 101)
-4(91 102 223 212)
-4(101 222 223 102)
-4(92 103 224 213)
-4(102 223 224 103)
-4(93 104 225 214)
-4(103 224 225 104)
-4(94 105 226 215)
-4(104 225 226 105)
-4(95 106 227 216)
-4(105 226 227 106)
-4(96 107 228 217)
-4(106 227 228 107)
-4(97 108 229 218)
-4(107 228 229 108)
-4(108 229 230 109)
-4(100 111 232 221)
-4(101 112 233 222)
-4(102 113 234 223)
-4(103 114 235 224)
-4(104 115 236 225)
-4(105 116 237 226)
-4(106 117 238 227)
-4(107 118 239 228)
-4(108 119 240 229)
-4(110 231 232 111)
-4(111 232 233 112)
-4(112 233 234 113)
-4(113 234 235 114)
-4(114 235 236 115)
-4(115 236 237 116)
-4(116 237 238 117)
-4(117 238 239 118)
-4(118 239 240 119)
-4(119 240 241 120)
-4(0 1 122 121)
-4(1 2 123 122)
-4(2 3 124 123)
-4(3 4 125 124)
-4(4 5 126 125)
-4(5 6 127 126)
-4(6 7 128 127)
-4(7 8 129 128)
-4(8 9 130 129)
-4(9 10 131 130)
-4(0 121 132 11)
-4(11 132 143 22)
-4(22 143 154 33)
-4(33 154 165 44)
-4(44 165 176 55)
-4(55 176 187 66)
-4(66 187 198 77)
-4(77 198 209 88)
-4(88 209 220 99)
-4(99 220 231 110)
-4(10 21 142 131)
-4(21 32 153 142)
-4(32 43 164 153)
-4(43 54 175 164)
-4(54 65 186 175)
-4(65 76 197 186)
-4(76 87 208 197)
-4(87 98 219 208)
-4(98 109 230 219)
-4(109 120 241 230)
-4(0 11 12 1)
-4(11 22 23 12)
-4(22 33 34 23)
-4(33 44 45 34)
-4(44 55 56 45)
-4(55 66 67 56)
-4(66 77 78 67)
-4(77 88 89 78)
-4(88 99 100 89)
-4(99 110 111 100)
-4(1 12 13 2)
-4(12 23 24 13)
-4(23 34 35 24)
-4(34 45 46 35)
-4(45 56 57 46)
-4(56 67 68 57)
-4(67 78 79 68)
-4(78 89 90 79)
-4(89 100 101 90)
-4(100 111 112 101)
-4(2 13 14 3)
-4(13 24 25 14)
-4(24 35 36 25)
-4(35 46 47 36)
-4(46 57 58 47)
-4(57 68 69 58)
-4(68 79 80 69)
-4(79 90 91 80)
-4(90 101 102 91)
-4(101 112 113 102)
-4(3 14 15 4)
-4(14 25 26 15)
-4(25 36 37 26)
-4(36 47 48 37)
-4(47 58 59 48)
-4(58 69 70 59)
-4(69 80 81 70)
-4(80 91 92 81)
-4(91 102 103 92)
-4(102 113 114 103)
-4(4 15 16 5)
-4(15 26 27 16)
-4(26 37 38 27)
-4(37 48 49 38)
-4(48 59 60 49)
-4(59 70 71 60)
-4(70 81 82 71)
-4(81 92 93 82)
-4(92 103 104 93)
-4(103 114 115 104)
-4(5 16 17 6)
-4(16 27 28 17)
-4(27 38 39 28)
-4(38 49 50 39)
-4(49 60 61 50)
-4(60 71 72 61)
-4(71 82 83 72)
-4(82 93 94 83)
-4(93 104 105 94)
-4(104 115 116 105)
-4(6 17 18 7)
-4(17 28 29 18)
-4(28 39 40 29)
-4(39 50 51 40)
-4(50 61 62 51)
-4(61 72 73 62)
-4(72 83 84 73)
-4(83 94 95 84)
-4(94 105 106 95)
-4(105 116 117 106)
-4(7 18 19 8)
-4(18 29 30 19)
-4(29 40 41 30)
-4(40 51 52 41)
-4(51 62 63 52)
-4(62 73 74 63)
-4(73 84 85 74)
-4(84 95 96 85)
-4(95 106 107 96)
-4(106 117 118 107)
-4(8 19 20 9)
-4(19 30 31 20)
-4(30 41 42 31)
-4(41 52 53 42)
-4(52 63 64 53)
-4(63 74 75 64)
-4(74 85 86 75)
-4(85 96 97 86)
-4(96 107 108 97)
-4(107 118 119 108)
-4(9 20 21 10)
-4(20 31 32 21)
-4(31 42 43 32)
-4(42 53 54 43)
-4(53 64 65 54)
-4(64 75 76 65)
-4(75 86 87 76)
-4(86 97 98 87)
-4(97 108 109 98)
-4(108 119 120 109)
-4(121 122 133 132)
-4(132 133 144 143)
-4(143 144 155 154)
-4(154 155 166 165)
-4(165 166 177 176)
-4(176 177 188 187)
-4(187 188 199 198)
-4(198 199 210 209)
-4(209 210 221 220)
-4(220 221 232 231)
-4(122 123 134 133)
-4(133 134 145 144)
-4(144 145 156 155)
-4(155 156 167 166)
-4(166 167 178 177)
-4(177 178 189 188)
-4(188 189 200 199)
-4(199 200 211 210)
-4(210 211 222 221)
-4(221 222 233 232)
-4(123 124 135 134)
-4(134 135 146 145)
-4(145 146 157 156)
-4(156 157 168 167)
-4(167 168 179 178)
-4(178 179 190 189)
-4(189 190 201 200)
-4(200 201 212 211)
-4(211 212 223 222)
-4(222 223 234 233)
-4(124 125 136 135)
-4(135 136 147 146)
-4(146 147 158 157)
-4(157 158 169 168)
-4(168 169 180 179)
-4(179 180 191 190)
-4(190 191 202 201)
-4(201 202 213 212)
-4(212 213 224 223)
-4(223 224 235 234)
-4(125 126 137 136)
-4(136 137 148 147)
-4(147 148 159 158)
-4(158 159 170 169)
-4(169 170 181 180)
-4(180 181 192 191)
-4(191 192 203 202)
-4(202 203 214 213)
-4(213 214 225 224)
-4(224 225 236 235)
-4(126 127 138 137)
-4(137 138 149 148)
-4(148 149 160 159)
-4(159 160 171 170)
-4(170 171 182 181)
-4(181 182 193 192)
-4(192 193 204 203)
-4(203 204 215 214)
-4(214 215 226 225)
-4(225 226 237 236)
-4(127 128 139 138)
-4(138 139 150 149)
-4(149 150 161 160)
-4(160 161 172 171)
-4(171 172 183 182)
-4(182 183 194 193)
-4(193 194 205 204)
-4(204 205 216 215)
-4(215 216 227 226)
-4(226 227 238 237)
-4(128 129 140 139)
-4(139 140 151 150)
-4(150 151 162 161)
-4(161 162 173 172)
-4(172 173 184 183)
-4(183 184 195 194)
-4(194 195 206 205)
-4(205 206 217 216)
-4(216 217 228 227)
-4(227 228 239 238)
-4(129 130 141 140)
-4(140 141 152 151)
-4(151 152 163 162)
-4(162 163 174 173)
-4(173 174 185 184)
-4(184 185 196 195)
-4(195 196 207 206)
-4(206 207 218 217)
-4(217 218 229 228)
-4(228 229 240 239)
-4(130 131 142 141)
-4(141 142 153 152)
-4(152 153 164 163)
-4(163 164 175 174)
-4(174 175 186 185)
-4(185 186 197 196)
-4(196 197 208 207)
-4(207 208 219 218)
-4(218 219 230 229)
-4(229 230 241 240)
-)
-
-
-// ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/neighbour b/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/neighbour
deleted file mode 100644
index 01e803c5c..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/neighbour
+++ /dev/null
@@ -1,454 +0,0 @@
-/*---------------------------------------------------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.3                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-FoamFile
-{
-    version 2.0;
-    format ascii;
-
-    root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix";
-    case "heatedBlock";
-    instance "constant";
-    local "polyMesh";
-
-    class labelList;
-
-    note "nCells:100 nActiveFaces:420 nActivePoints:242";
-
-    object neighbour;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-420
-(
-1
-10
-2
-11
-3
-12
-4
-13
-5
-14
-6
-15
-7
-16
-8
-17
-9
-18
-19
-11
-20
-12
-21
-13
-22
-14
-23
-15
-24
-16
-25
-17
-26
-18
-27
-19
-28
-29
-21
-30
-22
-31
-23
-32
-24
-33
-25
-34
-26
-35
-27
-36
-28
-37
-29
-38
-39
-31
-40
-32
-41
-33
-42
-34
-43
-35
-44
-36
-45
-37
-46
-38
-47
-39
-48
-49
-41
-50
-42
-51
-43
-52
-44
-53
-45
-54
-46
-55
-47
-56
-48
-57
-49
-58
-59
-51
-60
-52
-61
-53
-62
-54
-63
-55
-64
-56
-65
-57
-66
-58
-67
-59
-68
-69
-61
-70
-62
-71
-63
-72
-64
-73
-65
-74
-66
-75
-67
-76
-68
-77
-69
-78
-79
-71
-80
-72
-81
-73
-82
-74
-83
-75
-84
-76
-85
-77
-86
-78
-87
-79
-88
-89
-81
-90
-82
-91
-83
-92
-84
-93
-85
-94
-86
-95
-87
-96
-88
-97
-89
-98
-99
-91
-92
-93
-94
-95
-96
-97
-98
-99
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
--1
-)
-
-
-// ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/owner b/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/owner
deleted file mode 100644
index b4ca155c2..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/owner
+++ /dev/null
@@ -1,454 +0,0 @@
-/*---------------------------------------------------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.3                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-FoamFile
-{
-    version 2.0;
-    format ascii;
-
-    root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix";
-    case "heatedBlock";
-    instance "constant";
-    local "polyMesh";
-
-    class labelList;
-
-    note "nCells:100 nActiveFaces:420 nActivePoints:242";
-
-    object owner;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-420
-(
-0
-0
-1
-1
-2
-2
-3
-3
-4
-4
-5
-5
-6
-6
-7
-7
-8
-8
-9
-10
-10
-11
-11
-12
-12
-13
-13
-14
-14
-15
-15
-16
-16
-17
-17
-18
-18
-19
-20
-20
-21
-21
-22
-22
-23
-23
-24
-24
-25
-25
-26
-26
-27
-27
-28
-28
-29
-30
-30
-31
-31
-32
-32
-33
-33
-34
-34
-35
-35
-36
-36
-37
-37
-38
-38
-39
-40
-40
-41
-41
-42
-42
-43
-43
-44
-44
-45
-45
-46
-46
-47
-47
-48
-48
-49
-50
-50
-51
-51
-52
-52
-53
-53
-54
-54
-55
-55
-56
-56
-57
-57
-58
-58
-59
-60
-60
-61
-61
-62
-62
-63
-63
-64
-64
-65
-65
-66
-66
-67
-67
-68
-68
-69
-70
-70
-71
-71
-72
-72
-73
-73
-74
-74
-75
-75
-76
-76
-77
-77
-78
-78
-79
-80
-80
-81
-81
-82
-82
-83
-83
-84
-84
-85
-85
-86
-86
-87
-87
-88
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-0
-10
-20
-30
-40
-50
-60
-70
-80
-90
-9
-19
-29
-39
-49
-59
-69
-79
-89
-99
-0
-10
-20
-30
-40
-50
-60
-70
-80
-90
-1
-11
-21
-31
-41
-51
-61
-71
-81
-91
-2
-12
-22
-32
-42
-52
-62
-72
-82
-92
-3
-13
-23
-33
-43
-53
-63
-73
-83
-93
-4
-14
-24
-34
-44
-54
-64
-74
-84
-94
-5
-15
-25
-35
-45
-55
-65
-75
-85
-95
-6
-16
-26
-36
-46
-56
-66
-76
-86
-96
-7
-17
-27
-37
-47
-57
-67
-77
-87
-97
-8
-18
-28
-38
-48
-58
-68
-78
-88
-98
-9
-19
-29
-39
-49
-59
-69
-79
-89
-99
-0
-10
-20
-30
-40
-50
-60
-70
-80
-90
-1
-11
-21
-31
-41
-51
-61
-71
-81
-91
-2
-12
-22
-32
-42
-52
-62
-72
-82
-92
-3
-13
-23
-33
-43
-53
-63
-73
-83
-93
-4
-14
-24
-34
-44
-54
-64
-74
-84
-94
-5
-15
-25
-35
-45
-55
-65
-75
-85
-95
-6
-16
-26
-36
-46
-56
-66
-76
-86
-96
-7
-17
-27
-37
-47
-57
-67
-77
-87
-97
-8
-18
-28
-38
-48
-58
-68
-78
-88
-98
-9
-19
-29
-39
-49
-59
-69
-79
-89
-99
-)
-
-
-// ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/points b/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/points
deleted file mode 100644
index 41e090e74..000000000
--- a/tutorials/coupled/conjugateHeatFoam/heatedBlock/constant/polyMesh/points
+++ /dev/null
@@ -1,273 +0,0 @@
-/*---------------------------------------------------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.3                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-FoamFile
-{
-    version 2.0;
-    format ascii;
-
-    root "/home/hjasak/OpenFOAM/hjasak-1.3/run/coupledMatrix";
-    case "heatedBlock";
-    instance "constant";
-    local "polyMesh";
-
-    class vectorField;
-    object points;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-242
-(
-(0.1 0 0)
-(0.11 0 0)
-(0.12 0 0)
-(0.13 0 0)
-(0.14 0 0)
-(0.15 0 0)
-(0.16 0 0)
-(0.17 0 0)
-(0.18 0 0)
-(0.19 0 0)
-(0.2 0 0)
-(0.1 0.01 0)
-(0.11 0.01 0)
-(0.12 0.01 0)
-(0.13 0.01 0)
-(0.14 0.01 0)
-(0.15 0.01 0)
-(0.16 0.01 0)
-(0.17 0.01 0)
-(0.18 0.01 0)
-(0.19 0.01 0)
-(0.2 0.01 0)
-(0.1 0.02 0)
-(0.11 0.02 0)
-(0.12 0.02 0)
-(0.13 0.02 0)
-(0.14 0.02 0)
-(0.15 0.02 0)
-(0.16 0.02 0)
-(0.17 0.02 0)
-(0.18 0.02 0)
-(0.19 0.02 0)
-(0.2 0.02 0)
-(0.1 0.03 0)
-(0.11 0.03 0)
-(0.12 0.03 0)
-(0.13 0.03 0)
-(0.14 0.03 0)
-(0.15 0.03 0)
-(0.16 0.03 0)
-(0.17 0.03 0)
-(0.18 0.03 0)
-(0.19 0.03 0)
-(0.2 0.03 0)
-(0.1 0.04 0)
-(0.11 0.04 0)
-(0.12 0.04 0)
-(0.13 0.04 0)
-(0.14 0.04 0)
-(0.15 0.04 0)
-(0.16 0.04 0)
-(0.17 0.04 0)
-(0.18 0.04 0)
-(0.19 0.04 0)
-(0.2 0.04 0)
-(0.1 0.05 0)
-(0.11 0.05 0)
-(0.12 0.05 0)
-(0.13 0.05 0)
-(0.14 0.05 0)
-(0.15 0.05 0)
-(0.16 0.05 0)
-(0.17 0.05 0)
-(0.18 0.05 0)
-(0.19 0.05 0)
-(0.2 0.05 0)
-(0.1 0.06 0)
-(0.11 0.06 0)
-(0.12 0.06 0)
-(0.13 0.06 0)
-(0.14 0.06 0)
-(0.15 0.06 0)
-(0.16 0.06 0)
-(0.17 0.06 0)
-(0.18 0.06 0)
-(0.19 0.06 0)
-(0.2 0.06 0)
-(0.1 0.07 0)
-(0.11 0.07 0)
-(0.12 0.07 0)
-(0.13 0.07 0)
-(0.14 0.07 0)
-(0.15 0.07 0)
-(0.16 0.07 0)
-(0.17 0.07 0)
-(0.18 0.07 0)
-(0.19 0.07 0)
-(0.2 0.07 0)
-(0.1 0.08 0)
-(0.11 0.08 0)
-(0.12 0.08 0)
-(0.13 0.08 0)
-(0.14 0.08 0)
-(0.15 0.08 0)
-(0.16 0.08 0)
-(0.17 0.08 0)
-(0.18 0.08 0)
-(0.19 0.08 0)
-(0.2 0.08 0)
-(0.1 0.09 0)
-(0.11 0.09 0)
-(0.12 0.09 0)
-(0.13 0.09 0)
-(0.14 0.09 0)
-(0.15 0.09 0)
-(0.16 0.09 0)
-(0.17 0.09 0)
-(0.18 0.09 0)
-(0.19 0.09 0)
-(0.2 0.09 0)
-(0.1 0.1 0)
-(0.11 0.1 0)
-(0.12 0.1 0)
-(0.13 0.1 0)
-(0.14 0.1 0)
-(0.15 0.1 0)
-(0.16 0.1 0)
-(0.17 0.1 0)
-(0.18 0.1 0)
-(0.19 0.1 0)
-(0.2 0.1 0)
-(0.1 0 0.01)
-(0.11 0 0.01)
-(0.12 0 0.01)
-(0.13 0 0.01)
-(0.14 0 0.01)
-(0.15 0 0.01)
-(0.16 0 0.01)
-(0.17 0 0.01)
-(0.18 0 0.01)
-(0.19 0 0.01)
-(0.2 0 0.01)
-(0.1 0.01 0.01)
-(0.11 0.01 0.01)
-(0.12 0.01 0.01)
-(0.13 0.01 0.01)
-(0.14 0.01 0.01)
-(0.15 0.01 0.01)
-(0.16 0.01 0.01)
-(0.17 0.01 0.01)
-(0.18 0.01 0.01)
-(0.19 0.01 0.01)
-(0.2 0.01 0.01)
-(0.1 0.02 0.01)
-(0.11 0.02 0.01)
-(0.12 0.02 0.01)
-(0.13 0.02 0.01)
-(0.14 0.02 0.01)
-(0.15 0.02 0.01)
-(0.16 0.02 0.01)
-(0.17 0.02 0.01)
-(0.18 0.02 0.01)
-(0.19 0.02 0.01)
-(0.2 0.02 0.01)
-(0.1 0.03 0.01)
-(0.11 0.03 0.01)
-(0.12 0.03 0.01)
-(0.13 0.03 0.01)
-(0.14 0.03 0.01)
-(0.15 0.03 0.01)
-(0.16 0.03 0.01)
-(0.17 0.03 0.01)
-(0.18 0.03 0.01)
-(0.19 0.03 0.01)
-(0.2 0.03 0.01)
-(0.1 0.04 0.01)
-(0.11 0.04 0.01)
-(0.12 0.04 0.01)
-(0.13 0.04 0.01)
-(0.14 0.04 0.01)
-(0.15 0.04 0.01)
-(0.16 0.04 0.01)
-(0.17 0.04 0.01)
-(0.18 0.04 0.01)
-(0.19 0.04 0.01)
-(0.2 0.04 0.01)
-(0.1 0.05 0.01)
-(0.11 0.05 0.01)
-(0.12 0.05 0.01)
-(0.13 0.05 0.01)
-(0.14 0.05 0.01)
-(0.15 0.05 0.01)
-(0.16 0.05 0.01)
-(0.17 0.05 0.01)
-(0.18 0.05 0.01)
-(0.19 0.05 0.01)
-(0.2 0.05 0.01)
-(0.1 0.06 0.01)
-(0.11 0.06 0.01)
-(0.12 0.06 0.01)
-(0.13 0.06 0.01)
-(0.14 0.06 0.01)
-(0.15 0.06 0.01)
-(0.16 0.06 0.01)
-(0.17 0.06 0.01)
-(0.18 0.06 0.01)
-(0.19 0.06 0.01)
-(0.2 0.06 0.01)
-(0.1 0.07 0.01)
-(0.11 0.07 0.01)
-(0.12 0.07 0.01)
-(0.13 0.07 0.01)
-(0.14 0.07 0.01)
-(0.15 0.07 0.01)
-(0.16 0.07 0.01)
-(0.17 0.07 0.01)
-(0.18 0.07 0.01)
-(0.19 0.07 0.01)
-(0.2 0.07 0.01)
-(0.1 0.08 0.01)
-(0.11 0.08 0.01)
-(0.12 0.08 0.01)
-(0.13 0.08 0.01)
-(0.14 0.08 0.01)
-(0.15 0.08 0.01)
-(0.16 0.08 0.01)
-(0.17 0.08 0.01)
-(0.18 0.08 0.01)
-(0.19 0.08 0.01)
-(0.2 0.08 0.01)
-(0.1 0.09 0.01)
-(0.11 0.09 0.01)
-(0.12 0.09 0.01)
-(0.13 0.09 0.01)
-(0.14 0.09 0.01)
-(0.15 0.09 0.01)
-(0.16 0.09 0.01)
-(0.17 0.09 0.01)
-(0.18 0.09 0.01)
-(0.19 0.09 0.01)
-(0.2 0.09 0.01)
-(0.1 0.1 0.01)
-(0.11 0.1 0.01)
-(0.12 0.1 0.01)
-(0.13 0.1 0.01)
-(0.14 0.1 0.01)
-(0.15 0.1 0.01)
-(0.16 0.1 0.01)
-(0.17 0.1 0.01)
-(0.18 0.1 0.01)
-(0.19 0.1 0.01)
-(0.2 0.1 0.01)
-)
-
-
-// ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatFoam/heatedBlock/heatedBlock.OpenFOAM b/tutorials/coupled/conjugateHeatFoam/heatedBlock/heatedBlock.OpenFOAM
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/cellZones.gz b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/cellZones.gz
deleted file mode 100644
index d5cb68f43..000000000
Binary files a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/cellZones.gz and /dev/null differ
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/faceZones.gz b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/faceZones.gz
deleted file mode 100644
index de5313d88..000000000
Binary files a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/faceZones.gz and /dev/null differ
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/faces.gz b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/faces.gz
deleted file mode 100644
index 7b1fb4e3a..000000000
Binary files a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/faces.gz and /dev/null differ
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/meshModifiers.gz b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/meshModifiers.gz
deleted file mode 100644
index c840af059..000000000
Binary files a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/meshModifiers.gz and /dev/null differ
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/neighbour.gz b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/neighbour.gz
deleted file mode 100644
index 4a807dc70..000000000
Binary files a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/neighbour.gz and /dev/null differ
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/owner.gz b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/owner.gz
deleted file mode 100644
index e14274494..000000000
Binary files a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/owner.gz and /dev/null differ
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/pointZones.gz b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/pointZones.gz
deleted file mode 100644
index d1924a185..000000000
Binary files a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/pointZones.gz and /dev/null differ
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/points.gz b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/points.gz
deleted file mode 100644
index 621793ce1..000000000
Binary files a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/points.gz and /dev/null differ
diff --git a/wmake/rules/darwin/c b/wmake/rules/darwin/c
deleted file mode 100644
index 260651e82..000000000
--- a/wmake/rules/darwin/c
+++ /dev/null
@@ -1,16 +0,0 @@
-.SUFFIXES: .c .h
-
-cWARN        = -Wall
-
-cc          = gcc -ggdb
-
-include $(RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_CC_DRIVER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -dynamiclib  -flat_namespace -undefined suppress
-LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/darwin/c++ b/wmake/rules/darwin/c++
deleted file mode 100644
index acbbc19ad..000000000
--- a/wmake/rules/darwin/c++
+++ /dev/null
@@ -1,21 +0,0 @@
-.SUFFIXES: .C .cxx .cc .cpp
-
-c++WARN     = -Wall -W -Wno-unused-parameter -Wold-style-cast
-
-CC          = g++
-
-include $(RULES)/c++$(WM_COMPILE_OPTION)
-
-ptFLAGS     = -DNoRepository -ftemplate-depth-30
-
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-Ctoo        = $(WM_CC_DRIVER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG) -lpthread
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
-LINKEXE     = $(CC) $(c++FLAGS) -lpthread
diff --git a/wmake/rules/darwin/c++Opt b/wmake/rules/darwin/c++Opt
deleted file mode 100644
index 8b540dc07..000000000
--- a/wmake/rules/darwin/c++Opt
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG     = 
-c++OPT      = -O3 -ffast-math
diff --git a/wmake/rules/darwin/cDebug b/wmake/rules/darwin/cDebug
deleted file mode 100644
index 6c71ed93e..000000000
--- a/wmake/rules/darwin/cDebug
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -finline-functions
diff --git a/wmake/rules/darwin/flex++ b/wmake/rules/darwin/flex++
deleted file mode 100644
index 970354fde..000000000
--- a/wmake/rules/darwin/flex++
+++ /dev/null
@@ -1,6 +0,0 @@
-.SUFFIXES: .L
-
-Ltoo = foamFlex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
-
-.L.dep:
-	$(MAKE_DEP)
diff --git a/wmake/rules/darwin/general b/wmake/rules/darwin/general
deleted file mode 100644
index 09258d27d..000000000
--- a/wmake/rules/darwin/general
+++ /dev/null
@@ -1,9 +0,0 @@
-CPP        = cpp $(WM_CPP_OPTIONS)
-LD         = ld 
-GLIBS      = -L$(FOAM_LIBBIN)/dummy -lPstream
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
diff --git a/wmake/rules/darwin/mplibMPICH b/wmake/rules/darwin/mplibMPICH
deleted file mode 100644
index 879ced473..000000000
--- a/wmake/rules/darwin/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich
diff --git a/wmake/rules/darwinIntel/X b/wmake/rules/darwinIntel/X
deleted file mode 100644
index bed8bfedd..000000000
--- a/wmake/rules/darwinIntel/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
diff --git a/wmake/rules/darwinIntel/c++Debug b/wmake/rules/darwinIntel/c++Debug
deleted file mode 100644
index 19bdb9c33..000000000
--- a/wmake/rules/darwinIntel/c++Debug
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/darwinIntel/c++Prof b/wmake/rules/darwinIntel/c++Prof
deleted file mode 100644
index 3bda4dad5..000000000
--- a/wmake/rules/darwinIntel/c++Prof
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
diff --git a/wmake/rules/darwinIntel/cOpt b/wmake/rules/darwinIntel/cOpt
deleted file mode 100644
index a8b063547..000000000
--- a/wmake/rules/darwinIntel/cOpt
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = 
-cOPT        = -O3
diff --git a/wmake/rules/darwinIntel/cProf b/wmake/rules/darwinIntel/cProf
deleted file mode 100644
index ca3ac9bf5..000000000
--- a/wmake/rules/darwinIntel/cProf
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
diff --git a/wmake/rules/darwinIntel/mplib b/wmake/rules/darwinIntel/mplib
deleted file mode 100644
index 8a84b4014..000000000
--- a/wmake/rules/darwinIntel/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/darwin/X b/wmake/rules/darwinIntelGcc/X
similarity index 100%
rename from wmake/rules/darwin/X
rename to wmake/rules/darwinIntelGcc/X
diff --git a/wmake/rules/darwinIntel/c b/wmake/rules/darwinIntelGcc/c
similarity index 100%
rename from wmake/rules/darwinIntel/c
rename to wmake/rules/darwinIntelGcc/c
diff --git a/wmake/rules/darwinIntel/c++ b/wmake/rules/darwinIntelGcc/c++
similarity index 100%
rename from wmake/rules/darwinIntel/c++
rename to wmake/rules/darwinIntelGcc/c++
diff --git a/wmake/rules/darwin/c++Debug b/wmake/rules/darwinIntelGcc/c++Debug
similarity index 100%
rename from wmake/rules/darwin/c++Debug
rename to wmake/rules/darwinIntelGcc/c++Debug
diff --git a/wmake/rules/darwinIntel/c++Opt b/wmake/rules/darwinIntelGcc/c++Opt
similarity index 100%
rename from wmake/rules/darwinIntel/c++Opt
rename to wmake/rules/darwinIntelGcc/c++Opt
diff --git a/wmake/rules/darwin/c++Prof b/wmake/rules/darwinIntelGcc/c++Prof
similarity index 100%
rename from wmake/rules/darwin/c++Prof
rename to wmake/rules/darwinIntelGcc/c++Prof
diff --git a/wmake/rules/darwinIntel/cDebug b/wmake/rules/darwinIntelGcc/cDebug
similarity index 100%
rename from wmake/rules/darwinIntel/cDebug
rename to wmake/rules/darwinIntelGcc/cDebug
diff --git a/wmake/rules/darwin/cOpt b/wmake/rules/darwinIntelGcc/cOpt
similarity index 100%
rename from wmake/rules/darwin/cOpt
rename to wmake/rules/darwinIntelGcc/cOpt
diff --git a/wmake/rules/darwin/cProf b/wmake/rules/darwinIntelGcc/cProf
similarity index 100%
rename from wmake/rules/darwin/cProf
rename to wmake/rules/darwinIntelGcc/cProf
diff --git a/wmake/rules/darwinIntel/general b/wmake/rules/darwinIntelGcc/general
similarity index 85%
rename from wmake/rules/darwinIntel/general
rename to wmake/rules/darwinIntelGcc/general
index 74815d470..e8345cec0 100644
--- a/wmake/rules/darwinIntel/general
+++ b/wmake/rules/darwinIntelGcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/darwin/mplib b/wmake/rules/darwinIntelGcc/mplib
similarity index 100%
rename from wmake/rules/darwin/mplib
rename to wmake/rules/darwinIntelGcc/mplib
diff --git a/wmake/rules/darwinIntel/mplibOPENMPI b/wmake/rules/darwinIntelGcc/mplibOPENMPI
similarity index 100%
rename from wmake/rules/darwinIntel/mplibOPENMPI
rename to wmake/rules/darwinIntelGcc/mplibOPENMPI