diff --git a/ConSol/Examples/HybridTest/Airfoil/NACA0012.geo b/ConSol/Examples/HybridTest/Airfoil/NACA0012.geo
index e0301fc..bd18291 100644
--- a/ConSol/Examples/HybridTest/Airfoil/NACA0012.geo
+++ b/ConSol/Examples/HybridTest/Airfoil/NACA0012.geo
@@ -1,647 +1,648 @@
 // Variables
 boxdimX = 4;
 boxdimY = 12;
 N = 3*22*2;
 M = 3*N;
 N0 = 2;
 gridsizeX = boxdimX/(N);
 gridsizeY = boxdimY/(M);
 
 gridsizeX = 0.04;
 gridsizeY = 0.04;
 
 If (gridsizeX < gridsizeY)
 	gridsize = gridsizeX;
 Else
 	gridsize = gridsizeY;
 EndIf
 
 If (boxdimX < boxdimY)
 	boxdim = boxdimX;
 Else
 	boxdim = boxdimY;
 EndIf
 
 Nx1 = (N)/3 - N0;
 Nx2 = ((N)/3);
 Nx3 = (N)*5/2 - N0;
 Ny1 = (M)*5/11 - N0;
 Ny2 = ((M)/11);
 Ny3 = Ny1;
 
 X0 = -2;
 X1 = X0 + (Nx1+N0)*gridsizeX;
 X2 = X1 + Nx2*gridsizeX;
 X3 = X2 + (Nx3+N0)*gridsizeX;
 
 Y0 = -8;
 Y1 = Y0 + (Ny1+N0)*gridsizeY;
 Y2 = Y1 + Ny2*gridsizeY;
 Y3 = Y2 + (Ny3+N0)*gridsizeY;
 
 // Points
 Point(1) = {X0,Y0,0, gridsize};
 Point(2) = {X3,Y0,0, gridsize};
 Point(3) = {X3,Y3,0, gridsize};
 Point(4) = {X0,Y3,0, gridsize};
 
 Point(5) = {X1-N0*gridsizeX,Y0,0, gridsize};
 Point(6) = {X1,Y0,0, gridsize};
 Point(7) = {X2,Y0,0, gridsize};
 Point(8) = {X2+N0*gridsizeX,Y0,0, gridsize};
 
 Point(9) = {X3, Y1-N0*gridsizeY,0, gridsize};
 Point(10) = {X3, Y1,0, gridsize};
 Point(11) = {X3, Y2,0, gridsize};
 Point(12) = {X3, Y2+N0*gridsizeY,0, gridsize};
 
 Point(13) = {X2+N0*gridsizeX,Y3,0, gridsize};
 Point(14) = {X2,Y3,0, gridsize};
 Point(15) = {X1,Y3,0, gridsize};
 Point(16) = {X1-N0*gridsizeX,Y3,0, gridsize};
 
 Point(17) = {X0, Y2+N0*gridsizeY,0, gridsize};
 Point(18) = {X0, Y2,0, gridsize};
 Point(19) = {X0, Y1,0, gridsize};
 Point(20) = {X0, Y1-N0*gridsizeY,0, gridsize};
 
 Point(21) = {X1-N0*gridsizeX,Y1-N0*gridsizeY,0, gridsize};
 Point(22) = {X1,Y1-N0*gridsizeY,0, gridsize};
 Point(23) = {X1,Y1,0, gridsize};
 Point(24) = {X1-N0*gridsizeX,Y1,0, gridsize};
 
 Point(25) = {X2,Y1-N0*gridsizeY,0, gridsize};
 Point(26) = {X2+N0*gridsizeX,Y1-N0*gridsizeY,0, gridsize};
 Point(27) = {X2+N0*gridsizeX,Y1,0, gridsize};
 Point(28) = {X2,Y1,0, gridsize};
 
 Point(29) = {X2,Y2,0, gridsize};
 Point(30) = {X2+N0*gridsizeX,Y2,0, gridsize};
 Point(31) = {X2+N0*gridsizeX,Y2+N0*gridsizeY,0, gridsize};
 Point(32) = {X2,Y2+N0*gridsizeY,0, gridsize};
 
 Point(33) = {X1-N0*gridsizeX,Y2,0, gridsize};
 Point(34) = {X1,Y2,0, gridsize};
 Point(35) = {X1,Y2+N0*gridsizeY,0, gridsize};
 Point(36) = {X1-N0*gridsizeX,Y2+N0*gridsizeY,0, gridsize};
 
 //Air Foil
 Point(1001) = {1, -1.66533e-17, 0, 1};
 Point(1002) = {0.995963, 0.000585234, 0, 1};
 Point(1003) = {0.991514, 0.0012267, 0, 1};
 Point(1004) = {0.986656, 0.00192288, 0, 1};
 Point(1005) = {0.981394, 0.00267213, 0, 1};
 Point(1006) = {0.975732, 0.00347271, 0, 1};
 Point(1007) = {0.969674, 0.00432279, 0, 1};
 Point(1008) = {0.963227, 0.00522045, 0, 1};
 Point(1009) = {0.956395, 0.00616372, 0, 1};
 Point(1010) = {0.949184, 0.00715053, 0, 1};
 Point(1011) = {0.9416, 0.00817878, 0, 1};
 Point(1012) = {0.933651, 0.00924631, 0, 1};
 Point(1013) = {0.925341, 0.0103509, 0, 1};
 Point(1014) = {0.916679, 0.0114904, 0, 1};
 Point(1015) = {0.907672, 0.0126624, 0, 1};
 Point(1016) = {0.898327, 0.0138647, 0, 1};
 Point(1017) = {0.888653, 0.015095, 0, 1};
 Point(1018) = {0.878657, 0.0163511, 0, 1};
 Point(1019) = {0.868348, 0.0176304, 0, 1};
 Point(1020) = {0.857734, 0.0189308, 0, 1};
 Point(1021) = {0.846825, 0.02025, 0, 1};
 Point(1022) = {0.835631, 0.0215855, 0, 1};
 Point(1023) = {0.824159, 0.022935, 0, 1};
 Point(1024) = {0.812421, 0.0242963, 0, 1};
 Point(1025) = {0.800425, 0.0256669, 0, 1};
 Point(1026) = {0.788183, 0.0270445, 0, 1};
 Point(1027) = {0.775704, 0.0284268, 0, 1};
 Point(1028) = {0.762999, 0.0298114, 0, 1};
 Point(1029) = {0.750079, 0.031196, 0, 1};
 Point(1030) = {0.736955, 0.032578, 0, 1};
 Point(1031) = {0.723638, 0.0339552, 0, 1};
 Point(1032) = {0.710139, 0.0353251, 0, 1};
 Point(1033) = {0.696469, 0.0366853, 0, 1};
 Point(1034) = {0.68264, 0.0380331, 0, 1};
 Point(1035) = {0.668664, 0.0393663, 0, 1};
 Point(1036) = {0.654553, 0.0406821, 0, 1};
 Point(1037) = {0.640319, 0.0419779, 0, 1};
 Point(1038) = {0.625973, 0.0432513, 0, 1};
 Point(1039) = {0.611527, 0.0444995, 0, 1};
 Point(1040) = {0.596995, 0.0457197, 0, 1};
 Point(1041) = {0.582388, 0.0469094, 0, 1};
 Point(1042) = {0.567719, 0.0480657, 0, 1};
 Point(1043) = {0.552999, 0.0491858, 0, 1};
 Point(1044) = {0.538242, 0.0502669, 0, 1};
 Point(1045) = {0.523461, 0.0513062, 0, 1};
 Point(1046) = {0.508666, 0.0523008, 0, 1};
 Point(1047) = {0.493872, 0.0532479, 0, 1};
 Point(1048) = {0.47909, 0.0541446, 0, 1};
 Point(1049) = {0.464333, 0.0549882, 0, 1};
 Point(1050) = {0.449614, 0.0557757, 0, 1};
 Point(1051) = {0.434944, 0.0565044, 0, 1};
 Point(1052) = {0.420337, 0.0571716, 0, 1};
 Point(1053) = {0.405805, 0.0577746, 0, 1};
 Point(1054) = {0.39136, 0.0583109, 0, 1};
 Point(1055) = {0.377014, 0.0587778, 0, 1};
 Point(1056) = {0.362779, 0.0591732, 0, 1};
 Point(1057) = {0.348668, 0.0594945, 0, 1};
 Point(1058) = {0.334692, 0.0597397, 0, 1};
 Point(1059) = {0.320864, 0.0599068, 0, 1};
 Point(1060) = {0.307194, 0.0599939, 0, 1};
 Point(1061) = {0.293695, 0.0599993, 0, 1};
 Point(1062) = {0.280377, 0.0599215, 0, 1};
 Point(1063) = {0.267253, 0.0597592, 0, 1};
 Point(1064) = {0.254333, 0.0595112, 0, 1};
 Point(1065) = {0.241628, 0.0591767, 0, 1};
 Point(1066) = {0.22915, 0.0587549, 0, 1};
 Point(1067) = {0.216907, 0.0582453, 0, 1};
 Point(1068) = {0.204912, 0.0576477, 0, 1};
 Point(1069) = {0.193173, 0.0569622, 0, 1};
 Point(1070) = {0.181702, 0.0561888, 0, 1};
 Point(1071) = {0.170507, 0.055328, 0, 1};
 Point(1072) = {0.159598, 0.0543805, 0, 1};
 Point(1073) = {0.148985, 0.0533471, 0, 1};
 Point(1074) = {0.138676, 0.052229, 0, 1};
 Point(1075) = {0.12868, 0.0510274, 0, 1};
 Point(1076) = {0.119005, 0.0497438, 0, 1};
 Point(1077) = {0.10966, 0.0483798, 0, 1};
 Point(1078) = {0.100653, 0.0469374, 0, 1};
 Point(1079) = {0.0919912, 0.0454185, 0, 1};
 Point(1080) = {0.0836818, 0.0438253, 0, 1};
 Point(1081) = {0.0757319, 0.0421599, 0, 1};
 Point(1082) = {0.0681483, 0.0404248, 0, 1};
 Point(1083) = {0.0609375, 0.0386223, 0, 1};
 Point(1084) = {0.0541055, 0.036755, 0, 1};
 Point(1085) = {0.0476581, 0.0348253, 0, 1};
 Point(1086) = {0.0416007, 0.0328359, 0, 1};
 Point(1087) = {0.0359385, 0.0307892, 0, 1};
 Point(1088) = {0.0306763, 0.0286878, 0, 1};
 Point(1089) = {0.0258186, 0.0265342, 0, 1};
 Point(1090) = {0.0213693, 0.0243307, 0, 1};
 Point(1091) = {0.0173324, 0.0220798, 0, 1};
 Point(1092) = {0.0137112, 0.0197835, 0, 1};
 Point(1093) = {0.0105087, 0.0174439, 0, 1};
 Point(1094) = {0.00772778, 0.0150632, 0, 1};
 Point(1095) = {0.00537068, 0.0126429, 0, 1};
 Point(1096) = {0.00343942, 0.0101848, 0, 1};
 Point(1097) = {0.00193563, 0.00769029, 0, 1};
 Point(1098) = {0.000860583, 0.00516064, 0, 1};
 Point(1099) = {0.000215191, 0.00259693, 0, 1};
 Point(1100) = {0, 0, 0, 1};
 Point(1101) = {0.000215191, -0.00259693, 0, 1};
 Point(1102) = {0.000860583, -0.00516064, 0, 1};
 Point(1103) = {0.00193563, -0.00769029, 0, 1};
 Point(1104) = {0.00343942, -0.0101848, 0, 1};
 Point(1105) = {0.00537068, -0.0126429, 0, 1};
 Point(1106) = {0.00772778, -0.0150632, 0, 1};
 Point(1107) = {0.0105087, -0.0174439, 0, 1};
 Point(1108) = {0.0137112, -0.0197835, 0, 1};
 Point(1109) = {0.0173324, -0.0220798, 0, 1};
 Point(1110) = {0.0213693, -0.0243307, 0, 1};
 Point(1111) = {0.0258186, -0.0265342, 0, 1};
 Point(1112) = {0.0306763, -0.0286878, 0, 1};
 Point(1113) = {0.0359385, -0.0307892, 0, 1};
 Point(1114) = {0.0416007, -0.0328359, 0, 1};
 Point(1115) = {0.0476581, -0.0348253, 0, 1};
 Point(1116) = {0.0541055, -0.036755, 0, 1};
 Point(1117) = {0.0609375, -0.0386223, 0, 1};
 Point(1118) = {0.0681483, -0.0404248, 0, 1};
 Point(1119) = {0.0757319, -0.0421599, 0, 1};
 Point(1120) = {0.0836818, -0.0438253, 0, 1};
 Point(1121) = {0.0919912, -0.0454185, 0, 1};
 Point(1122) = {0.100653, -0.0469374, 0, 1};
 Point(1123) = {0.10966, -0.0483798, 0, 1};
 Point(1124) = {0.119005, -0.0497438, 0, 1};
 Point(1125) = {0.12868, -0.0510274, 0, 1};
 Point(1126) = {0.138676, -0.052229, 0, 1};
 Point(1127) = {0.148985, -0.0533471, 0, 1};
 Point(1128) = {0.159598, -0.0543805, 0, 1};
 Point(1129) = {0.170507, -0.055328, 0, 1};
 Point(1130) = {0.181702, -0.0561888, 0, 1};
 Point(1131) = {0.193173, -0.0569622, 0, 1};
 Point(1132) = {0.204912, -0.0576477, 0, 1};
 Point(1133) = {0.216907, -0.0582453, 0, 1};
 Point(1134) = {0.22915, -0.0587549, 0, 1};
 Point(1135) = {0.241628, -0.0591767, 0, 1};
 Point(1136) = {0.254333, -0.0595112, 0, 1};
 Point(1137) = {0.267253, -0.0597592, 0, 1};
 Point(1138) = {0.280377, -0.0599215, 0, 1};
 Point(1139) = {0.293695, -0.0599993, 0, 1};
 Point(1140) = {0.307194, -0.0599939, 0, 1};
 Point(1141) = {0.320864, -0.0599068, 0, 1};
 Point(1142) = {0.334692, -0.0597397, 0, 1};
 Point(1143) = {0.348668, -0.0594945, 0, 1};
 Point(1144) = {0.362779, -0.0591732, 0, 1};
 Point(1145) = {0.377014, -0.0587778, 0, 1};
 Point(1146) = {0.39136, -0.0583109, 0, 1};
 Point(1147) = {0.405805, -0.0577746, 0, 1};
 Point(1148) = {0.420337, -0.0571716, 0, 1};
 Point(1149) = {0.434944, -0.0565044, 0, 1};
 Point(1150) = {0.449614, -0.0557757, 0, 1};
 Point(1151) = {0.464333, -0.0549882, 0, 1};
 Point(1152) = {0.47909, -0.0541446, 0, 1};
 Point(1153) = {0.493872, -0.0532479, 0, 1};
 Point(1154) = {0.508666, -0.0523008, 0, 1};
 Point(1155) = {0.523461, -0.0513062, 0, 1};
 Point(1156) = {0.538242, -0.0502669, 0, 1};
 Point(1157) = {0.552999, -0.0491858, 0, 1};
 Point(1158) = {0.567719, -0.0480657, 0, 1};
 Point(1159) = {0.582388, -0.0469094, 0, 1};
 Point(1160) = {0.596995, -0.0457197, 0, 1};
 Point(1161) = {0.611527, -0.0444995, 0, 1};
 Point(1162) = {0.625973, -0.0432513, 0, 1};
 Point(1163) = {0.640319, -0.0419779, 0, 1};
 Point(1164) = {0.654553, -0.0406821, 0, 1};
 Point(1165) = {0.668664, -0.0393663, 0, 1};
 Point(1166) = {0.68264, -0.0380331, 0, 1};
 Point(1167) = {0.696469, -0.0366853, 0, 1};
 Point(1168) = {0.710139, -0.0353251, 0, 1};
 Point(1169) = {0.723638, -0.0339552, 0, 1};
 Point(1170) = {0.736955, -0.032578, 0, 1};
 Point(1171) = {0.750079, -0.031196, 0, 1};
 Point(1172) = {0.762999, -0.0298114, 0, 1};
 Point(1173) = {0.775704, -0.0284268, 0, 1};
 Point(1174) = {0.788183, -0.0270445, 0, 1};
 Point(1175) = {0.800425, -0.0256669, 0, 1};
 Point(1176) = {0.812421, -0.0242963, 0, 1};
 Point(1177) = {0.824159, -0.022935, 0, 1};
 Point(1178) = {0.835631, -0.0215855, 0, 1};
 Point(1179) = {0.846825, -0.02025, 0, 1};
 Point(1180) = {0.857734, -0.0189308, 0, 1};
 Point(1181) = {0.868348, -0.0176304, 0, 1};
 Point(1182) = {0.878657, -0.0163511, 0, 1};
 Point(1183) = {0.888653, -0.015095, 0, 1};
 Point(1184) = {0.898327, -0.0138647, 0, 1};
 Point(1185) = {0.907672, -0.0126624, 0, 1};
 Point(1186) = {0.916679, -0.0114904, 0, 1};
 Point(1187) = {0.925341, -0.0103509, 0, 1};
 Point(1188) = {0.933651, -0.00924631, 0, 1};
 Point(1189) = {0.9416, -0.00817878, 0, 1};
 Point(1190) = {0.949184, -0.00715053, 0, 1};
 Point(1191) = {0.956395, -0.00616372, 0, 1};
 Point(1192) = {0.963227, -0.00522045, 0, 1};
 Point(1193) = {0.969674, -0.00432279, 0, 1};
 Point(1194) = {0.975732, -0.00347271, 0, 1};
 Point(1195) = {0.981394, -0.00267213, 0, 1};
 Point(1196) = {0.986656, -0.00192288, 0, 1};
 Point(1197) = {0.991514, -0.0012267, 0, 1};
 Point(1198) = {0.995963, -0.000585234, 0, 1};
 Line(1001) = {1001, 1002};
 Line(1002) = {1002, 1003};
 Line(1003) = {1003, 1004};
 Line(1004) = {1004, 1005};
 Line(1005) = {1005, 1006};
 Line(1006) = {1006, 1007};
 Line(1007) = {1007, 1008};
 Line(1008) = {1008, 1009};
 Line(1009) = {1009, 1010};
 Line(1010) = {1010, 1011};
 Line(1011) = {1011, 1012};
 Line(1012) = {1012, 1013};
 Line(1013) = {1013, 1014};
 Line(1014) = {1014, 1015};
 Line(1015) = {1015, 1016};
 Line(1016) = {1016, 1017};
 Line(1017) = {1017, 1018};
 Line(1018) = {1018, 1019};
 Line(1019) = {1019, 1020};
 Line(1020) = {1020, 1021};
 Line(1021) = {1021, 1022};
 Line(1022) = {1022, 1023};
 Line(1023) = {1023, 1024};
 Line(1024) = {1024, 1025};
 Line(1025) = {1025, 1026};
 Line(1026) = {1026, 1027};
 Line(1027) = {1027, 1028};
 Line(1028) = {1028, 1029};
 Line(1029) = {1029, 1030};
 Line(1030) = {1030, 1031};
 Line(1031) = {1031, 1032};
 Line(1032) = {1032, 1033};
 Line(1033) = {1033, 1034};
 Line(1034) = {1034, 1035};
 Line(1035) = {1035, 1036};
 Line(1036) = {1036, 1037};
 Line(1037) = {1037, 1038};
 Line(1038) = {1038, 1039};
 Line(1039) = {1039, 1040};
 Line(1040) = {1040, 1041};
 Line(1041) = {1041, 1042};
 Line(1042) = {1042, 1043};
 Line(1043) = {1043, 1044};
 Line(1044) = {1044, 1045};
 Line(1045) = {1045, 1046};
 Line(1046) = {1046, 1047};
 Line(1047) = {1047, 1048};
 Line(1048) = {1048, 1049};
 Line(1049) = {1049, 1050};
 Line(1050) = {1050, 1051};
 Line(1051) = {1051, 1052};
 Line(1052) = {1052, 1053};
 Line(1053) = {1053, 1054};
 Line(1054) = {1054, 1055};
 Line(1055) = {1055, 1056};
 Line(1056) = {1056, 1057};
 Line(1057) = {1057, 1058};
 Line(1058) = {1058, 1059};
 Line(1059) = {1059, 1060};
 Line(1060) = {1060, 1061};
 Line(1061) = {1061, 1062};
 Line(1062) = {1062, 1063};
 Line(1063) = {1063, 1064};
 Line(1064) = {1064, 1065};
 Line(1065) = {1065, 1066};
 Line(1066) = {1066, 1067};
 Line(1067) = {1067, 1068};
 Line(1068) = {1068, 1069};
 Line(1069) = {1069, 1070};
 Line(1070) = {1070, 1071};
 Line(1071) = {1071, 1072};
 Line(1072) = {1072, 1073};
 Line(1073) = {1073, 1074};
 Line(1074) = {1074, 1075};
 Line(1075) = {1075, 1076};
 Line(1076) = {1076, 1077};
 Line(1077) = {1077, 1078};
 Line(1078) = {1078, 1079};
 Line(1079) = {1079, 1080};
 Line(1080) = {1080, 1081};
 Line(1081) = {1081, 1082};
 Line(1082) = {1082, 1083};
 Line(1083) = {1083, 1084};
 Line(1084) = {1084, 1085};
 Line(1085) = {1085, 1086};
 Line(1086) = {1086, 1087};
 Line(1087) = {1087, 1088};
 Line(1088) = {1088, 1089};
 Line(1089) = {1089, 1090};
 Line(1090) = {1090, 1091};
 Line(1091) = {1091, 1092};
 Line(1092) = {1092, 1093};
 Line(1093) = {1093, 1094};
 Line(1094) = {1094, 1095};
 Line(1095) = {1095, 1096};
 Line(1096) = {1096, 1097};
 Line(1097) = {1097, 1098};
 Line(1098) = {1098, 1099};
 Line(1099) = {1099, 1100};
 Line(1100) = {1100, 1101};
 Line(1101) = {1101, 1102};
 Line(1102) = {1102, 1103};
 Line(1103) = {1103, 1104};
 Line(1104) = {1104, 1105};
 Line(1105) = {1105, 1106};
 Line(1106) = {1106, 1107};
 Line(1107) = {1107, 1108};
 Line(1108) = {1108, 1109};
 Line(1109) = {1109, 1110};
 Line(1110) = {1110, 1111};
 Line(1111) = {1111, 1112};
 Line(1112) = {1112, 1113};
 Line(1113) = {1113, 1114};
 Line(1114) = {1114, 1115};
 Line(1115) = {1115, 1116};
 Line(1116) = {1116, 1117};
 Line(1117) = {1117, 1118};
 Line(1118) = {1118, 1119};
 Line(1119) = {1119, 1120};
 Line(1120) = {1120, 1121};
 Line(1121) = {1121, 1122};
 Line(1122) = {1122, 1123};
 Line(1123) = {1123, 1124};
 Line(1124) = {1124, 1125};
 Line(1125) = {1125, 1126};
 Line(1126) = {1126, 1127};
 Line(1127) = {1127, 1128};
 Line(1128) = {1128, 1129};
 Line(1129) = {1129, 1130};
 Line(1130) = {1130, 1131};
 Line(1131) = {1131, 1132};
 Line(1132) = {1132, 1133};
 Line(1133) = {1133, 1134};
 Line(1134) = {1134, 1135};
 Line(1135) = {1135, 1136};
 Line(1136) = {1136, 1137};
 Line(1137) = {1137, 1138};
 Line(1138) = {1138, 1139};
 Line(1139) = {1139, 1140};
 Line(1140) = {1140, 1141};
 Line(1141) = {1141, 1142};
 Line(1142) = {1142, 1143};
 Line(1143) = {1143, 1144};
 Line(1144) = {1144, 1145};
 Line(1145) = {1145, 1146};
 Line(1146) = {1146, 1147};
 Line(1147) = {1147, 1148};
 Line(1148) = {1148, 1149};
 Line(1149) = {1149, 1150};
 Line(1150) = {1150, 1151};
 Line(1151) = {1151, 1152};
 Line(1152) = {1152, 1153};
 Line(1153) = {1153, 1154};
 Line(1154) = {1154, 1155};
 Line(1155) = {1155, 1156};
 Line(1156) = {1156, 1157};
 Line(1157) = {1157, 1158};
 Line(1158) = {1158, 1159};
 Line(1159) = {1159, 1160};
 Line(1160) = {1160, 1161};
 Line(1161) = {1161, 1162};
 Line(1162) = {1162, 1163};
 Line(1163) = {1163, 1164};
 Line(1164) = {1164, 1165};
 Line(1165) = {1165, 1166};
 Line(1166) = {1166, 1167};
 Line(1167) = {1167, 1168};
 Line(1168) = {1168, 1169};
 Line(1169) = {1169, 1170};
 Line(1170) = {1170, 1171};
 Line(1171) = {1171, 1172};
 Line(1172) = {1172, 1173};
 Line(1173) = {1173, 1174};
 Line(1174) = {1174, 1175};
 Line(1175) = {1175, 1176};
 Line(1176) = {1176, 1177};
 Line(1177) = {1177, 1178};
 Line(1178) = {1178, 1179};
 Line(1179) = {1179, 1180};
 Line(1180) = {1180, 1181};
 Line(1181) = {1181, 1182};
 Line(1182) = {1182, 1183};
 Line(1183) = {1183, 1184};
 Line(1184) = {1184, 1185};
 Line(1185) = {1185, 1186};
 Line(1186) = {1186, 1187};
 Line(1187) = {1187, 1188};
 Line(1188) = {1188, 1189};
 Line(1189) = {1189, 1190};
 Line(1190) = {1190, 1191};
 Line(1191) = {1191, 1192};
 Line(1192) = {1192, 1193};
 Line(1193) = {1193, 1194};
 Line(1194) = {1194, 1195};
 Line(1195) = {1195, 1196};
 Line(1196) = {1196, 1197};
 Line(1197) = {1197, 1198};
 Line(1198) = {1198, 1001};
 Line Loop(1000) = {1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198};
 
 //Lines
 Line(1) = {1,5};
 Line(2) = {5,6};
 Line(3) = {6,7};
 Line(4) = {7,8};
 Line(5) = {8,2};
 Line(6) = {2,9};
 Line(7) = {9,10};
 Line(8) = {10,11};
 Line(9) = {11,12};
 Line(10) = {12,3};
 Line(11) = {13,3};
 Line(12) = {14,13};
 Line(13) = {15,14};
 Line(14) = {16,15};
 Line(15) = {4,16};
 Line(16) = {17,4};
 Line(17) = {18,17};
 Line(18) = {19,18};
 Line(19) = {20,19};
 Line(20) = {1,20};
 Line(21) = {20,21};
 Line(22) = {21,22};
 Line(23) = {22,25};
 Line(24) = {25,26};
 Line(25) = {26,9};
 Line(26) = {19,24};
 Line(27) = {24,23};
 Line(28) = {23,28};
 Line(29) = {28,27};
 Line(30) = {27,10};
 Line(31) = {18,33};
 Line(32) = {33,34};
 Line(33) = {34,29};
 Line(34) = {29,30};
 Line(35) = {30,11};
 Line(36) = {17,36};
 Line(37) = {36,35};
 Line(38) = {35,32};
 Line(39) = {32,31};
 Line(40) = {31,12};
 Line(41) = {5,21};
 Line(42) = {21,24};
 Line(43) = {24,33};
 Line(44) = {33,36};
 Line(45) = {36,16};
 Line(46) = {6,22};
 Line(47) = {22,23};
 Line(48) = {23,34};
 Line(49) = {34,35};
 Line(50) = {35,15};
 Line(51) = {7,25};
 Line(52) = {25,28};
 Line(53) = {28,29};
 Line(54) = {29,32};
 Line(55) = {32,14};
 Line(56) = {8,26};
 Line(57) = {26,27};
 Line(58) = {27,30};
 Line(59) = {30,31};
 Line(60) = {31,13};
 
 
 Line Loop(1) = {1,41,-21,-20};
 Line Loop(2) = {2,46,-22,-41};
 Line Loop(3) = {3,51,-23,-46};
 Line Loop(4) = {4,56,-24,-51};
 Line Loop(5) = {5,6,-25,-56};
 Line Loop(6) = {21,42,-26,-19};
 Line Loop(7) = {22,47,-27,-42};
 Line Loop(8) = {23,52,-28,-47};
 Line Loop(9) = {24,57,-29,-52};
 Line Loop(10) = {25,7,-30,-57};
 Line Loop(11) = {26,43,-31,-18};
 Line Loop(12) = {27,48,-32,-43};
 Line Loop(13) = {28,53,-33,-48};
 Line Loop(14) = {29,58,-34,-53};
 Line Loop(15) = {30,8,-35,-58};
 Line Loop(16) = {31,44,-36,-17};
 Line Loop(17) = {32,49,-37,-44};
 Line Loop(18) = {33,54,-38,-49};
 Line Loop(19) = {34,59,-39,-54};
 Line Loop(20) = {35,9,-40,-59};
 Line Loop(21) = {36,45,-15,-16};
 Line Loop(22) = {37,50,-14,-45};
 Line Loop(23) = {38,55,-13,-50};
 Line Loop(24) = {39,60,-12,-55};
 Line Loop(25) = {40,10,-11,-60};
 
 
 Plane Surface(1) = {1};
 Plane Surface(2) = {2};
 Plane Surface(3) = {3};
 Plane Surface(4) = {4};
 Plane Surface(5) = {5};
 Plane Surface(6) = {6};
 Plane Surface(7) = {7};
 Plane Surface(8) = {8};
 Plane Surface(9) = {9};
 Plane Surface(10) = {10};
 Plane Surface(11) = {11};
 Plane Surface(12) = {12};
 Plane Surface(13) = {13,-1000};
 Plane Surface(14) = {14};
 Plane Surface(15) = {15};
 Plane Surface(16) = {16};
 Plane Surface(17) = {17};
 Plane Surface(18) = {18};
 Plane Surface(19) = {19};
 Plane Surface(20) = {20};
 Plane Surface(21) = {21};
 Plane Surface(22) = {22};
 Plane Surface(23) = {23};
 Plane Surface(24) = {24};
 Plane Surface(25) = {25};
 
 Physical Surface("tri_0") = {13};
 Physical Surface("qdr_0") = {1};
 Physical Surface("qdr_1") = {3};
 Physical Surface("qdr_2") = {5};
 Physical Surface("qdr_3") = {11};
 Physical Surface("qdr_4") = {15};
 Physical Surface("qdr_5") = {21};
 Physical Surface("qdr_6") = {23};
 Physical Surface("qdr_7") = {25};
 Physical Surface("mid_0") = {8};
 Physical Surface("mid_1") = {12};
 Physical Surface("mid_2") = {14};
 Physical Surface("mid_3") = {18};
 Physical Surface("q2q_0") = {2};
 Physical Surface("q2q_1") = {4};
 Physical Surface("q2q_2") = {6};
 Physical Surface("q2q_3") = {10};
 Physical Surface("q2q_4") = {16};
 Physical Surface("q2q_5") = {20};
 Physical Surface("q2q_6") = {22};
 Physical Surface("q2q_7") = {24};
 Physical Surface("rst_1") = {7};
 Physical Surface("rst_2") = {9};
 Physical Surface("rst_3") = {17};
 Physical Surface("rst_4") = {19};
 
-Physical Line("inflow") = {20,19,18,17,16,1,2,3,4,5};
-Physical Line("outflow") = {6,7,8,9,10,15,14,13,12,11};
+//Physical Line("inflow") = {20,19,18,17,16,1,2,3,4,5};
+//Physical Line("outflow") = {6,7,8,9,10,15,14,13,12,11};
+Physical Line("inflow") = {20,19,18,17,16,1,2,3,4,5,6,7,8,9,10,15,14,13,12,11};
 Physical Line("slipWall") = {1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198};
 Physical Line("q2i") = {23,58,38,43,22,47,27,42,24,57,29,52,34,59,39,54,32,49,37,44};
 Physical Line("t2i") = {28,53,33,48};
 Physical Line("q2q") = {41,46,51,56,45,50,55,60,21,26,31,36,25,30,35,40};
 
 Transfinite Curve{1,21,26,31,36,15} = Nx1+1;
 Transfinite Curve{5,25,30,35,40,11} = Nx3+1;
 Transfinite Curve{20,41,46,51,56,6} = Ny1+1;
 Transfinite Curve{16,45,50,55,60,10} = Ny3+1;
 Transfinite Curve{2,22,27,32,37,14,4,24,29,34,39,12,19,42,47,52,57,7,17,44,49,54,59,9} = N0+1;
 Transfinite Curve{3,23,28,33,38,13} = Nx2+1;
 Transfinite Curve{18,43,48,53,58,8} = Ny2+1;
 
 //Transfinite Curve {1000} = D*N/boxdim+1 Using Progression 1;
 
 Transfinite Surface{1,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,19,20,21,22,23,24,25};
 Recombine Surface{1,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,19,20,21,22,23,24,25};
diff --git a/ConSol/Examples/HybridTest/Airfoil/NACA0012_small.geo b/ConSol/Examples/HybridTest/Airfoil/NACA0012_small.geo
index 6ae5f76..929bd9d 100644
--- a/ConSol/Examples/HybridTest/Airfoil/NACA0012_small.geo
+++ b/ConSol/Examples/HybridTest/Airfoil/NACA0012_small.geo
@@ -1,644 +1,645 @@
 // Variables
 boxdimX = 3.5;
 boxdimY = 7;
 N = 3*22*2;
 M = 2*N;
 N0 = 2;
 gridsizeX = boxdimX/(N);
 gridsizeY = boxdimY/(M);
 
 If (gridsizeX < gridsizeY)
 	gridsize = gridsizeX;
 Else
 	gridsize = gridsizeY;
 EndIf
 
 If (boxdimX < boxdimY)
 	boxdim = boxdimX;
 Else
 	boxdim = boxdimY;
 EndIf
 
 Nx1 = (N)/3 - N0;
 Nx2 = ((N)/3);
 Nx3 = (N)*2 - N0;
 Ny1 = (M)*5/11 - N0;
 Ny2 = ((M)/11);
 Ny3 = Ny1;
 
 X0 = -1.25;
 X1 = X0 + (Nx1+N0)*gridsizeX;
 X2 = X1 + Nx2*gridsizeX;
 X3 = X2 + (Nx3+N0)*gridsizeX;
 
 Y0 = -3.5;
 Y1 = Y0 + (Ny1+N0)*gridsizeY;
 Y2 = Y1 + Ny2*gridsizeY;
 Y3 = Y2 + (Ny3+N0)*gridsizeY;
 
 // Points
 Point(1) = {X0,Y0,0, gridsize};
 Point(2) = {X3,Y0,0, gridsize};
 Point(3) = {X3,Y3,0, gridsize};
 Point(4) = {X0,Y3,0, gridsize};
 
 Point(5) = {X1-N0*gridsizeX,Y0,0, gridsize};
 Point(6) = {X1,Y0,0, gridsize};
 Point(7) = {X2,Y0,0, gridsize};
 Point(8) = {X2+N0*gridsizeX,Y0,0, gridsize};
 
 Point(9) = {X3, Y1-N0*gridsizeY,0, gridsize};
 Point(10) = {X3, Y1,0, gridsize};
 Point(11) = {X3, Y2,0, gridsize};
 Point(12) = {X3, Y2+N0*gridsizeY,0, gridsize};
 
 Point(13) = {X2+N0*gridsizeX,Y3,0, gridsize};
 Point(14) = {X2,Y3,0, gridsize};
 Point(15) = {X1,Y3,0, gridsize};
 Point(16) = {X1-N0*gridsizeX,Y3,0, gridsize};
 
 Point(17) = {X0, Y2+N0*gridsizeY,0, gridsize};
 Point(18) = {X0, Y2,0, gridsize};
 Point(19) = {X0, Y1,0, gridsize};
 Point(20) = {X0, Y1-N0*gridsizeY,0, gridsize};
 
 Point(21) = {X1-N0*gridsizeX,Y1-N0*gridsizeY,0, gridsize};
 Point(22) = {X1,Y1-N0*gridsizeY,0, gridsize};
 Point(23) = {X1,Y1,0, gridsize};
 Point(24) = {X1-N0*gridsizeX,Y1,0, gridsize};
 
 Point(25) = {X2,Y1-N0*gridsizeY,0, gridsize};
 Point(26) = {X2+N0*gridsizeX,Y1-N0*gridsizeY,0, gridsize};
 Point(27) = {X2+N0*gridsizeX,Y1,0, gridsize};
 Point(28) = {X2,Y1,0, gridsize};
 
 Point(29) = {X2,Y2,0, gridsize};
 Point(30) = {X2+N0*gridsizeX,Y2,0, gridsize};
 Point(31) = {X2+N0*gridsizeX,Y2+N0*gridsizeY,0, gridsize};
 Point(32) = {X2,Y2+N0*gridsizeY,0, gridsize};
 
 Point(33) = {X1-N0*gridsizeX,Y2,0, gridsize};
 Point(34) = {X1,Y2,0, gridsize};
 Point(35) = {X1,Y2+N0*gridsizeY,0, gridsize};
 Point(36) = {X1-N0*gridsizeX,Y2+N0*gridsizeY,0, gridsize};
 
 //Air Foil
 Point(1001) = {1, -1.66533e-17, 0, 1};
 Point(1002) = {0.995963, 0.000585234, 0, 1};
 Point(1003) = {0.991514, 0.0012267, 0, 1};
 Point(1004) = {0.986656, 0.00192288, 0, 1};
 Point(1005) = {0.981394, 0.00267213, 0, 1};
 Point(1006) = {0.975732, 0.00347271, 0, 1};
 Point(1007) = {0.969674, 0.00432279, 0, 1};
 Point(1008) = {0.963227, 0.00522045, 0, 1};
 Point(1009) = {0.956395, 0.00616372, 0, 1};
 Point(1010) = {0.949184, 0.00715053, 0, 1};
 Point(1011) = {0.9416, 0.00817878, 0, 1};
 Point(1012) = {0.933651, 0.00924631, 0, 1};
 Point(1013) = {0.925341, 0.0103509, 0, 1};
 Point(1014) = {0.916679, 0.0114904, 0, 1};
 Point(1015) = {0.907672, 0.0126624, 0, 1};
 Point(1016) = {0.898327, 0.0138647, 0, 1};
 Point(1017) = {0.888653, 0.015095, 0, 1};
 Point(1018) = {0.878657, 0.0163511, 0, 1};
 Point(1019) = {0.868348, 0.0176304, 0, 1};
 Point(1020) = {0.857734, 0.0189308, 0, 1};
 Point(1021) = {0.846825, 0.02025, 0, 1};
 Point(1022) = {0.835631, 0.0215855, 0, 1};
 Point(1023) = {0.824159, 0.022935, 0, 1};
 Point(1024) = {0.812421, 0.0242963, 0, 1};
 Point(1025) = {0.800425, 0.0256669, 0, 1};
 Point(1026) = {0.788183, 0.0270445, 0, 1};
 Point(1027) = {0.775704, 0.0284268, 0, 1};
 Point(1028) = {0.762999, 0.0298114, 0, 1};
 Point(1029) = {0.750079, 0.031196, 0, 1};
 Point(1030) = {0.736955, 0.032578, 0, 1};
 Point(1031) = {0.723638, 0.0339552, 0, 1};
 Point(1032) = {0.710139, 0.0353251, 0, 1};
 Point(1033) = {0.696469, 0.0366853, 0, 1};
 Point(1034) = {0.68264, 0.0380331, 0, 1};
 Point(1035) = {0.668664, 0.0393663, 0, 1};
 Point(1036) = {0.654553, 0.0406821, 0, 1};
 Point(1037) = {0.640319, 0.0419779, 0, 1};
 Point(1038) = {0.625973, 0.0432513, 0, 1};
 Point(1039) = {0.611527, 0.0444995, 0, 1};
 Point(1040) = {0.596995, 0.0457197, 0, 1};
 Point(1041) = {0.582388, 0.0469094, 0, 1};
 Point(1042) = {0.567719, 0.0480657, 0, 1};
 Point(1043) = {0.552999, 0.0491858, 0, 1};
 Point(1044) = {0.538242, 0.0502669, 0, 1};
 Point(1045) = {0.523461, 0.0513062, 0, 1};
 Point(1046) = {0.508666, 0.0523008, 0, 1};
 Point(1047) = {0.493872, 0.0532479, 0, 1};
 Point(1048) = {0.47909, 0.0541446, 0, 1};
 Point(1049) = {0.464333, 0.0549882, 0, 1};
 Point(1050) = {0.449614, 0.0557757, 0, 1};
 Point(1051) = {0.434944, 0.0565044, 0, 1};
 Point(1052) = {0.420337, 0.0571716, 0, 1};
 Point(1053) = {0.405805, 0.0577746, 0, 1};
 Point(1054) = {0.39136, 0.0583109, 0, 1};
 Point(1055) = {0.377014, 0.0587778, 0, 1};
 Point(1056) = {0.362779, 0.0591732, 0, 1};
 Point(1057) = {0.348668, 0.0594945, 0, 1};
 Point(1058) = {0.334692, 0.0597397, 0, 1};
 Point(1059) = {0.320864, 0.0599068, 0, 1};
 Point(1060) = {0.307194, 0.0599939, 0, 1};
 Point(1061) = {0.293695, 0.0599993, 0, 1};
 Point(1062) = {0.280377, 0.0599215, 0, 1};
 Point(1063) = {0.267253, 0.0597592, 0, 1};
 Point(1064) = {0.254333, 0.0595112, 0, 1};
 Point(1065) = {0.241628, 0.0591767, 0, 1};
 Point(1066) = {0.22915, 0.0587549, 0, 1};
 Point(1067) = {0.216907, 0.0582453, 0, 1};
 Point(1068) = {0.204912, 0.0576477, 0, 1};
 Point(1069) = {0.193173, 0.0569622, 0, 1};
 Point(1070) = {0.181702, 0.0561888, 0, 1};
 Point(1071) = {0.170507, 0.055328, 0, 1};
 Point(1072) = {0.159598, 0.0543805, 0, 1};
 Point(1073) = {0.148985, 0.0533471, 0, 1};
 Point(1074) = {0.138676, 0.052229, 0, 1};
 Point(1075) = {0.12868, 0.0510274, 0, 1};
 Point(1076) = {0.119005, 0.0497438, 0, 1};
 Point(1077) = {0.10966, 0.0483798, 0, 1};
 Point(1078) = {0.100653, 0.0469374, 0, 1};
 Point(1079) = {0.0919912, 0.0454185, 0, 1};
 Point(1080) = {0.0836818, 0.0438253, 0, 1};
 Point(1081) = {0.0757319, 0.0421599, 0, 1};
 Point(1082) = {0.0681483, 0.0404248, 0, 1};
 Point(1083) = {0.0609375, 0.0386223, 0, 1};
 Point(1084) = {0.0541055, 0.036755, 0, 1};
 Point(1085) = {0.0476581, 0.0348253, 0, 1};
 Point(1086) = {0.0416007, 0.0328359, 0, 1};
 Point(1087) = {0.0359385, 0.0307892, 0, 1};
 Point(1088) = {0.0306763, 0.0286878, 0, 1};
 Point(1089) = {0.0258186, 0.0265342, 0, 1};
 Point(1090) = {0.0213693, 0.0243307, 0, 1};
 Point(1091) = {0.0173324, 0.0220798, 0, 1};
 Point(1092) = {0.0137112, 0.0197835, 0, 1};
 Point(1093) = {0.0105087, 0.0174439, 0, 1};
 Point(1094) = {0.00772778, 0.0150632, 0, 1};
 Point(1095) = {0.00537068, 0.0126429, 0, 1};
 Point(1096) = {0.00343942, 0.0101848, 0, 1};
 Point(1097) = {0.00193563, 0.00769029, 0, 1};
 Point(1098) = {0.000860583, 0.00516064, 0, 1};
 Point(1099) = {0.000215191, 0.00259693, 0, 1};
 Point(1100) = {0, 0, 0, 1};
 Point(1101) = {0.000215191, -0.00259693, 0, 1};
 Point(1102) = {0.000860583, -0.00516064, 0, 1};
 Point(1103) = {0.00193563, -0.00769029, 0, 1};
 Point(1104) = {0.00343942, -0.0101848, 0, 1};
 Point(1105) = {0.00537068, -0.0126429, 0, 1};
 Point(1106) = {0.00772778, -0.0150632, 0, 1};
 Point(1107) = {0.0105087, -0.0174439, 0, 1};
 Point(1108) = {0.0137112, -0.0197835, 0, 1};
 Point(1109) = {0.0173324, -0.0220798, 0, 1};
 Point(1110) = {0.0213693, -0.0243307, 0, 1};
 Point(1111) = {0.0258186, -0.0265342, 0, 1};
 Point(1112) = {0.0306763, -0.0286878, 0, 1};
 Point(1113) = {0.0359385, -0.0307892, 0, 1};
 Point(1114) = {0.0416007, -0.0328359, 0, 1};
 Point(1115) = {0.0476581, -0.0348253, 0, 1};
 Point(1116) = {0.0541055, -0.036755, 0, 1};
 Point(1117) = {0.0609375, -0.0386223, 0, 1};
 Point(1118) = {0.0681483, -0.0404248, 0, 1};
 Point(1119) = {0.0757319, -0.0421599, 0, 1};
 Point(1120) = {0.0836818, -0.0438253, 0, 1};
 Point(1121) = {0.0919912, -0.0454185, 0, 1};
 Point(1122) = {0.100653, -0.0469374, 0, 1};
 Point(1123) = {0.10966, -0.0483798, 0, 1};
 Point(1124) = {0.119005, -0.0497438, 0, 1};
 Point(1125) = {0.12868, -0.0510274, 0, 1};
 Point(1126) = {0.138676, -0.052229, 0, 1};
 Point(1127) = {0.148985, -0.0533471, 0, 1};
 Point(1128) = {0.159598, -0.0543805, 0, 1};
 Point(1129) = {0.170507, -0.055328, 0, 1};
 Point(1130) = {0.181702, -0.0561888, 0, 1};
 Point(1131) = {0.193173, -0.0569622, 0, 1};
 Point(1132) = {0.204912, -0.0576477, 0, 1};
 Point(1133) = {0.216907, -0.0582453, 0, 1};
 Point(1134) = {0.22915, -0.0587549, 0, 1};
 Point(1135) = {0.241628, -0.0591767, 0, 1};
 Point(1136) = {0.254333, -0.0595112, 0, 1};
 Point(1137) = {0.267253, -0.0597592, 0, 1};
 Point(1138) = {0.280377, -0.0599215, 0, 1};
 Point(1139) = {0.293695, -0.0599993, 0, 1};
 Point(1140) = {0.307194, -0.0599939, 0, 1};
 Point(1141) = {0.320864, -0.0599068, 0, 1};
 Point(1142) = {0.334692, -0.0597397, 0, 1};
 Point(1143) = {0.348668, -0.0594945, 0, 1};
 Point(1144) = {0.362779, -0.0591732, 0, 1};
 Point(1145) = {0.377014, -0.0587778, 0, 1};
 Point(1146) = {0.39136, -0.0583109, 0, 1};
 Point(1147) = {0.405805, -0.0577746, 0, 1};
 Point(1148) = {0.420337, -0.0571716, 0, 1};
 Point(1149) = {0.434944, -0.0565044, 0, 1};
 Point(1150) = {0.449614, -0.0557757, 0, 1};
 Point(1151) = {0.464333, -0.0549882, 0, 1};
 Point(1152) = {0.47909, -0.0541446, 0, 1};
 Point(1153) = {0.493872, -0.0532479, 0, 1};
 Point(1154) = {0.508666, -0.0523008, 0, 1};
 Point(1155) = {0.523461, -0.0513062, 0, 1};
 Point(1156) = {0.538242, -0.0502669, 0, 1};
 Point(1157) = {0.552999, -0.0491858, 0, 1};
 Point(1158) = {0.567719, -0.0480657, 0, 1};
 Point(1159) = {0.582388, -0.0469094, 0, 1};
 Point(1160) = {0.596995, -0.0457197, 0, 1};
 Point(1161) = {0.611527, -0.0444995, 0, 1};
 Point(1162) = {0.625973, -0.0432513, 0, 1};
 Point(1163) = {0.640319, -0.0419779, 0, 1};
 Point(1164) = {0.654553, -0.0406821, 0, 1};
 Point(1165) = {0.668664, -0.0393663, 0, 1};
 Point(1166) = {0.68264, -0.0380331, 0, 1};
 Point(1167) = {0.696469, -0.0366853, 0, 1};
 Point(1168) = {0.710139, -0.0353251, 0, 1};
 Point(1169) = {0.723638, -0.0339552, 0, 1};
 Point(1170) = {0.736955, -0.032578, 0, 1};
 Point(1171) = {0.750079, -0.031196, 0, 1};
 Point(1172) = {0.762999, -0.0298114, 0, 1};
 Point(1173) = {0.775704, -0.0284268, 0, 1};
 Point(1174) = {0.788183, -0.0270445, 0, 1};
 Point(1175) = {0.800425, -0.0256669, 0, 1};
 Point(1176) = {0.812421, -0.0242963, 0, 1};
 Point(1177) = {0.824159, -0.022935, 0, 1};
 Point(1178) = {0.835631, -0.0215855, 0, 1};
 Point(1179) = {0.846825, -0.02025, 0, 1};
 Point(1180) = {0.857734, -0.0189308, 0, 1};
 Point(1181) = {0.868348, -0.0176304, 0, 1};
 Point(1182) = {0.878657, -0.0163511, 0, 1};
 Point(1183) = {0.888653, -0.015095, 0, 1};
 Point(1184) = {0.898327, -0.0138647, 0, 1};
 Point(1185) = {0.907672, -0.0126624, 0, 1};
 Point(1186) = {0.916679, -0.0114904, 0, 1};
 Point(1187) = {0.925341, -0.0103509, 0, 1};
 Point(1188) = {0.933651, -0.00924631, 0, 1};
 Point(1189) = {0.9416, -0.00817878, 0, 1};
 Point(1190) = {0.949184, -0.00715053, 0, 1};
 Point(1191) = {0.956395, -0.00616372, 0, 1};
 Point(1192) = {0.963227, -0.00522045, 0, 1};
 Point(1193) = {0.969674, -0.00432279, 0, 1};
 Point(1194) = {0.975732, -0.00347271, 0, 1};
 Point(1195) = {0.981394, -0.00267213, 0, 1};
 Point(1196) = {0.986656, -0.00192288, 0, 1};
 Point(1197) = {0.991514, -0.0012267, 0, 1};
 Point(1198) = {0.995963, -0.000585234, 0, 1};
 Line(1001) = {1001, 1002};
 Line(1002) = {1002, 1003};
 Line(1003) = {1003, 1004};
 Line(1004) = {1004, 1005};
 Line(1005) = {1005, 1006};
 Line(1006) = {1006, 1007};
 Line(1007) = {1007, 1008};
 Line(1008) = {1008, 1009};
 Line(1009) = {1009, 1010};
 Line(1010) = {1010, 1011};
 Line(1011) = {1011, 1012};
 Line(1012) = {1012, 1013};
 Line(1013) = {1013, 1014};
 Line(1014) = {1014, 1015};
 Line(1015) = {1015, 1016};
 Line(1016) = {1016, 1017};
 Line(1017) = {1017, 1018};
 Line(1018) = {1018, 1019};
 Line(1019) = {1019, 1020};
 Line(1020) = {1020, 1021};
 Line(1021) = {1021, 1022};
 Line(1022) = {1022, 1023};
 Line(1023) = {1023, 1024};
 Line(1024) = {1024, 1025};
 Line(1025) = {1025, 1026};
 Line(1026) = {1026, 1027};
 Line(1027) = {1027, 1028};
 Line(1028) = {1028, 1029};
 Line(1029) = {1029, 1030};
 Line(1030) = {1030, 1031};
 Line(1031) = {1031, 1032};
 Line(1032) = {1032, 1033};
 Line(1033) = {1033, 1034};
 Line(1034) = {1034, 1035};
 Line(1035) = {1035, 1036};
 Line(1036) = {1036, 1037};
 Line(1037) = {1037, 1038};
 Line(1038) = {1038, 1039};
 Line(1039) = {1039, 1040};
 Line(1040) = {1040, 1041};
 Line(1041) = {1041, 1042};
 Line(1042) = {1042, 1043};
 Line(1043) = {1043, 1044};
 Line(1044) = {1044, 1045};
 Line(1045) = {1045, 1046};
 Line(1046) = {1046, 1047};
 Line(1047) = {1047, 1048};
 Line(1048) = {1048, 1049};
 Line(1049) = {1049, 1050};
 Line(1050) = {1050, 1051};
 Line(1051) = {1051, 1052};
 Line(1052) = {1052, 1053};
 Line(1053) = {1053, 1054};
 Line(1054) = {1054, 1055};
 Line(1055) = {1055, 1056};
 Line(1056) = {1056, 1057};
 Line(1057) = {1057, 1058};
 Line(1058) = {1058, 1059};
 Line(1059) = {1059, 1060};
 Line(1060) = {1060, 1061};
 Line(1061) = {1061, 1062};
 Line(1062) = {1062, 1063};
 Line(1063) = {1063, 1064};
 Line(1064) = {1064, 1065};
 Line(1065) = {1065, 1066};
 Line(1066) = {1066, 1067};
 Line(1067) = {1067, 1068};
 Line(1068) = {1068, 1069};
 Line(1069) = {1069, 1070};
 Line(1070) = {1070, 1071};
 Line(1071) = {1071, 1072};
 Line(1072) = {1072, 1073};
 Line(1073) = {1073, 1074};
 Line(1074) = {1074, 1075};
 Line(1075) = {1075, 1076};
 Line(1076) = {1076, 1077};
 Line(1077) = {1077, 1078};
 Line(1078) = {1078, 1079};
 Line(1079) = {1079, 1080};
 Line(1080) = {1080, 1081};
 Line(1081) = {1081, 1082};
 Line(1082) = {1082, 1083};
 Line(1083) = {1083, 1084};
 Line(1084) = {1084, 1085};
 Line(1085) = {1085, 1086};
 Line(1086) = {1086, 1087};
 Line(1087) = {1087, 1088};
 Line(1088) = {1088, 1089};
 Line(1089) = {1089, 1090};
 Line(1090) = {1090, 1091};
 Line(1091) = {1091, 1092};
 Line(1092) = {1092, 1093};
 Line(1093) = {1093, 1094};
 Line(1094) = {1094, 1095};
 Line(1095) = {1095, 1096};
 Line(1096) = {1096, 1097};
 Line(1097) = {1097, 1098};
 Line(1098) = {1098, 1099};
 Line(1099) = {1099, 1100};
 Line(1100) = {1100, 1101};
 Line(1101) = {1101, 1102};
 Line(1102) = {1102, 1103};
 Line(1103) = {1103, 1104};
 Line(1104) = {1104, 1105};
 Line(1105) = {1105, 1106};
 Line(1106) = {1106, 1107};
 Line(1107) = {1107, 1108};
 Line(1108) = {1108, 1109};
 Line(1109) = {1109, 1110};
 Line(1110) = {1110, 1111};
 Line(1111) = {1111, 1112};
 Line(1112) = {1112, 1113};
 Line(1113) = {1113, 1114};
 Line(1114) = {1114, 1115};
 Line(1115) = {1115, 1116};
 Line(1116) = {1116, 1117};
 Line(1117) = {1117, 1118};
 Line(1118) = {1118, 1119};
 Line(1119) = {1119, 1120};
 Line(1120) = {1120, 1121};
 Line(1121) = {1121, 1122};
 Line(1122) = {1122, 1123};
 Line(1123) = {1123, 1124};
 Line(1124) = {1124, 1125};
 Line(1125) = {1125, 1126};
 Line(1126) = {1126, 1127};
 Line(1127) = {1127, 1128};
 Line(1128) = {1128, 1129};
 Line(1129) = {1129, 1130};
 Line(1130) = {1130, 1131};
 Line(1131) = {1131, 1132};
 Line(1132) = {1132, 1133};
 Line(1133) = {1133, 1134};
 Line(1134) = {1134, 1135};
 Line(1135) = {1135, 1136};
 Line(1136) = {1136, 1137};
 Line(1137) = {1137, 1138};
 Line(1138) = {1138, 1139};
 Line(1139) = {1139, 1140};
 Line(1140) = {1140, 1141};
 Line(1141) = {1141, 1142};
 Line(1142) = {1142, 1143};
 Line(1143) = {1143, 1144};
 Line(1144) = {1144, 1145};
 Line(1145) = {1145, 1146};
 Line(1146) = {1146, 1147};
 Line(1147) = {1147, 1148};
 Line(1148) = {1148, 1149};
 Line(1149) = {1149, 1150};
 Line(1150) = {1150, 1151};
 Line(1151) = {1151, 1152};
 Line(1152) = {1152, 1153};
 Line(1153) = {1153, 1154};
 Line(1154) = {1154, 1155};
 Line(1155) = {1155, 1156};
 Line(1156) = {1156, 1157};
 Line(1157) = {1157, 1158};
 Line(1158) = {1158, 1159};
 Line(1159) = {1159, 1160};
 Line(1160) = {1160, 1161};
 Line(1161) = {1161, 1162};
 Line(1162) = {1162, 1163};
 Line(1163) = {1163, 1164};
 Line(1164) = {1164, 1165};
 Line(1165) = {1165, 1166};
 Line(1166) = {1166, 1167};
 Line(1167) = {1167, 1168};
 Line(1168) = {1168, 1169};
 Line(1169) = {1169, 1170};
 Line(1170) = {1170, 1171};
 Line(1171) = {1171, 1172};
 Line(1172) = {1172, 1173};
 Line(1173) = {1173, 1174};
 Line(1174) = {1174, 1175};
 Line(1175) = {1175, 1176};
 Line(1176) = {1176, 1177};
 Line(1177) = {1177, 1178};
 Line(1178) = {1178, 1179};
 Line(1179) = {1179, 1180};
 Line(1180) = {1180, 1181};
 Line(1181) = {1181, 1182};
 Line(1182) = {1182, 1183};
 Line(1183) = {1183, 1184};
 Line(1184) = {1184, 1185};
 Line(1185) = {1185, 1186};
 Line(1186) = {1186, 1187};
 Line(1187) = {1187, 1188};
 Line(1188) = {1188, 1189};
 Line(1189) = {1189, 1190};
 Line(1190) = {1190, 1191};
 Line(1191) = {1191, 1192};
 Line(1192) = {1192, 1193};
 Line(1193) = {1193, 1194};
 Line(1194) = {1194, 1195};
 Line(1195) = {1195, 1196};
 Line(1196) = {1196, 1197};
 Line(1197) = {1197, 1198};
 Line(1198) = {1198, 1001};
 Line Loop(1000) = {1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198};
 
 //Lines
 Line(1) = {1,5};
 Line(2) = {5,6};
 Line(3) = {6,7};
 Line(4) = {7,8};
 Line(5) = {8,2};
 Line(6) = {2,9};
 Line(7) = {9,10};
 Line(8) = {10,11};
 Line(9) = {11,12};
 Line(10) = {12,3};
 Line(11) = {13,3};
 Line(12) = {14,13};
 Line(13) = {15,14};
 Line(14) = {16,15};
 Line(15) = {4,16};
 Line(16) = {17,4};
 Line(17) = {18,17};
 Line(18) = {19,18};
 Line(19) = {20,19};
 Line(20) = {1,20};
 Line(21) = {20,21};
 Line(22) = {21,22};
 Line(23) = {22,25};
 Line(24) = {25,26};
 Line(25) = {26,9};
 Line(26) = {19,24};
 Line(27) = {24,23};
 Line(28) = {23,28};
 Line(29) = {28,27};
 Line(30) = {27,10};
 Line(31) = {18,33};
 Line(32) = {33,34};
 Line(33) = {34,29};
 Line(34) = {29,30};
 Line(35) = {30,11};
 Line(36) = {17,36};
 Line(37) = {36,35};
 Line(38) = {35,32};
 Line(39) = {32,31};
 Line(40) = {31,12};
 Line(41) = {5,21};
 Line(42) = {21,24};
 Line(43) = {24,33};
 Line(44) = {33,36};
 Line(45) = {36,16};
 Line(46) = {6,22};
 Line(47) = {22,23};
 Line(48) = {23,34};
 Line(49) = {34,35};
 Line(50) = {35,15};
 Line(51) = {7,25};
 Line(52) = {25,28};
 Line(53) = {28,29};
 Line(54) = {29,32};
 Line(55) = {32,14};
 Line(56) = {8,26};
 Line(57) = {26,27};
 Line(58) = {27,30};
 Line(59) = {30,31};
 Line(60) = {31,13};
 
 
 Line Loop(1) = {1,41,-21,-20};
 Line Loop(2) = {2,46,-22,-41};
 Line Loop(3) = {3,51,-23,-46};
 Line Loop(4) = {4,56,-24,-51};
 Line Loop(5) = {5,6,-25,-56};
 Line Loop(6) = {21,42,-26,-19};
 Line Loop(7) = {22,47,-27,-42};
 Line Loop(8) = {23,52,-28,-47};
 Line Loop(9) = {24,57,-29,-52};
 Line Loop(10) = {25,7,-30,-57};
 Line Loop(11) = {26,43,-31,-18};
 Line Loop(12) = {27,48,-32,-43};
 Line Loop(13) = {28,53,-33,-48};
 Line Loop(14) = {29,58,-34,-53};
 Line Loop(15) = {30,8,-35,-58};
 Line Loop(16) = {31,44,-36,-17};
 Line Loop(17) = {32,49,-37,-44};
 Line Loop(18) = {33,54,-38,-49};
 Line Loop(19) = {34,59,-39,-54};
 Line Loop(20) = {35,9,-40,-59};
 Line Loop(21) = {36,45,-15,-16};
 Line Loop(22) = {37,50,-14,-45};
 Line Loop(23) = {38,55,-13,-50};
 Line Loop(24) = {39,60,-12,-55};
 Line Loop(25) = {40,10,-11,-60};
 
 
 Plane Surface(1) = {1};
 Plane Surface(2) = {2};
 Plane Surface(3) = {3};
 Plane Surface(4) = {4};
 Plane Surface(5) = {5};
 Plane Surface(6) = {6};
 Plane Surface(7) = {7};
 Plane Surface(8) = {8};
 Plane Surface(9) = {9};
 Plane Surface(10) = {10};
 Plane Surface(11) = {11};
 Plane Surface(12) = {12};
 Plane Surface(13) = {13,-1000};
 Plane Surface(14) = {14};
 Plane Surface(15) = {15};
 Plane Surface(16) = {16};
 Plane Surface(17) = {17};
 Plane Surface(18) = {18};
 Plane Surface(19) = {19};
 Plane Surface(20) = {20};
 Plane Surface(21) = {21};
 Plane Surface(22) = {22};
 Plane Surface(23) = {23};
 Plane Surface(24) = {24};
 Plane Surface(25) = {25};
 
 Physical Surface("tri_0") = {13};
 Physical Surface("qdr_0") = {1};
 Physical Surface("qdr_1") = {3};
 Physical Surface("qdr_2") = {5};
 Physical Surface("qdr_3") = {11};
 Physical Surface("qdr_4") = {15};
 Physical Surface("qdr_5") = {21};
 Physical Surface("qdr_6") = {23};
 Physical Surface("qdr_7") = {25};
 Physical Surface("mid_0") = {8};
 Physical Surface("mid_1") = {12};
 Physical Surface("mid_2") = {14};
 Physical Surface("mid_3") = {18};
 Physical Surface("q2q_0") = {2};
 Physical Surface("q2q_1") = {4};
 Physical Surface("q2q_2") = {6};
 Physical Surface("q2q_3") = {10};
 Physical Surface("q2q_4") = {16};
 Physical Surface("q2q_5") = {20};
 Physical Surface("q2q_6") = {22};
 Physical Surface("q2q_7") = {24};
 Physical Surface("rst_1") = {7};
 Physical Surface("rst_2") = {9};
 Physical Surface("rst_3") = {17};
 Physical Surface("rst_4") = {19};
 
-Physical Line("inflow") = {20,19,18,17,16,1,2,3,4,5};
-Physical Line("outflow") = {6,7,8,9,10,15,14,13,12,11};
+//Physical Line("inflow") = {20,19,18,17,16,1,2,3,4,5};
+//Physical Line("outflow") = {6,7,8,9,10,15,14,13,12,11};
+Physical Line("inflow") = {20,19,18,17,16,1,2,3,4,5,6,7,8,9,10,15,14,13,12,11};
 Physical Line("slipWall") = {1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198};
 Physical Line("q2i") = {23,58,38,43,22,47,27,42,24,57,29,52,34,59,39,54,32,49,37,44};
 Physical Line("t2i") = {28,53,33,48};
 Physical Line("q2q") = {41,46,51,56,45,50,55,60,21,26,31,36,25,30,35,40};
 
 Transfinite Curve{1,21,26,31,36,15} = Nx1+1;
 Transfinite Curve{5,25,30,35,40,11} = Nx3+1;
 Transfinite Curve{20,41,46,51,56,6} = Ny1+1;
 Transfinite Curve{16,45,50,55,60,10} = Ny3+1;
 Transfinite Curve{2,22,27,32,37,14,4,24,29,34,39,12,19,42,47,52,57,7,17,44,49,54,59,9} = N0+1;
 Transfinite Curve{3,23,28,33,38,13} = Nx2+1;
 Transfinite Curve{18,43,48,53,58,8} = Ny2+1;
 
 //Transfinite Curve {1000} = D*N/boxdim+1 Using Progression 1;
 
 Transfinite Surface{1,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,19,20,21,22,23,24,25};
 Recombine Surface{1,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,19,20,21,22,23,24,25};
diff --git a/ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo b/ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo
index 45206ba..798006f 100644
--- a/ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo
+++ b/ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo
@@ -1,662 +1,662 @@
 // Variables
 Boxdim = 16.9;
 
 N = 2*28*2;
 M = N;
 N0 = 3;
 
-gridsizeX = 2;
-gridsizeY = 2;
-gridsizeXb = 1.999090909090909;
+gridsizeX = 0.5;
+gridsizeY = 0.5;
+gridsizeXb = 0.499772727272727;
 
 If (gridsizeX < gridsizeY)
 	gridsize = gridsizeX;
 Else
 	gridsize = gridsizeY;
 EndIf
-gridsize = 3;
+gridsize = 1.5;
 
 D = 10;
 
 X0 = 0;
 X1 = 109.95;
 X2 = 152.8-9;
 X3 = 152.8;
 X4 = 203.51;
 X5 = 25*D;
 X6 = -5*D;
 
 Y0 = 0;
 Y1 = 25.0705074;
 Y2 = 25;
 Y3 = Y1+12.5;
-Y4 = 64;
+Y4 = 63.5;
 Y5 = 10*D;
 
-X101 = 154+2;
+X101 = 154;
 X102 = 112;
 X103 = 206-0*gridsizeX;
 X104 = 82;
 
-Y101 = 14+2;
+Y101 = 14;
 Y102 = 46;
 Y103 = Y4+N0*gridsizeY;
 Y104 = 54;
 
-Nx0 = 55-N0;
-Nx0b = 56;
+Nx0 = 220-N0;
+Nx0b = 224;
 
-Nx1 = 22-N0;
-Nx2 = 25-N0;
-Nx3 =22-N0;
-Nx4 = 25-N0;
+Nx1 = 84-N0;
+Nx2 = 104-N0;
+Nx3 =88-N0;
+Nx4 = 100-N0;
 
 
-Ny0 = 8;
-Ny1 = 15-N0;
-Ny2 = 7;
-Ny4 = 12-N0;
+Ny0 = 28;
+Ny1 = 64-N0;
+Ny2 = 25;
+Ny4 = 38-N0;
 //Ny5 = 14;
-Ny5 = 15-N0;
+Ny5 = 70-N0;
 
 
 // Points
 Point(1) = {X0,Y0,0, gridsize};
 Point(2) = {X4,Y0,0, gridsize};
 Point(222) = {X103,Y0,0, gridsize/2};
 Point(3) = {X1,Y1,0, gridsize};
 Point(4) = {X0,Y1,0, gridsize};
 Point(5) = {X0,Y3,0, gridsize};
 Point(6) = {X0,Y4,0, gridsize};
 Point(7) = {X3,Y2,0, gridsize};
 Point(8) = {X2,Y2,0, gridsize};
 Point(9) = {X1, Y3,0, gridsize};
 
 Point(10) = {X5, Y0, 0, gridsize};
 Point(11) = {X5, Y5, 0, gridsize};
 Point(12) = {X0, Y5,0, gridsize};
 Point(13) = {X6, Y5,0, gridsize};
 Point(14) = {X6, Y4,0, gridsize};
 
 
 Point(101) = {X103 +N0*gridsizeX,Y0,0, gridsize};
 
 Point(102) = {X5,Y101,0, gridsize};
 Point(103) = {X5,Y101+N0*gridsizeY,0, gridsize};
 Point(104) = {X5,Y2,0, gridsize};
 Point(105) = {X5,Y2+N0*gridsizeY, gridsize};
 Point(106) = {X5,Y102,0, gridsize};
 Point(107) = {X5,Y102+N0*gridsizeY,0, gridsize};
 Point(108) = {X5,Y103,0, gridsize};
 Point(109) = {X5,Y103+N0*gridsizeY,0, gridsize};
 Point(110) = {X103 +N0*gridsizeX,Y5,0, gridsize};
 Point(111) = {X103,Y5,0, gridsize};
 Point(112) = {X101+N0*gridsizeX,Y5,0, gridsize};
 Point(113) = {X101,Y5,0, gridsize};
 Point(114) = {X102 +N0*gridsizeX,Y5,0, gridsize};
 Point(115) = {X102,Y5,0, gridsize};
 Point(116) = {X0-N0*gridsizeX, Y5,0, gridsize};
 
 Point(117) = {X6,Y103+N0*gridsizeY,0, gridsize};
 Point(118) = {X6,Y103,0, gridsize};
 Point(119) = {X0-N0*gridsizeX,Y4,0, gridsize};
 
 Point(120) = {X1-N0*gridsizeXb,Y1,0, gridsize};
 Point(121) = {X1-N0*gridsizeXb, Y3,0, gridsize};
 
 Point(122) = {X101,Y101,0, gridsize};
 Point(123) = {X101 +N0*gridsizeX,Y101,0, gridsize};
 Point(124) = {X101 +N0*gridsizeX,Y101+N0*gridsizeY,0, gridsize};
 Point(125) = {X101,Y101+N0*gridsizeY,0, gridsize};
 
 Point(126) = {X103,Y101,0, gridsize};
 Point(127) = {X103 +N0*gridsizeX,Y101,0, gridsize};
 Point(128) = {X103 +N0*gridsizeX,Y101+N0*gridsizeY,0, gridsize};
 Point(129) = {X103,Y101+N0*gridsizeY,0, gridsize};
 
 
 Point(134) = {X103,Y2,0, gridsize};
 Point(135) = {X103 +N0*gridsizeX,Y2,0, gridsize};
 Point(136) = {X103 +N0*gridsizeX,Y2+N0*gridsizeY,0, gridsize};
 Point(137) = {X103,Y2+N0*gridsizeY,0, gridsize};
 
 Point(138) = {X102,Y102,0, gridsize};
 Point(139) = {X102 +N0*gridsizeX,Y102,0, gridsize};
 Point(140) = {X102 +N0*gridsizeX,Y102+N0*gridsizeY,0, gridsize};
 Point(141) = {X102,Y102+N0*gridsizeY,0, gridsize};
 
 Point(142) = {X101,Y102,0, gridsize};
 Point(143) = {X101 +N0*gridsizeX,Y102,0, gridsize};
 Point(144) = {X101 +N0*gridsizeX,Y102+N0*gridsizeY,0, gridsize};
 Point(145) = {X101,Y102+N0*gridsizeY,0, gridsize};
 
 Point(146) = {X103,Y102,0, gridsize};
 Point(147) = {X103 +N0*gridsizeX,Y102,0, gridsize};
 Point(148) = {X103 +N0*gridsizeX,Y102+N0*gridsizeY,0, gridsize};
 Point(149) = {X103,Y102+N0*gridsizeY,0, gridsize};
 
 Point(150) = {X0 - N0*gridsizeX,Y103,0, gridsize};
 Point(151) = {X0,Y103,0, gridsize};
 Point(152) = {X0 ,Y103+N0*gridsizeY,0, gridsize};
 Point(153) = {X0 - N0*gridsizeX,Y103+N0*gridsizeY,0, gridsize};
 
 
 Point(154) = {X102,Y103,0, gridsize};
 Point(155) = {X102 +N0*gridsizeX,Y103,0, gridsize};
 Point(156) = {X102 +N0*gridsizeX,Y103+N0*gridsizeY,0, gridsize};
 Point(157) = {X102,Y103+N0*gridsizeY,0, gridsize};
 
 Point(158) = {X101,Y103,0, gridsize};
 Point(159) = {X101 +N0*gridsizeX,Y103,0, gridsize};
 Point(160) = {X101 +N0*gridsizeX,Y103+N0*gridsizeY,0, gridsize};
 Point(161) = {X101,Y103+N0*gridsizeY,0, gridsize};
 
 Point(162) = {X103,Y103,0, gridsize};
 Point(163) = {X103 +N0*gridsizeX,Y103,0, gridsize};
 Point(164) = {X103 +N0*gridsizeX,Y103+N0*gridsizeY,0, gridsize};
 Point(165) = {X103,Y103+N0*gridsizeY,0, gridsize};
 
 Point(301) = {X104,Y104,0,gridsize};
 Point(302) = {X104+N0*gridsizeX,Y104,0,gridsize};
 Point(303) = {X104+N0*gridsizeX,Y104+N0*gridsizeY,0,gridsize};
 Point(304) = {X104,Y104+N0*gridsizeY,0,gridsize};
 
 Point(305) = {X104,Y103,0,gridsize};
 Point(306) = {X104+N0*gridsizeX,Y103,0,gridsize};
 Point(307) = {X104+N0*gridsizeX,Y103+N0*gridsizeY,0,gridsize};
 Point(308) = {X104,Y103+N0*gridsizeY,0,gridsize};
 
 Point(309) = {X104,Y5,0,gridsize};
 Point(310) = {X104+N0*gridsizeX,Y5,0,gridsize};
 
 Point(1002) = {2.30704, 63.4917, 0, gridsize};
 Point(1003) = {4.61396, 63.467, 0, gridsize};
 Point(1004) = {6.92065, 63.4257, 0, gridsize};
 Point(1005) = {9.22698, 63.368, 0, gridsize};
 Point(1006) = {11.5328, 63.2937, 0, gridsize};
 Point(1007) = {13.8381, 63.2029, 0, gridsize};
 Point(1008) = {16.1427, 63.0957, 0, gridsize};
 Point(1009) = {18.4464, 62.972, 0, gridsize};
 Point(1010) = {20.7492, 62.8318, 0, gridsize};
 Point(1011) = {23.0509, 62.6751, 0, gridsize};
 Point(1012) = {25.3515, 62.5019, 0, gridsize};
 Point(1013) = {27.6507, 62.3123, 0, gridsize};
 Point(1014) = {29.9486, 62.1063, 0, gridsize};
 Point(1015) = {32.2449, 61.8838, 0, gridsize};
 Point(1016) = {34.5395, 61.6449, 0, gridsize};
 Point(1017) = {36.8324, 61.3896, 0, gridsize};
 Point(1018) = {39.1234, 61.1179, 0, gridsize};
 Point(1019) = {41.4124, 60.8298, 0, gridsize};
 Point(1020) = {43.6993, 60.5253, 0, gridsize};
 Point(1021) = {45.9839, 60.2045, 0, gridsize};
 Point(1022) = {48.2662, 59.8674, 0, gridsize};
 Point(1023) = {50.546, 59.5139, 0, gridsize};
 Point(1024) = {52.8232, 59.1441, 0, gridsize};
 Point(1025) = {55.0978, 58.7581, 0, gridsize};
 Point(1026) = {57.3695, 58.3558, 0, gridsize};
 Point(1027) = {59.6382, 57.9372, 0, gridsize};
 Point(1028) = {61.9039, 57.5024, 0, gridsize};
 Point(1029) = {64.1665, 57.0514, 0, gridsize};
 Point(1030) = {66.4258, 56.5843, 0, gridsize};
 Point(1031) = {68.6816, 56.101, 0, gridsize};
 Point(1032) = {70.934, 55.6015, 0, gridsize};
 Point(1033) = {73.1827, 55.086, 0, gridsize};
 Point(1034) = {75.4277, 54.5544, 0, gridsize};
 Point(1035) = {77.6688, 54.0067, 0, gridsize};
 Point(1036) = {79.9059, 53.4431, 0, gridsize};
 Point(1037) = {82.1389, 52.8634, 0, gridsize};
 Point(1038) = {84.3678, 52.2678, 0, gridsize};
 Point(1039) = {86.5923, 51.6562, 0, gridsize};
 Point(1040) = {88.8124, 51.0288, 0, gridsize};
 Point(1041) = {91.0279, 50.3854, 0, gridsize};
 Point(1042) = {93.2388, 49.7263, 0, gridsize};
 Point(1043) = {95.4449, 49.0513, 0, gridsize};
 Point(1044) = {97.6462, 48.3606, 0, gridsize};
 Point(1045) = {99.8424, 47.6541, 0, gridsize};
 Point(1046) = {102.034, 46.932, 0, gridsize};
 Point(1047) = {104.219, 46.1942, 0, gridsize};
 Point(1048) = {106.4, 45.4407, 0, gridsize};
 Point(1049) = {108.575, 44.6717, 0, gridsize};
 Point(1050) = {110.745, 43.8872, 0, gridsize};
 Point(1051) = {112.909, 43.0871, 0, gridsize};
 Point(1052) = {115.067, 42.2716, 0, gridsize};
 Point(1053) = {117.219, 41.4407, 0, gridsize};
 Point(1054) = {119.365, 40.5944, 0, gridsize};
 Point(1055) = {121.505, 39.7327, 0, gridsize};
 Point(1056) = {123.639, 38.8558, 0, gridsize};
 Point(1057) = {125.767, 37.9636, 0, gridsize};
 Point(1058) = {127.888, 37.0563, 0, gridsize};
 Point(1059) = {130.002, 36.1337, 0, gridsize};
 Point(1060) = {132.11, 35.1961, 0, gridsize};
 Point(1061) = {134.211, 34.2434, 0, gridsize};
 Point(1062) = {136.306, 33.2757, 0, gridsize};
 Point(1063) = {138.393, 32.2931, 0, gridsize};
 Point(1064) = {140.473, 31.2955, 0, gridsize};
 Point(1065) = {142.546, 30.2831, 0, gridsize};
 Point(1066) = {144.612, 29.2559, 0, gridsize};
 Point(1067) = {146.67, 28.2139, 0, gridsize};
 Point(1068) = {148.721, 27.1572, 0, gridsize};
 Point(1069) = {150.764, 26.0859, 0, gridsize};
 
 
 //Lines
 
 Line(101) = {1,2};
 Line(102) = {222,101};
 Line(103) = {101,10};
 
 Line(104) = {10,102};
 Line(105) = {102,103};
 Line(106) = {103,106};
 //Line(107) = {104,105};
 //Line(108) = {105,106};
 Line(109) = {106,107};
 Line(110) = {107,108};
 Line(111) = {108,109};
 Line(112) = {109,11};
 
 Line(113) = {110,11};
 Line(114) = {111,110};
 Line(115) = {112,111};
 Line(116) = {113,112};
 Line(117) = {114,113};
 Line(118) = {115,114};
 Line(119) = {12,115};
 Line(120) = {116,12};
 Line(121) = {13,116};
 
 Line(122) = {117,13};
 Line(123) = {118,117};
 Line(124) = {14,118};
 
 Line(125) = {14,119};
 Line(126) = {119,6};
 
 Line(127) = {5,6};
 Line(128) = {4,5};
 Line(129) = {1,4};
 Line(130) = {4,120};
 Line(131) = {5,121};
 Line(132) = {9,8};
 Line(133) = {8,7};
 Line(134) = {3,2};
 Line(135) = {120,3};
 Line(136) = {121,9};
 
 //Line(137) = {118,154};
 Line(137) = {118,150};
 //Line(138) = {117,157};
 Line(138) = {117,153};
 Line(139) = {151,154};
 Line(140) = {152,157};
 
 Line(141) = {139,142};
 Line(142) = {140,145};
 Line(143) = {155,158};
 Line(144) = {156,161};
 
 Line(145) = {123,126};
 Line(146) = {124,129};
 //Line(147) = {131,134};
 //Line(148) = {132,137};
 Line(149) = {143,146};
 Line(150) = {144,149};
 Line(151) = {159,162};
 Line(152) = {160,165};
 
 Line(153) = {127,102};
 Line(154) = {128,103};
 //Line(155) = {135,104};
 //Line(156) = {136,105};
 Line(157) = {147,106};
 Line(158) = {148,107};
 Line(159) = {163,108};
 Line(160) = {164,109};
 
 Line(161) = {119,150};
 Line(162) = {6,151};
 Line(163) = {153,116};
 Line(164) = {152,12};
 
 Line(165) = {120,121};
 Line(166) = {3,9};
 Line(167) = {141,154};
 Line(168) = {140,155};
 Line(169) = {157,115};
 Line(170) = {156,114};
 
 Line(171) = {125,142};
 Line(172) = {124,143};
 //Line(173) = {133,142};
 //Line(174) = {132,143};
 Line(175) = {145,158};
 Line(176) = {144,159};
 Line(177) = {161,113};
 Line(178) = {160,112};
 
 Line(179) = {222,126};
 Line(180) = {101,127};
 Line(181) = {129,146};
 Line(182) = {128,147};
 //Line(183) = {137,146};
 //Line(184) = {136,147};
 Line(185) = {149,162};
 Line(186) = {148,163};
 Line(187) = {165,111};
 Line(188) = {164,110};
 
 Line(189) = {150,151};
 Line(190) = {151,152};
 Line(191) = {153,152};
 Line(192) = {150,153};
 
 Line(193) = {138,139};
 Line(194) = {139,140};
 Line(195) = {141,140};
 Line(196) = {138,141};
 
 Line(197) = {154,155};
 Line(198) = {155,156};
 Line(199) = {157,156};
 Line(200) = {154,157};
 
 Line(201) = {122,123};
 Line(202) = {123,124};
 Line(203) = {125,124};
 Line(204) = {122,125};
 
 //Line(205) = {130,131};
 //Line(206) = {131,132};
 //Line(207) = {133,132};
 //Line(208) = {130,133};
 
 Line(209) = {142,143};
 Line(210) = {143,144};
 Line(211) = {145,144};
 Line(212) = {142,145};
 
 Line(213) = {158,159};
 Line(214) = {159,160};
 Line(215) = {161,160};
 Line(216) = {158,161};
 
 Line(217) = {126,127};
 Line(218) = {127,128};
 Line(219) = {129,128};
 Line(220) = {126,129};
 
 //Line(221) = {134,135};
 //Line(222) = {135,136};
 //Line(223) = {137,136};
 //Line(224) = {134,137};
 
 Line(225) = {146,147};
 Line(226) = {147,148};
 Line(227) = {149,148};
 Line(228) = {146,149};
 
 Line(229) = {162,163};
 Line(230) = {163,164};
 Line(231) = {165,164};
 Line(232) = {162,165};
 
 Line(301) = {2,222};
 
 Line(1001) = {6, 1002};
 Line(1002) = {1002, 1003};
 Line(1003) = {1003, 1004};
 Line(1004) = {1004, 1005};
 Line(1005) = {1005, 1006};
 Line(1006) = {1006, 1007};
 Line(1007) = {1007, 1008};
 Line(1008) = {1008, 1009};
 Line(1009) = {1009, 1010};
 Line(1010) = {1010, 1011};
 Line(1011) = {1011, 1012};
 Line(1012) = {1012, 1013};
 Line(1013) = {1013, 1014};
 Line(1014) = {1014, 1015};
 Line(1015) = {1015, 1016};
 Line(1016) = {1016, 1017};
 Line(1017) = {1017, 1018};
 Line(1018) = {1018, 1019};
 Line(1019) = {1019, 1020};
 Line(1020) = {1020, 1021};
 Line(1021) = {1021, 1022};
 Line(1022) = {1022, 1023};
 Line(1023) = {1023, 1024};
 Line(1024) = {1024, 1025};
 Line(1025) = {1025, 1026};
 Line(1026) = {1026, 1027};
 Line(1027) = {1027, 1028};
 Line(1028) = {1028, 1029};
 Line(1029) = {1029, 1030};
 Line(1030) = {1030, 1031};
 Line(1031) = {1031, 1032};
 Line(1032) = {1032, 1033};
 Line(1033) = {1033, 1034};
 Line(1034) = {1034, 1035};
 Line(1035) = {1035, 1036};
 Line(1036) = {1036, 1037};
 Line(1037) = {1037, 1038};
 Line(1038) = {1038, 1039};
 Line(1039) = {1039, 1040};
 Line(1040) = {1040, 1041};
 Line(1041) = {1041, 1042};
 Line(1042) = {1042, 1043};
 Line(1043) = {1043, 1044};
 Line(1044) = {1044, 1045};
 Line(1045) = {1045, 1046};
 Line(1046) = {1046, 1047};
 Line(1047) = {1047, 1048};
 Line(1048) = {1048, 1049};
 Line(1049) = {1049, 1050};
 Line(1050) = {1050, 1051};
 Line(1051) = {1051, 1052};
 Line(1052) = {1052, 1053};
 Line(1053) = {1053, 1054};
 Line(1054) = {1054, 1055};
 Line(1055) = {1055, 1056};
 Line(1056) = {1056, 1057};
 Line(1057) = {1057, 1058};
 Line(1058) = {1058, 1059};
 Line(1059) = {1059, 1060};
 Line(1060) = {1060, 1061};
 Line(1061) = {1061, 1062};
 Line(1062) = {1062, 1063};
 Line(1063) = {1063, 1064};
 Line(1064) = {1064, 1065};
 Line(1065) = {1065, 1066};
 Line(1066) = {1066, 1067};
 Line(1067) = {1067, 1068};
 Line(1068) = {1068, 1069};
 Line(1069) = {1069, 7};
 
 
 Line Loop(1) = {130,165,-131,-128};
 Line Loop(2) = {135,166,-136,-165};
 Line Loop(3) = {-133,-132,-166,134,301,179,-145,-201,204,171,-141,-193,196,167,-139,-162,  1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069};
 //Line Loop(3) = {-133,-132,-166,134,301,179,-145,-201,204,171,208,173,-141,-193,196,167,-139,-162,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149};
 
 Line Loop(4) = {125,161,-137,-124};
 Line Loop(5) = {137,192,-138,-123};
 Line Loop(6) = {138,163,-121,-122};
 
 Line Loop(7) = {126,162,-189,-161};
 Line Loop(8) = {189,190,-191,-192};
 Line Loop(9) = {191,164,-120,-163};
 Line Loop(10) = {139,200,-140,-190};
 
 Line Loop(11) = {140,169,-119,-164};
 Line Loop(12) = {193,194,-195,-196};
 Line Loop(13) = {195,168,-197,-167};
 Line Loop(14) = {197,198,-199,-200};
 Line Loop(15) = {199,170,-118,-169};
 Line Loop(16) = {141,212,-142,-194};
 Line Loop(17) = {142,175,-143,-168};
 Line Loop(18) = {143,216,-144,-198};
 Line Loop(19) = {144,177,-117,-170};
 Line Loop(20) = {201,202,-203,-204};
 Line Loop(21) = {203,172,-209,-171};
 //Line Loop(22) = {205,206,-207,-208};
 //Line Loop(23) = {207,174,-209,-173};
 Line Loop(24) = {209,210,-211,-212};
 Line Loop(25) = {211,176,-213,-175};
 Line Loop(26) = {213,214,-215,-216};
 Line Loop(27) = {215,178,-116,-177};
 Line Loop(28) = {145,220,-146,-202};
 Line Loop(29) = {146,181,-149,-172};
 //Line Loop(30) = {147,224,-148,-206};
 //Line Loop(31) = {148,183,-149,-174};
 Line Loop(32) = {149,228,-150,-210};
 Line Loop(33) = {150,185,-151,-176};
 Line Loop(34) = {151,232,-152,-214};
 Line Loop(35) = {152,187,-115,-178};
 Line Loop(36) = {102,180,-217,-179};
 Line Loop(37) = {217,218,-219,-220};
 Line Loop(38) = {219,182,-225,-181};
 //Line Loop(39) = {221,222,-223,-224};
 //Line Loop(40) = {223,184,-225,-183};
 Line Loop(41) = {225,226,-227,-228};
 Line Loop(42) = {227,186,-229,-185};
 Line Loop(43) = {229,230,-231,-232};
 Line Loop(44) = {231,188,-114,-187};
 Line Loop(45) = {103,104,-153,-180};
 Line Loop(46) = {153,105,-154,-218};
 Line Loop(47) = {154,106,-157,-182};
 //Line Loop(48) = {155,107,-156,-222};
 //Line Loop(49) = {156,108,-157,-184};
 Line Loop(50) = {157,109,-158,-226};
 Line Loop(51) = {158,110,-159,-186};
 Line Loop(52) = {159,111,-160,-230};
 Line Loop(53) = {160,112,-113,-188};
 
 Plane Surface(1) = {1};
 Plane Surface(2) = {2};
 Plane Surface(3) = {3};
 Plane Surface(4) = {4};
 Plane Surface(5) = {5};
 Plane Surface(6) = {6};
 Plane Surface(7) = {7};
 Plane Surface(8) = {8};
 Plane Surface(9) = {9};
 Plane Surface(10) = {10};
 Plane Surface(11) = {11};
 Plane Surface(12) = {12};
 Plane Surface(13) = {13};
 Plane Surface(14) = {14};
 Plane Surface(15) = {15};
 Plane Surface(16) = {16};
 Plane Surface(17) = {17};
 Plane Surface(18) = {18};
 Plane Surface(19) = {19};
 Plane Surface(20) = {20};
 Plane Surface(21) = {21};
 Plane Surface(24) = {24};
 Plane Surface(25) = {25};
 Plane Surface(26) = {26};
 Plane Surface(27) = {27};
 Plane Surface(28) = {28};
 Plane Surface(29) = {29};
 Plane Surface(32) = {32};
 Plane Surface(33) = {33};
 Plane Surface(34) = {34};
 Plane Surface(35) = {35};
 Plane Surface(36) = {36};
 Plane Surface(37) = {37};
 Plane Surface(38) = {38};
 Plane Surface(41) = {41};
 Plane Surface(42) = {42};
 Plane Surface(43) = {43};
 Plane Surface(44) = {44};
 Plane Surface(45) = {45};
 Plane Surface(46) = {46};
 Plane Surface(47) = {47};
 Plane Surface(50) = {50};
 Plane Surface(51) = {51};
 Plane Surface(52) = {52};
 Plane Surface(53) = {53};
 
 
 Physical Surface("tri_0") = {3};
 
 Physical Surface("qdr_0") = {1};
 Physical Surface("qdr_1") = {6};
 Physical Surface("qdr_2") = {17};
 Physical Surface("qdr_3") = {19};
 Physical Surface("qdr_4") = {29};
 Physical Surface("qdr_5") = {33};
 Physical Surface("qdr_6") = {35};
 Physical Surface("qdr_7") = {45};
 Physical Surface("qdr_8") = {47};
 Physical Surface("qdr_9") = {51};
 Physical Surface("qdr_10") = {53};
 Physical Surface("qdr_11") = {11};
 Physical Surface("qdr_12") = {4};
 
 Physical Surface("mid_0") = {2};
 Physical Surface("mid_1") = {36};
 Physical Surface("mid_2") = {28};
 Physical Surface("mid_3") = {21};
 Physical Surface("mid_4") = {16};
 Physical Surface("mid_5") = {13};
 Physical Surface("mid_7") = {7};
 Physical Surface("mid_8") = {10};
 
 Physical Surface("q2q_1") = {18};
 Physical Surface("q2q_2") = {32};
 Physical Surface("q2q_3") = {34};
 Physical Surface("q2q_4") = {46};
 Physical Surface("q2q_5") = {50};
 Physical Surface("q2q_6") = {52};
 Physical Surface("q2q_7") = {15};
 Physical Surface("q2q_8") = {25};
 Physical Surface("q2q_9") = {27};
 Physical Surface("q2q_10") = {38};
 Physical Surface("q2q_11") = {42};
 Physical Surface("q2q_12") = {44};
 Physical Surface("q2q_13") = {9};
 Physical Surface("q2q_14") = {5};
 
 Physical Surface("rst_1") = {12};
 Physical Surface("rst_2") = {14};
 Physical Surface("rst_3") = {20};
 Physical Surface("rst_4") = {24};
 Physical Surface("rst_5") = {37};
 Physical Surface("rst_6") = {8};
 
 Physical Surface("rsq_1") = {26};
 Physical Surface("rsq_2") = {41};
 Physical Surface("rsq_3") = {43};
 
 Physical Line("inflow") = {128};
 Physical Line("outflow") = {104,105,106,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124};
 Physical Line("slipWall") = {301,102,103,130,131,135,136,132,133,134,125,126, 1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069};
 Physical Line("t2i") = {137,139,167,141,162,173,171,145,179,166};
 Physical Line("q2q") = {137,138,163,164,169,170,177,178,187,188,175,176,185,186,183,184,181,182, 143,144,147,148,149,150,151,152,153,154,155,156,157,158,159,160,  213,214,215,216,229,230,231,232,225,226,227,228,221,222,223,224};
 Physical Line("q2i") = {140,161,168,142,174,172,146,180,165,189,190,191,192,197,198,199,200,193,194,195,196,209,210,211,212,205,206,207,208,201,202,203,204,217,218,219,220};
 
 
 Transfinite Curve{130,131} = Nx0+1;
 Transfinite Curve{139,140,119} = Nx0b + 1;
 Transfinite Curve{141,142,143,144,117} = Nx1+1;
 Transfinite Curve{132} = Nx1*1+1;
 Transfinite Curve{133} = Nx1/4+1;
 Transfinite Curve{134} = Nx1*1 + Nx2+20;
 Transfinite Curve{145,146,147,148,149,150,151,152,115} = Nx2+1;
 Transfinite Curve{103,153,154,155,156,157,158,159,160,113} = Nx3+1;
 Transfinite Curve{121,137,138,125} = Nx4+1;
 Transfinite Curve{301} = 1+1;
 Transfinite Curve{125} = Nx4+1;
 
 //Transfinite Curve{137,138,119} = Nx4 + Nx0b + N0 +1;
 
 Transfinite Curve{179,180,104} = Ny0+1;
 Transfinite Curve{171,172,181,182,106} = Ny1+1;
 Transfinite Curve{128,165,166} = Ny2+1;
 Transfinite Curve{167,168,175,176,185,186,110} = Ny4+1;
 Transfinite Curve{122,163,164,169,170,177,178,187,188,112} = Ny5+1;
 Transfinite Curve{126,189,191,120,135,136,193,195,197,199,118,201,203,205,207,209,211,213,215,116,102,217,219,221,223,225,227,229,231,114,124,161,162,123,192,190,200,198,216,214,232,230,111,196,194,212,210,228,226,109,208,206,224,222,107,204,202,220,218,105} = N0+1;
 
 Transfinite Surface{1,2,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};
 Recombine Surface{1,2,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};
diff --git a/ConSol/Examples/HybridTest/DMR/DoubleMachReflection.geo b/ConSol/Examples/HybridTest/DMR/DoubleMachReflection.geo
deleted file mode 100644
index 018179d..0000000
--- a/ConSol/Examples/HybridTest/DMR/DoubleMachReflection.geo
+++ /dev/null
@@ -1,64 +0,0 @@
-// Variables
-boxdimX = 4;
-boxdimY = 1;
-h = 0.2;
-xs = 1/6;
-N = 10;
-sF = 3;
-gridsize = boxdimY/N;
-xs2 = xs + gridsize/sF;
-x3 = 3;
-
-// Points
-Point(1) = {0,0,0, gridsize};
-Point(2) = {boxdimX,0,0, gridsize};
-Point(3) = {boxdimX, boxdimY,0, gridsize};
-Point(4) = {0,boxdimY,0, gridsize};
-Point(5) = {xs,0,0, gridsize};
-Point(6) = {xs2,0,0, gridsize};
-Point(7) = {0,h,0, gridsize};
-Point(8) = {boxdimX,h,0, gridsize};
-Point(9) = {x3,0,0, gridsize};
-Point(10) = {x3,h,0, gridsize};
-Point(11) = {x3,boxdimY,0, gridsize};
-
-Line(12) = {1,5};
-Line(13) = {5,6};
-Line(14) = {6,9};
-Line(15) = {9,2};
-Line(16) = {2,8};
-Line(17) = {8,3};
-Line(18) = {3,11};
-Line(19) = {11,4};
-Line(20) = {4,7};
-Line(21) = {7,1};
-Line(22) = {9,10};
-Line(23) = {10,11};
-Line(24) = {10,7};
-
-Line Loop(17) = {12,13,14,22,24,21};
-Line Loop(18) = {-24,23,19,20};
-Line Loop(19) = {15,16,17,18,-23,-22};
-
-Plane Surface(20) = 17;
-Plane Surface(21) = 18;
-Plane Surface(22) = 19;
-Physical Surface("tri") = {20,21,22};
-Physical Line("inflow") = {12,20,21};
-Physical Line("outflow") = {16,17};
-Physical Line("slipWall") = {14,15};
-Physical Line("special") = {13};
-Physical Line("exact") = {18,19};
-
-Transfinite Line{12} = xs/gridsize*sF;
-Transfinite Line{13} = 1;
-Transfinite Line{14} = (x3-xs-gridsize)/gridsize*sF;
-Transfinite Line{15} = (boxdimX-x3)/gridsize Using Progression 1.1;
-Transfinite Line{22,21} = (h)/gridsize*sF;
-Transfinite Line{16} = (h)/gridsize/4;
-Transfinite Line{-20} = (boxdimY-h)/gridsize Using Progression 1.1;
-Transfinite Line{23,17} = (boxdimY-h)/gridsize Using Progression 1.1;
-Transfinite Line{17} = (boxdimY-h)/gridsize/4 Using Progression 1;
-Transfinite Line{18} = (boxdimX-x3)/gridsize/4;
-Transfinite Line{19} = (x3)/gridsize/4;
-Transfinite Line{24} = (x3)/gridsize*sF;
\ No newline at end of file
diff --git a/ConSol/Examples/HybridTest/DMR/DoubleMachReflection4.geo b/ConSol/Examples/HybridTest/DMR/DoubleMachReflection4.geo
index 3149633..0fb88e4 100644
--- a/ConSol/Examples/HybridTest/DMR/DoubleMachReflection4.geo
+++ b/ConSol/Examples/HybridTest/DMR/DoubleMachReflection4.geo
@@ -1,68 +1,68 @@
 // Variables
 boxdimX = 4;
 boxdimY = 1;
 h = 0.2;
 xs = 1/6;
-N = 60;
+N = 30;
 sF = 1;
 gridsize = boxdimY/N;
 xs2 = xs + gridsize/sF;
 x3 = 3;
 f = 6;
 // Points
 Point(1) = {0,0,0, gridsize};
 Point(2) = {boxdimX,0,0, gridsize*f};
 Point(3) = {boxdimX, boxdimY,0, gridsize*f};
 Point(4) = {0,boxdimY,0, gridsize*f};
 Point(5) = {xs,0,0, gridsize};
 Point(6) = {xs2,0,0, gridsize};
 Point(7) = {0,h,0, gridsize};
 Point(9) = {x3,0,0, gridsize};
 Point(10) = {x3,h,0, gridsize};
 Point(11) = {x3,boxdimY,0, gridsize*f};
 Point(12) = {boxdimX-h,0,0, gridsize*f/3};
 Point(13) = {0,boxdimY-h,0, gridsize*f/3};
 
 Line(12) = {1,5};
 Line(13) = {5,6};
 Line(14) = {6,9};
 Line(15) = {9,12};
 Line(16) = {2,3};
 Line(18) = {3,11};
 Line(19) = {11,4};
 Line(20) = {4,13};
 Line(21) = {7,1};
 Line(22) = {9,10};
 Line(24) = {10,7};
 Line(25) = {12,2};
 Line(26) = {13,7};
 
 Line Loop(17) = {12,13,14,22,24,21};
 Line Loop(19) = {15,25,16,18,19,20,26,-24,-22};
 
 Plane Surface(20) = 17;
 Plane Surface(22) = 19;
 Physical Surface("tri") = {20,21,22};
 Physical Line("inflow") = {12,20,21,26};
 Physical Line("outflow") = {16,17};
 Physical Line("slipWall") = {14,15,25};
 Physical Line("special") = {13};
 Physical Line("exact") = {18,19};
 
 /*Transfinite Line{12} = xs/gridsize*sF;
 Transfinite Line{13} = 1;
 Transfinite Line{14} = (x3-xs-gridsize)/gridsize*sF;
 Transfinite Line{15} = Ceil((boxdimX-x3)/gridsize/3) Using Progression 1.1;
 Transfinite Line{22,21} = (h)/gridsize*sF;
 //Transfinite Line{16} = (h)/gridsize/4;
 Transfinite Line{-20} = (boxdimY-h)/gridsize/3 Using Progression 1.1;
 //Transfinite Line{23} = (boxdimY-h)/gridsize/1.1 Using Progression 1.3;
 Transfinite Line{16} = (boxdimY-h)/gridsize/3 Using Progression 1;
 Transfinite Line{-18} = (boxdimX-x3)/gridsize/3 Using Progression 1.0;
 Transfinite Line{19} = (x3)/gridsize/4;
 Transfinite Line{24} = (x3)/gridsize*sF;*/
 
-Mesh.Smoothing = 100;
+Mesh.Smoothing = 10;
 Mesh.CrossFieldClosestPoint = 10;
 Mesh.SmoothNormals = 1;
 Mesh.SmoothRatio = 1;
\ No newline at end of file
diff --git a/ConSol/Examples/HybridTest/DMR/DoubleMachReflection_std.geo b/ConSol/Examples/HybridTest/DMR/DoubleMachReflection_std.geo
index 4fe9655..70caadd 100644
--- a/ConSol/Examples/HybridTest/DMR/DoubleMachReflection_std.geo
+++ b/ConSol/Examples/HybridTest/DMR/DoubleMachReflection_std.geo
@@ -1,49 +1,49 @@
 // Variables
 boxdimX = 4;
 boxdimY = 1;
 h = 0.2;
 xs = 1/6;
-N = 20;
+N = 60;
 sF = 1;
 gridsize = boxdimY/N;
 xs2 = xs + gridsize/sF;
 x3 = 3;
 f = 1;
 
 // Points
 Point(1) = {0,0,0, gridsize*f};
 Point(2) = {boxdimX,0,0, gridsize*f};
 Point(3) = {boxdimX, boxdimY,0, gridsize*f};
 Point(4) = {0,boxdimY,0, gridsize*f};
 Point(5) = {xs,0,0, gridsize*f};
 Point(6) = {xs2,0,0, gridsize*f};
 
 Line(12) = {1,5};
 Line(13) = {5,6};
 Line(14) = {6,2};
 Line(16) = {2,3};
 Line(18) = {3,4};
 Line(20) = {4,1};
 
 Line Loop(17) = {12,13,14,16,18,20};
 
 Plane Surface(20) = 17;
 Physical Surface("tri") = {20,21,22};
 Physical Line("inflow") = {12,20,21};
 Physical Line("outflow") = {16,17};
 Physical Line("slipWall") = {14,15};
 Physical Line("special") = {13};
 Physical Line("exact") = {18,19};
 
 //Transfinite Line{12} = xs/gridsize;
 //Transfinite Line{13} = 1;
 //Transfinite Line{14} = (boxdimX-xs-gridsize)/gridsize;
 //Transfinite Line{-20} = (boxdimY)/gridsize;
 //Transfinite Line{16} = (boxdimY-h)/gridsize/1 Using Progression 1;
 //Transfinite Line{-18} = (boxdimX)/gridsize;
 
 
-Mesh.Smoothing = 50;
+Mesh.Smoothing = 10;
 Mesh.CrossFieldClosestPoint = 60;
 Mesh.SmoothNormals = 1;
 Mesh.SmoothRatio = 1;
\ No newline at end of file
diff --git a/ConSol/Examples/HybridTest/Nozzle/nozzle1_bref.geo b/ConSol/Examples/HybridTest/Nozzle/nozzle1_bref.geo
index 20cd2f4..57c5db4 100644
--- a/ConSol/Examples/HybridTest/Nozzle/nozzle1_bref.geo
+++ b/ConSol/Examples/HybridTest/Nozzle/nozzle1_bref.geo
@@ -1,658 +1,664 @@
 // Variables
 Boxdim = 16.9;
 
 N = 2*28*2;
 M = N;
 N0 = 2;
 
 gridsizeX = 0.5;
 gridsizeY = 0.5;
 gridsizeXb = 0.499772727272727;
 
 If (gridsizeX < gridsizeY)
 	gridsize = gridsizeX;
 Else
 	gridsize = gridsizeY;
 EndIf
 gridsize = 3/2;
 
 D = 50;
 
 X0 = 0;
 X1 = 109.95;
 X2 = 152.8-9;
 X3 = 152.8;
 X4 = 203.51;
 X5 = 25*D;
 X6 = -5*D;
 
 Y0 = 0;
 Y1 = 25.0705074;
 Y2 = 25;
 Y3 = Y1+12.5;
 Y4 = 63.5;
 Y5 = 5*D;
 
 X101 = 154+2-4*gridsizeX;
 X102 = 112;
 X103 = 206-1*gridsizeX;
 X104 = 82;
 
 Y101 = 14+2-4*gridsizeX;
 Y102 = 46;
 Y103 = 63.5+N0*gridsizeY;
 Y104 = 54;
 
 Nx0 = 218;
 Nx0b = 224;
 
-Nx1 = 90-4;
-Nx2 = 98+4;
+Nx1 = 82;
+Nx2 = 101;
 //Nx3 = 20;
-Nx3 =2082+3;
+Nx3 =2087;
 //Nx4 = 23;
 Nx4 = 498;
 
 
-Ny0 = 32;
-Ny1 = 58+4;
+Ny0 = 28;
+Ny1 = 62;
 Ny2 = 25;
-Ny4 = 38;
+Ny4 = 35;
 //Ny5 = 14;
-Ny5 = 367;
+Ny5 = 369;
 
 
 // Points
 Point(1) = {X0,Y0,0, gridsize};
 Point(2) = {X4,Y0,0, gridsize};
 Point(222) = {X103,Y0,0, gridsize/2};
 Point(3) = {X1,Y1,0, gridsize};
 Point(4) = {X0,Y1,0, gridsize};
 Point(5) = {X0,Y3,0, gridsize};
 Point(6) = {X0,Y4,0, gridsize};
 Point(7) = {X3,Y2,0, gridsize};
 Point(8) = {X2,Y2,0, gridsize};
 Point(9) = {X1, Y3,0, gridsize};
 
 Point(10) = {X5, Y0, 0, gridsize};
 Point(11) = {X5, Y5, 0, gridsize};
 Point(12) = {X0, Y5,0, gridsize};
 Point(13) = {X6, Y5,0, gridsize};
 Point(14) = {X6, Y4,0, gridsize};
 
 
 Point(101) = {X103 +N0*gridsizeX,Y0,0, gridsize};
 
 Point(102) = {X5,Y101,0, gridsize};
 Point(103) = {X5,Y101+N0*gridsizeY,0, gridsize};
 Point(104) = {X5,Y2,0, gridsize};
 Point(105) = {X5,Y2+N0*gridsizeY, gridsize};
 Point(106) = {X5,Y102,0, gridsize};
 Point(107) = {X5,Y102+N0*gridsizeY,0, gridsize};
 Point(108) = {X5,Y103,0, gridsize};
 Point(109) = {X5,Y103+N0*gridsizeY,0, gridsize};
 Point(110) = {X103 +N0*gridsizeX,Y5,0, gridsize};
 Point(111) = {X103,Y5,0, gridsize};
 Point(112) = {X101+N0*gridsizeX,Y5,0, gridsize};
 Point(113) = {X101,Y5,0, gridsize};
 Point(114) = {X102 +N0*gridsizeX,Y5,0, gridsize};
 Point(115) = {X102,Y5,0, gridsize};
 Point(116) = {X0-N0*gridsizeX, Y5,0, gridsize};
 
 Point(117) = {X6,Y103+N0*gridsizeY,0, gridsize};
 Point(118) = {X6,Y103,0, gridsize};
 Point(119) = {X0-N0*gridsizeX,Y4,0, gridsize};
 
 Point(120) = {X1-N0*gridsizeXb,Y1,0, gridsize};
 Point(121) = {X1-N0*gridsizeXb, Y3,0, gridsize};
 
 Point(122) = {X101,Y101,0, gridsize};
 Point(123) = {X101 +N0*gridsizeX,Y101,0, gridsize};
 Point(124) = {X101 +N0*gridsizeX,Y101+N0*gridsizeY,0, gridsize};
 Point(125) = {X101,Y101+N0*gridsizeY,0, gridsize};
 
 Point(126) = {X103,Y101,0, gridsize};
 Point(127) = {X103 +N0*gridsizeX,Y101,0, gridsize};
 Point(128) = {X103 +N0*gridsizeX,Y101+N0*gridsizeY,0, gridsize};
 Point(129) = {X103,Y101+N0*gridsizeY,0, gridsize};
 
 
 Point(134) = {X103,Y2,0, gridsize};
 Point(135) = {X103 +N0*gridsizeX,Y2,0, gridsize};
 Point(136) = {X103 +N0*gridsizeX,Y2+N0*gridsizeY,0, gridsize};
 Point(137) = {X103,Y2+N0*gridsizeY,0, gridsize};
 
 Point(138) = {X102,Y102,0, gridsize};
 Point(139) = {X102 +N0*gridsizeX,Y102,0, gridsize};
 Point(140) = {X102 +N0*gridsizeX,Y102+N0*gridsizeY,0, gridsize};
 Point(141) = {X102,Y102+N0*gridsizeY,0, gridsize};
 
 Point(142) = {X101,Y102,0, gridsize};
 Point(143) = {X101 +N0*gridsizeX,Y102,0, gridsize};
 Point(144) = {X101 +N0*gridsizeX,Y102+N0*gridsizeY,0, gridsize};
 Point(145) = {X101,Y102+N0*gridsizeY,0, gridsize};
 
 Point(146) = {X103,Y102,0, gridsize};
 Point(147) = {X103 +N0*gridsizeX,Y102,0, gridsize};
 Point(148) = {X103 +N0*gridsizeX,Y102+N0*gridsizeY,0, gridsize};
 Point(149) = {X103,Y102+N0*gridsizeY,0, gridsize};
 
 Point(150) = {X0 - N0*gridsizeX,Y103,0, gridsize};
 Point(151) = {X0,Y103,0, gridsize};
 Point(152) = {X0 ,Y103+N0*gridsizeY,0, gridsize};
 Point(153) = {X0 - N0*gridsizeX,Y103+N0*gridsizeY,0, gridsize};
 
 
 Point(154) = {X102,Y103,0, gridsize};
 Point(155) = {X102 +N0*gridsizeX,Y103,0, gridsize};
 Point(156) = {X102 +N0*gridsizeX,Y103+N0*gridsizeY,0, gridsize};
 Point(157) = {X102,Y103+N0*gridsizeY,0, gridsize};
 
 Point(158) = {X101,Y103,0, gridsize};
 Point(159) = {X101 +N0*gridsizeX,Y103,0, gridsize};
 Point(160) = {X101 +N0*gridsizeX,Y103+N0*gridsizeY,0, gridsize};
 Point(161) = {X101,Y103+N0*gridsizeY,0, gridsize};
 
 Point(162) = {X103,Y103,0, gridsize};
 Point(163) = {X103 +N0*gridsizeX,Y103,0, gridsize};
 Point(164) = {X103 +N0*gridsizeX,Y103+N0*gridsizeY,0, gridsize};
 Point(165) = {X103,Y103+N0*gridsizeY,0, gridsize};
 
 Point(301) = {X104,Y104,0,gridsize};
 Point(302) = {X104+N0*gridsizeX,Y104,0,gridsize};
 Point(303) = {X104+N0*gridsizeX,Y104+N0*gridsizeY,0,gridsize};
 Point(304) = {X104,Y104+N0*gridsizeY,0,gridsize};
 
 Point(305) = {X104,Y103,0,gridsize};
 Point(306) = {X104+N0*gridsizeX,Y103,0,gridsize};
 Point(307) = {X104+N0*gridsizeX,Y103+N0*gridsizeY,0,gridsize};
 Point(308) = {X104,Y103+N0*gridsizeY,0,gridsize};
 
 Point(309) = {X104,Y5,0,gridsize};
 Point(310) = {X104+N0*gridsizeX,Y5,0,gridsize};
 
 Point(1002) = {2.30704, 63.4917, 0, gridsize};
 Point(1003) = {4.61396, 63.467, 0, gridsize};
 Point(1004) = {6.92065, 63.4257, 0, gridsize};
 Point(1005) = {9.22698, 63.368, 0, gridsize};
 Point(1006) = {11.5328, 63.2937, 0, gridsize};
 Point(1007) = {13.8381, 63.2029, 0, gridsize};
 Point(1008) = {16.1427, 63.0957, 0, gridsize};
 Point(1009) = {18.4464, 62.972, 0, gridsize};
 Point(1010) = {20.7492, 62.8318, 0, gridsize};
 Point(1011) = {23.0509, 62.6751, 0, gridsize};
 Point(1012) = {25.3515, 62.5019, 0, gridsize};
 Point(1013) = {27.6507, 62.3123, 0, gridsize};
 Point(1014) = {29.9486, 62.1063, 0, gridsize};
 Point(1015) = {32.2449, 61.8838, 0, gridsize};
 Point(1016) = {34.5395, 61.6449, 0, gridsize};
 Point(1017) = {36.8324, 61.3896, 0, gridsize};
 Point(1018) = {39.1234, 61.1179, 0, gridsize};
 Point(1019) = {41.4124, 60.8298, 0, gridsize};
 Point(1020) = {43.6993, 60.5253, 0, gridsize};
 Point(1021) = {45.9839, 60.2045, 0, gridsize};
 Point(1022) = {48.2662, 59.8674, 0, gridsize};
 Point(1023) = {50.546, 59.5139, 0, gridsize};
 Point(1024) = {52.8232, 59.1441, 0, gridsize};
 Point(1025) = {55.0978, 58.7581, 0, gridsize};
 Point(1026) = {57.3695, 58.3558, 0, gridsize};
 Point(1027) = {59.6382, 57.9372, 0, gridsize};
 Point(1028) = {61.9039, 57.5024, 0, gridsize};
 Point(1029) = {64.1665, 57.0514, 0, gridsize};
 Point(1030) = {66.4258, 56.5843, 0, gridsize};
 Point(1031) = {68.6816, 56.101, 0, gridsize};
 Point(1032) = {70.934, 55.6015, 0, gridsize};
 Point(1033) = {73.1827, 55.086, 0, gridsize};
 Point(1034) = {75.4277, 54.5544, 0, gridsize};
 Point(1035) = {77.6688, 54.0067, 0, gridsize};
 Point(1036) = {79.9059, 53.4431, 0, gridsize};
 Point(1037) = {82.1389, 52.8634, 0, gridsize};
 Point(1038) = {84.3678, 52.2678, 0, gridsize};
 Point(1039) = {86.5923, 51.6562, 0, gridsize};
 Point(1040) = {88.8124, 51.0288, 0, gridsize};
 Point(1041) = {91.0279, 50.3854, 0, gridsize};
 Point(1042) = {93.2388, 49.7263, 0, gridsize};
 Point(1043) = {95.4449, 49.0513, 0, gridsize};
 Point(1044) = {97.6462, 48.3606, 0, gridsize};
 Point(1045) = {99.8424, 47.6541, 0, gridsize};
 Point(1046) = {102.034, 46.932, 0, gridsize};
 Point(1047) = {104.219, 46.1942, 0, gridsize};
 Point(1048) = {106.4, 45.4407, 0, gridsize};
 Point(1049) = {108.575, 44.6717, 0, gridsize};
 Point(1050) = {110.745, 43.8872, 0, gridsize};
 Point(1051) = {112.909, 43.0871, 0, gridsize};
 Point(1052) = {115.067, 42.2716, 0, gridsize};
 Point(1053) = {117.219, 41.4407, 0, gridsize};
 Point(1054) = {119.365, 40.5944, 0, gridsize};
 Point(1055) = {121.505, 39.7327, 0, gridsize};
 Point(1056) = {123.639, 38.8558, 0, gridsize};
 Point(1057) = {125.767, 37.9636, 0, gridsize};
 Point(1058) = {127.888, 37.0563, 0, gridsize};
 Point(1059) = {130.002, 36.1337, 0, gridsize};
 Point(1060) = {132.11, 35.1961, 0, gridsize};
 Point(1061) = {134.211, 34.2434, 0, gridsize};
 Point(1062) = {136.306, 33.2757, 0, gridsize};
 Point(1063) = {138.393, 32.2931, 0, gridsize};
 Point(1064) = {140.473, 31.2955, 0, gridsize};
 Point(1065) = {142.546, 30.2831, 0, gridsize};
 Point(1066) = {144.612, 29.2559, 0, gridsize};
 Point(1067) = {146.67, 28.2139, 0, gridsize};
 Point(1068) = {148.721, 27.1572, 0, gridsize};
 Point(1069) = {150.764, 26.0859, 0, gridsize};
 
 
 //Lines
 
 Line(101) = {1,2};
 Line(102) = {222,101};
 Line(103) = {101,10};
 
 Line(104) = {10,102};
 Line(105) = {102,103};
 Line(106) = {103,106};
 //Line(107) = {104,105};
 //Line(108) = {105,106};
 Line(109) = {106,107};
 Line(110) = {107,108};
 Line(111) = {108,109};
 Line(112) = {109,11};
 
 Line(113) = {110,11};
 Line(114) = {111,110};
 Line(115) = {112,111};
 Line(116) = {113,112};
 Line(117) = {114,113};
 Line(118) = {115,114};
 Line(119) = {12,115};
 Line(120) = {116,12};
 Line(121) = {13,116};
 
 Line(122) = {117,13};
 Line(123) = {118,117};
 Line(124) = {14,118};
 
 Line(125) = {14,119};
 Line(126) = {119,6};
 
 Line(127) = {5,6};
 Line(128) = {4,5};
 Line(129) = {1,4};
 Line(130) = {4,120};
 Line(131) = {5,121};
 Line(132) = {9,8};
 Line(133) = {8,7};
 Line(134) = {3,2};
 Line(135) = {120,3};
 Line(136) = {121,9};
 
 //Line(137) = {118,154};
 Line(137) = {118,150};
 //Line(138) = {117,157};
 Line(138) = {117,153};
 Line(139) = {151,154};
 Line(140) = {152,157};
 
 Line(141) = {139,142};
 Line(142) = {140,145};
 Line(143) = {155,158};
 Line(144) = {156,161};
 
 Line(145) = {123,126};
 Line(146) = {124,129};
 //Line(147) = {131,134};
 //Line(148) = {132,137};
 Line(149) = {143,146};
 Line(150) = {144,149};
 Line(151) = {159,162};
 Line(152) = {160,165};
 
 Line(153) = {127,102};
 Line(154) = {128,103};
 //Line(155) = {135,104};
 //Line(156) = {136,105};
 Line(157) = {147,106};
 Line(158) = {148,107};
 Line(159) = {163,108};
 Line(160) = {164,109};
 
 Line(161) = {119,150};
 Line(162) = {6,151};
 Line(163) = {153,116};
 Line(164) = {152,12};
 
 Line(165) = {120,121};
 Line(166) = {3,9};
 Line(167) = {141,154};
 Line(168) = {140,155};
 Line(169) = {157,115};
 Line(170) = {156,114};
 
 Line(171) = {125,142};
 Line(172) = {124,143};
 //Line(173) = {133,142};
 //Line(174) = {132,143};
 Line(175) = {145,158};
 Line(176) = {144,159};
 Line(177) = {161,113};
 Line(178) = {160,112};
 
 Line(179) = {222,126};
 Line(180) = {101,127};
 Line(181) = {129,146};
 Line(182) = {128,147};
 //Line(183) = {137,146};
 //Line(184) = {136,147};
 Line(185) = {149,162};
 Line(186) = {148,163};
 Line(187) = {165,111};
 Line(188) = {164,110};
 
 Line(189) = {150,151};
 Line(190) = {151,152};
 Line(191) = {153,152};
 Line(192) = {150,153};
 
 Line(193) = {138,139};
 Line(194) = {139,140};
 Line(195) = {141,140};
 Line(196) = {138,141};
 
 Line(197) = {154,155};
 Line(198) = {155,156};
 Line(199) = {157,156};
 Line(200) = {154,157};
 
 Line(201) = {122,123};
 Line(202) = {123,124};
 Line(203) = {125,124};
 Line(204) = {122,125};
 
 //Line(205) = {130,131};
 //Line(206) = {131,132};
 //Line(207) = {133,132};
 //Line(208) = {130,133};
 
 Line(209) = {142,143};
 Line(210) = {143,144};
 Line(211) = {145,144};
 Line(212) = {142,145};
 
 Line(213) = {158,159};
 Line(214) = {159,160};
 Line(215) = {161,160};
 Line(216) = {158,161};
 
 Line(217) = {126,127};
 Line(218) = {127,128};
 Line(219) = {129,128};
 Line(220) = {126,129};
 
 //Line(221) = {134,135};
 //Line(222) = {135,136};
 //Line(223) = {137,136};
 //Line(224) = {134,137};
 
 Line(225) = {146,147};
 Line(226) = {147,148};
 Line(227) = {149,148};
 Line(228) = {146,149};
 
 Line(229) = {162,163};
 Line(230) = {163,164};
 Line(231) = {165,164};
 Line(232) = {162,165};
 
 Line(301) = {2,222};
 
 Line(1001) = {6, 1002};
 Line(1002) = {1002, 1003};
 Line(1003) = {1003, 1004};
 Line(1004) = {1004, 1005};
 Line(1005) = {1005, 1006};
 Line(1006) = {1006, 1007};
 Line(1007) = {1007, 1008};
 Line(1008) = {1008, 1009};
 Line(1009) = {1009, 1010};
 Line(1010) = {1010, 1011};
 Line(1011) = {1011, 1012};
 Line(1012) = {1012, 1013};
 Line(1013) = {1013, 1014};
 Line(1014) = {1014, 1015};
 Line(1015) = {1015, 1016};
 Line(1016) = {1016, 1017};
 Line(1017) = {1017, 1018};
 Line(1018) = {1018, 1019};
 Line(1019) = {1019, 1020};
 Line(1020) = {1020, 1021};
 Line(1021) = {1021, 1022};
 Line(1022) = {1022, 1023};
 Line(1023) = {1023, 1024};
 Line(1024) = {1024, 1025};
 Line(1025) = {1025, 1026};
 Line(1026) = {1026, 1027};
 Line(1027) = {1027, 1028};
 Line(1028) = {1028, 1029};
 Line(1029) = {1029, 1030};
 Line(1030) = {1030, 1031};
 Line(1031) = {1031, 1032};
 Line(1032) = {1032, 1033};
 Line(1033) = {1033, 1034};
 Line(1034) = {1034, 1035};
 Line(1035) = {1035, 1036};
 Line(1036) = {1036, 1037};
 Line(1037) = {1037, 1038};
 Line(1038) = {1038, 1039};
 Line(1039) = {1039, 1040};
 Line(1040) = {1040, 1041};
 Line(1041) = {1041, 1042};
 Line(1042) = {1042, 1043};
 Line(1043) = {1043, 1044};
 Line(1044) = {1044, 1045};
 Line(1045) = {1045, 1046};
 Line(1046) = {1046, 1047};
 Line(1047) = {1047, 1048};
 Line(1048) = {1048, 1049};
 Line(1049) = {1049, 1050};
 Line(1050) = {1050, 1051};
 Line(1051) = {1051, 1052};
 Line(1052) = {1052, 1053};
 Line(1053) = {1053, 1054};
 Line(1054) = {1054, 1055};
 Line(1055) = {1055, 1056};
 Line(1056) = {1056, 1057};
 Line(1057) = {1057, 1058};
 Line(1058) = {1058, 1059};
 Line(1059) = {1059, 1060};
 Line(1060) = {1060, 1061};
 Line(1061) = {1061, 1062};
 Line(1062) = {1062, 1063};
 Line(1063) = {1063, 1064};
 Line(1064) = {1064, 1065};
 Line(1065) = {1065, 1066};
 Line(1066) = {1066, 1067};
 Line(1067) = {1067, 1068};
 Line(1068) = {1068, 1069};
 Line(1069) = {1069, 7};
 
 
 Line Loop(1) = {130,165,-131,-128};
 Line Loop(2) = {135,166,-136,-165};
 Line Loop(3) = {-133,-132,-166,134,301,179,-145,-201,204,171,-141,-193,196,167,-139,-162,  1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069};
 //Line Loop(3) = {-133,-132,-166,134,301,179,-145,-201,204,171,208,173,-141,-193,196,167,-139,-162,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149};
 
 Line Loop(4) = {125,161,-137,-124};
 Line Loop(5) = {137,192,-138,-123};
 Line Loop(6) = {138,163,-121,-122};
 
 Line Loop(7) = {126,162,-189,-161};
 Line Loop(8) = {189,190,-191,-192};
 Line Loop(9) = {191,164,-120,-163};
 Line Loop(10) = {139,200,-140,-190};
 
 Line Loop(11) = {140,169,-119,-164};
 Line Loop(12) = {193,194,-195,-196};
 Line Loop(13) = {195,168,-197,-167};
 Line Loop(14) = {197,198,-199,-200};
 Line Loop(15) = {199,170,-118,-169};
 Line Loop(16) = {141,212,-142,-194};
 Line Loop(17) = {142,175,-143,-168};
 Line Loop(18) = {143,216,-144,-198};
 Line Loop(19) = {144,177,-117,-170};
 Line Loop(20) = {201,202,-203,-204};
 Line Loop(21) = {203,172,-209,-171};
 //Line Loop(22) = {205,206,-207,-208};
 //Line Loop(23) = {207,174,-209,-173};
 Line Loop(24) = {209,210,-211,-212};
 Line Loop(25) = {211,176,-213,-175};
 Line Loop(26) = {213,214,-215,-216};
 Line Loop(27) = {215,178,-116,-177};
 Line Loop(28) = {145,220,-146,-202};
 Line Loop(29) = {146,181,-149,-172};
 //Line Loop(30) = {147,224,-148,-206};
 //Line Loop(31) = {148,183,-149,-174};
 Line Loop(32) = {149,228,-150,-210};
 Line Loop(33) = {150,185,-151,-176};
 Line Loop(34) = {151,232,-152,-214};
 Line Loop(35) = {152,187,-115,-178};
 Line Loop(36) = {102,180,-217,-179};
 Line Loop(37) = {217,218,-219,-220};
 Line Loop(38) = {219,182,-225,-181};
 //Line Loop(39) = {221,222,-223,-224};
 //Line Loop(40) = {223,184,-225,-183};
 Line Loop(41) = {225,226,-227,-228};
 Line Loop(42) = {227,186,-229,-185};
 Line Loop(43) = {229,230,-231,-232};
 Line Loop(44) = {231,188,-114,-187};
 Line Loop(45) = {103,104,-153,-180};
 Line Loop(46) = {153,105,-154,-218};
 Line Loop(47) = {154,106,-157,-182};
 //Line Loop(48) = {155,107,-156,-222};
 //Line Loop(49) = {156,108,-157,-184};
 Line Loop(50) = {157,109,-158,-226};
 Line Loop(51) = {158,110,-159,-186};
 Line Loop(52) = {159,111,-160,-230};
 Line Loop(53) = {160,112,-113,-188};
 
 Plane Surface(1) = {1};
 Plane Surface(2) = {2};
 Plane Surface(3) = {3};
 Plane Surface(4) = {4};
 Plane Surface(5) = {5};
 Plane Surface(6) = {6};
 Plane Surface(7) = {7};
 Plane Surface(8) = {8};
 Plane Surface(9) = {9};
 Plane Surface(10) = {10};
 Plane Surface(11) = {11};
 Plane Surface(12) = {12};
 Plane Surface(13) = {13};
 Plane Surface(14) = {14};
 Plane Surface(15) = {15};
 Plane Surface(16) = {16};
 Plane Surface(17) = {17};
 Plane Surface(18) = {18};
 Plane Surface(19) = {19};
 Plane Surface(20) = {20};
 Plane Surface(21) = {21};
 Plane Surface(24) = {24};
 Plane Surface(25) = {25};
 Plane Surface(26) = {26};
 Plane Surface(27) = {27};
 Plane Surface(28) = {28};
 Plane Surface(29) = {29};
 Plane Surface(32) = {32};
 Plane Surface(33) = {33};
 Plane Surface(34) = {34};
 Plane Surface(35) = {35};
 Plane Surface(36) = {36};
 Plane Surface(37) = {37};
 Plane Surface(38) = {38};
 Plane Surface(41) = {41};
 Plane Surface(42) = {42};
 Plane Surface(43) = {43};
 Plane Surface(44) = {44};
 Plane Surface(45) = {45};
 Plane Surface(46) = {46};
 Plane Surface(47) = {47};
 Plane Surface(50) = {50};
 Plane Surface(51) = {51};
 Plane Surface(52) = {52};
 Plane Surface(53) = {53};
 
 
 Physical Surface("tri_0") = {3};
 
 Physical Surface("qdr_0") = {1};
 Physical Surface("qdr_1") = {6};
 Physical Surface("qdr_2") = {17};
 Physical Surface("qdr_3") = {19};
 Physical Surface("qdr_4") = {29};
 Physical Surface("qdr_5") = {33};
 Physical Surface("qdr_6") = {35};
 Physical Surface("qdr_7") = {45};
 Physical Surface("qdr_8") = {47};
 Physical Surface("qdr_9") = {51};
 Physical Surface("qdr_10") = {53};
+Physical Surface("qdr_11") = {11};
+Physical Surface("qdr_12") = {4};
 
 Physical Surface("mid_0") = {2};
 Physical Surface("mid_1") = {36};
 Physical Surface("mid_2") = {28};
 Physical Surface("mid_3") = {21};
 Physical Surface("mid_4") = {16};
 Physical Surface("mid_5") = {13};
-Physical Surface("mid_6") = {5};
+Physical Surface("mid_7") = {7};
+Physical Surface("mid_8") = {10};
 
 Physical Surface("q2q_1") = {18};
 Physical Surface("q2q_2") = {32};
 Physical Surface("q2q_3") = {34};
 Physical Surface("q2q_4") = {46};
 Physical Surface("q2q_5") = {50};
 Physical Surface("q2q_6") = {52};
 Physical Surface("q2q_7") = {15};
 Physical Surface("q2q_8") = {25};
 Physical Surface("q2q_9") = {27};
 Physical Surface("q2q_10") = {38};
 Physical Surface("q2q_11") = {42};
 Physical Surface("q2q_12") = {44};
+Physical Surface("q2q_13") = {9};
+Physical Surface("q2q_14") = {5};
 
 Physical Surface("rst_1") = {12};
 Physical Surface("rst_2") = {14};
 Physical Surface("rst_3") = {20};
 Physical Surface("rst_4") = {24};
 Physical Surface("rst_5") = {37};
+Physical Surface("rst_6") = {8};
 
 Physical Surface("rsq_1") = {26};
 Physical Surface("rsq_2") = {41};
 Physical Surface("rsq_3") = {43};
 
 Physical Line("inflow") = {128};
 Physical Line("outflow") = {104,105,106,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124};
 Physical Line("slipWall") = {301,102,103,130,131,135,136,132,133,134,125,126, 1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069};
 Physical Line("t2i") = {137,139,167,141,162,173,171,145,179,166};
 Physical Line("q2q") = {137,138,163,164,169,170,177,178,187,188,175,176,185,186,183,184,181,182, 143,144,147,148,149,150,151,152,153,154,155,156,157,158,159,160,  213,214,215,216,229,230,231,232,225,226,227,228,221,222,223,224};
 Physical Line("q2i") = {140,161,168,142,174,172,146,180,165,189,190,191,192,197,198,199,200,193,194,195,196,209,210,211,212,205,206,207,208,201,202,203,204,217,218,219,220};
 
 
 Transfinite Curve{130,131} = Nx0+1;
 Transfinite Curve{139,140,119} = Nx0b + 1;
 Transfinite Curve{141,142,143,144,117} = Nx1+1;
 Transfinite Curve{132} = Nx1*1+1;
 Transfinite Curve{133} = Nx1/4+1;
 Transfinite Curve{134} = Nx1*1 + Nx2+20;
 Transfinite Curve{145,146,147,148,149,150,151,152,115} = Nx2+1;
 Transfinite Curve{103,153,154,155,156,157,158,159,160,113} = Nx3+1;
 Transfinite Curve{121,137,138,125} = Nx4+1;
 Transfinite Curve{301} = 4+1;
 Transfinite Curve{125} = Nx4+1;
 
 //Transfinite Curve{137,138,119} = Nx4 + Nx0b + N0 +1;
 
 Transfinite Curve{179,180,104} = Ny0+1;
 Transfinite Curve{171,172,181,182,106} = Ny1+1;
 Transfinite Curve{128,165,166} = Ny2+1;
 Transfinite Curve{167,168,175,176,185,186,110} = Ny4+1;
 Transfinite Curve{122,163,164,169,170,177,178,187,188,112} = Ny5+1;
 Transfinite Curve{126,189,191,120,135,136,193,195,197,199,118,201,203,205,207,209,211,213,215,116,102,217,219,221,223,225,227,229,231,114,124,161,162,123,192,190,200,198,216,214,232,230,111,196,194,212,210,228,226,109,208,206,224,222,107,204,202,220,218,105} = N0+1;
 
 Transfinite Surface{1,2,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};
 Recombine Surface{1,2,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};
diff --git a/ConSol/Examples/HybridTest/ShockVortex/shockVortex.geo b/ConSol/Examples/HybridTest/ShockVortex/shockVortex.geo
index 5eb3b02..d1383d0 100644
--- a/ConSol/Examples/HybridTest/ShockVortex/shockVortex.geo
+++ b/ConSol/Examples/HybridTest/ShockVortex/shockVortex.geo
@@ -1,52 +1,52 @@
 // Variables
 boxdim = 1;
-N = 2*32+1;
+N = 2*5+1;
 N0 = 2;
 gridsize = boxdim/(N-1);
 
 // Points
 Point(1) = {0,0,0, gridsize};
 Point(2) = {boxdim,0,0, gridsize*3};
 Point(3) = {boxdim, boxdim,0, gridsize*3};
 Point(4) = {0,boxdim,0, gridsize};
 Point(5) = {boxdim/2,0,0, gridsize};
 Point(6) = {boxdim/2,boxdim,0, gridsize};
 Point(7) = {boxdim/2-N0*gridsize,0,0, gridsize};
 Point(8) = {boxdim/2-N0*gridsize, boxdim,0, gridsize};
 
 Line(1) = {1,7};
 Line(2) = {7,5};
 Line(3) = {5,2};
 Line(4) = {2,3};
 Line(5) = {3,6};
 Line(6) = {6,8};
 Line(7) = {8,4};
 Line(8) = {4,1};
 Line(9) = {8,7};
 Line(10) = {6,5};
 
 
 Line Loop(1) = {1,-9,7,8};
 Line Loop(2) = {2,-10,6,9};
 Line Loop(3) = {3,4,5,10};
 
 Plane Surface(1) = {1};
 Plane Surface(2) = {2};
 Plane Surface(3) = {3};
 
 Physical Surface("tri_0") = {3};
 Physical Surface("qdr_0") = {1};
 Physical Surface("mid_0") = {2};
 
 Physical Line("inflow") = {8};
 Physical Line("outflow") = {4};
 Physical Line("slipWall") = {1,2,3,5,6,7};
 Physical Line("q2i") = {9};
 Physical Line("t2i") = {10};
 
 Transfinite Curve{1,7} = (N-1)/2+1 - N0;
 Transfinite Curve{2,6} = N0+1;
 //Transfinite Curve{3,5} = (N-1)/2+1;
 Transfinite Curve{8,9,10} = (N);
 Transfinite Surface{1,2};
 Recombine Surface{1,2};
diff --git a/ConSol/Examples/HybridTest/ShockVortex/shockVortex2QUADsmall.geo b/ConSol/Examples/HybridTest/ShockVortex/shockVortex2QUADsmall.geo
index bc9cf40..205dd8e 100644
--- a/ConSol/Examples/HybridTest/ShockVortex/shockVortex2QUADsmall.geo
+++ b/ConSol/Examples/HybridTest/ShockVortex/shockVortex2QUADsmall.geo
@@ -1,70 +1,70 @@
 // Variables
 boxdim = 1;
-N = 2*25+1;
+N = 2*8+1;
 N0 = 2;
 gridsize = boxdim/(N-1);
 
 // Points
 Point(1) = {0,0,0, gridsize};
 Point(2) = {boxdim,0,0, gridsize*3};
 Point(3) = {boxdim, boxdim,0, gridsize*3};
 Point(4) = {0, boxdim,0, gridsize};
 // first line	
 Point(5) = {boxdim/2,0,0, gridsize};
 Point(6) = {boxdim/2, boxdim,0, gridsize};
 Point(7) = {boxdim/2-N0*gridsize,0,0, gridsize};
 Point(8) = {boxdim/2-N0*gridsize, boxdim,0, gridsize};
 // second line
 Point(9) = {boxdim*5/8,0,0, gridsize};
 Point(10) = {boxdim*5/8,1,0, gridsize};
 Point(11) = {boxdim*5/8+N0*gridsize,0,0, gridsize};
 Point(12) = {boxdim*5/8+N0*gridsize, 1,0, gridsize};
 
 
 Line(1) = {1,7};
 Line(2) = {7,5};
 Line(3) = {5,9};
 Line(4) = {9,11};
 Line(5) = {11,2};
 Line(6) = {2,3};
 Line(7) = {3,12};
 Line(8) = {12,10};
 Line(9) = {10,6};
 Line(10) = {6,8};
 Line(11) = {8,4};
 Line(12) = {4,1};
 Line(13) = {8,7};
 Line(14) = {6,5};
 Line(15) = {10,9};
 Line(16) = {12,11};
 
 Line Loop(1) = {1,-13,11,12};
 Line Loop(2) = {2,-14,10,13};
 Line Loop(3) = {3,-15,9,14};
 Line Loop(4) = {4,-16,8,15};
 Line Loop(5) = {5,6,7,16};
 
 Plane Surface(1) = {1};
 Plane Surface(2) = {2};
 Plane Surface(3) = {3};
 Plane Surface(4) = {4};
 Plane Surface(5) = {5};
 
 Physical Surface("tri_0") = {3};
 Physical Surface("qdr_0") = {1};
 Physical Surface("mid_0") = {2};
 Physical Surface("qdr_1") = {5};
 Physical Surface("mid_1") = {4};
 
 Physical Line("inflow") = {12};
 Physical Line("outflow") = {6};
 Physical Line("slipWall") = {1,2,3,4,5,7,8,9,10,11};
 Physical Line("q2i") = {13,16};
 Physical Line("t2i") = {14,15};
 
 Transfinite Curve{1,11} = (N-1)/2+1 - N0;
 Transfinite Curve{5,7} = (N-1)/2+1 - N0 - (N-1)/8;
 Transfinite Curve{2,10,4,8} = N0+1;
 Transfinite Curve{12,13,14,15,16,6} = (N);
 Transfinite Surface{1,2,4,5};
 Recombine Surface{1,2,4,5};
diff --git a/ConSol/Examples/HybridTest/ShockVortex/shockVortex3.geo b/ConSol/Examples/HybridTest/ShockVortex/shockVortex3.geo
index c44c9e7..a6834db 100644
--- a/ConSol/Examples/HybridTest/ShockVortex/shockVortex3.geo
+++ b/ConSol/Examples/HybridTest/ShockVortex/shockVortex3.geo
@@ -1,26 +1,26 @@
 // Variables
 boxdim = 1;
-N = 3;
+N = 80;
 gridsize = boxdim/N;
 
 // Points
 Point(1) = {0,0,0, gridsize};
 Point(2) = {boxdim,0,0, gridsize};
 Point(3) = {boxdim, boxdim,0, gridsize};
 Point(4) = {0,boxdim,0, gridsize};
 
 Line(7) = {1,2};
 Line(8) = {2,3};
 Line(9) = {3,4};
 Line(10) = {4,1};
 
 Line Loop(14) = {7,8,9,10};
 
 Plane Surface(16) = 14;
 Physical Surface("tri") = {16};
 Physical Line("inflow") = {10};
 Physical Line("outflow") = {8};
 Physical Line("slipWall") = {7,9};
 //Physical Line("outflow2") = {9};
 
 Transfinite Line{7,8,9,10} = boxdim/gridsize;
diff --git a/ConSol/Examples/HybridTest/ShockVortex/shockVortex3QUAD.geo b/ConSol/Examples/HybridTest/ShockVortex/shockVortex3QUAD.geo
index 3206f8f..f34361b 100644
--- a/ConSol/Examples/HybridTest/ShockVortex/shockVortex3QUAD.geo
+++ b/ConSol/Examples/HybridTest/ShockVortex/shockVortex3QUAD.geo
@@ -1,94 +1,94 @@
 // Variables
 boxdim = 1;
-N = 2*50+1;
+N = 2*16+1;
 N0 = 2;
 gridsize = boxdim/(N-1);
 
 // Points
 Point(1) = {0,0,0, gridsize};
 Point(2) = {boxdim,0,0, gridsize*3};
 Point(3) = {boxdim, boxdim,0, gridsize*3};
 Point(4) = {0,boxdim,0, gridsize};
 Point(5) = {boxdim/2,0,0, gridsize};
 Point(6) = {boxdim/2,boxdim,0, gridsize};
 Point(7) = {boxdim/2-N0*gridsize,0,0, gridsize};
 Point(8) = {boxdim/2-N0*gridsize, boxdim,0, gridsize};
 
 Point(11) = {0, boxdim/2,0, gridsize};
 Point(12) = {boxdim, boxdim/2,0, gridsize};
 Point(9) = {0, boxdim/2-N0*gridsize,0, gridsize};
 Point(10) = {boxdim, boxdim/2-N0*gridsize,0, gridsize};
 
 Point(13) = {boxdim/2-N0*gridsize,boxdim/2-N0*gridsize,0, gridsize};
 Point(14) = {boxdim/2, boxdim/2-N0*gridsize,0, gridsize};
 Point(15) = {boxdim/2, boxdim/2,0, gridsize};
 Point(16) = {boxdim/2-N0*gridsize,boxdim/2,0, gridsize};
 
 Line(1) = {1,7};
 Line(2) = {7,5};
 Line(3) = {5,2};
 Line(4) = {2,10};
 Line(5) = {10,12};
 Line(6) = {12,3};
 Line(7) = {3,6};
 Line(8) = {6,8};
 Line(9) = {8,4};
 Line(10) = {4,11};
 Line(11) = {11,9};
 Line(12) = {9,1};
 Line(13) = {7,13};
 Line(14) = {5,14};
 Line(15) = {10,14};
 Line(16) = {12,15};
 Line(17) = {6,15};
 Line(18) = {8,16};
 Line(19) = {11,16};
 Line(20) = {9,13};
 Line(21) = {13,14};
 Line(22) = {14,15};
 Line(23) = {15,16};
 Line(24) = {16,13};
 
 
 Line Loop(1) = {1,13,-20,12};
 Line Loop(2) = {2,14,-21,-13};
 Line Loop(3) = {3,4,15,-14};
 Line Loop(4) = {5,16,-22,-15};
 Line Loop(5) = {6,7,17,-16};
 Line Loop(6) = {8,18,-23,-17};
 Line Loop(7) = {9,10,19,-18};
 Line Loop(8) = {11,20,-24,-19};
 Line Loop(9) = {21,22,23,24};
 
 Plane Surface(1) = {1};
 Plane Surface(2) = {2};
 Plane Surface(3) = {3};
 Plane Surface(4) = {4};
 Plane Surface(5) = {5};
 Plane Surface(6) = {6};
 Plane Surface(7) = {7};
 Plane Surface(8) = {8};
 Plane Surface(9) = {9};
 
 Physical Surface("tri_0") = {5};
 Physical Surface("qdr_0") = {1};
 Physical Surface("qdr_1") = {3};
 Physical Surface("qdr_2") = {7};
 Physical Surface("mid_0") = {6};
 Physical Surface("mid_1") = {4};
 Physical Surface("q2q_0") = {2};
 Physical Surface("q2q_1") = {8};
 Physical Surface("rst_1") = {9};
 
 Physical Line("inflow") = {10,11,12};
 Physical Line("outflow") = {4,5,6};
 Physical Line("slipWall") = {1,2,3,7,8,9};
 Physical Line("q2i") = {15,18,21,22,23,24};
 Physical Line("t2i") = {16, 17};
 Physical Line("q2q") = {13,14,19,20};
 
 Transfinite Curve{1,20,19,9,12,13,14,4} = (N-1)/2+1 - N0;
 Transfinite Curve{2,21,23,8,11,24,22,5} = N0+1;
 Transfinite Curve{3,15,16,7,10,18,17,6} = ((N+1)/2);
 Transfinite Surface{1,2,4,3,6,7,8,9};
 Recombine Surface{1,2,4,3,6,7,8,9};
diff --git a/ConSol/Examples/HybridTest/ShockVortex/shockVortex8QUAD.geo b/ConSol/Examples/HybridTest/ShockVortex/shockVortex8QUAD.geo
index 772475a..8853c82 100644
--- a/ConSol/Examples/HybridTest/ShockVortex/shockVortex8QUAD.geo
+++ b/ConSol/Examples/HybridTest/ShockVortex/shockVortex8QUAD.geo
@@ -1,204 +1,230 @@
 // Variables
 boxdim = 1;
-N = 2*28*2+1;
+N = 2*3*2+1;
 N0 = 2;
 gridsize = boxdim/(N-1);
-
+X0 = 0;
+X1 = boxdim/3;
+X2 = boxdim*2/3;
+X3 = boxdim;
+
+Y0 = 0;
+Y1 = boxdim/3;
+Y2 = boxdim*2/3;
+Y3 = boxdim;
+
+/*Nx1 = (N-1)/3+1 - N0;
+Nx2 = ((N-1)/3) + 1;
+Nx3 = Nx1;
+Ny1 = (N-1)/3+1 - N0;
+Ny2 = ((N-1)/3) + 1;
+Ny3 = Ny1;*/
+
+Nx1 = (N-1)*(X1-X0)/(X3-X0)+1 - N0;
+Nx2 = ((N-1)*(X2-X1)/(X3-X0)) + 1;
+Nx3 = (N-1)*(X3-X2)/(X3-X0)+1 - N0;
+Ny1 = (N-1)*(Y1-Y0)/(Y3-Y0)+1 - N0;
+Ny2 = ((N-1)*(Y2-Y1)/(Y3-Y0)) + 1;
+Ny3 = (N-1)*(Y3-Y2)/(Y3-Y0)+1 - N0;
 // Points
-Point(1) = {0,0,0, gridsize};
-Point(2) = {boxdim,0,0, gridsize*3};
-Point(3) = {boxdim, boxdim,0, gridsize*3};
-Point(4) = {0,boxdim,0, gridsize};
-
-Point(5) = {boxdim/3-N0*gridsize,0,0, gridsize};
-Point(6) = {boxdim/3,0,0, gridsize};
-Point(7) = {boxdim*2/3,0,0, gridsize};
-Point(8) = {boxdim*2/3+N0*gridsize,0,0, gridsize};
-
-Point(9) = {boxdim, boxdim/3-N0*gridsize,0, gridsize};
-Point(10) = {boxdim, boxdim/3,0, gridsize};
-Point(11) = {boxdim, boxdim*2/3,0, gridsize};
-Point(12) = {boxdim, boxdim*2/3+N0*gridsize,0, gridsize};
-
-Point(13) = {boxdim*2/3+N0*gridsize,boxdim,0, gridsize};
-Point(14) = {boxdim*2/3,boxdim,0, gridsize};
-Point(15) = {boxdim/3,boxdim,0, gridsize};
-Point(16) = {boxdim/3-N0*gridsize,boxdim,0, gridsize};
-
-Point(17) = {0, boxdim*2/3+N0*gridsize,0, gridsize};
-Point(18) = {0, boxdim*2/3,0, gridsize};
-Point(19) = {0, boxdim/3,0, gridsize};
-Point(20) = {0, boxdim/3-N0*gridsize,0, gridsize};
-
-Point(21) = {boxdim/3-N0*gridsize,boxdim/3-N0*gridsize,0, gridsize};
-Point(22) = {boxdim/3,boxdim/3-N0*gridsize,0, gridsize};
-Point(23) = {boxdim/3,boxdim/3,0, gridsize};
-Point(24) = {boxdim/3-N0*gridsize,boxdim/3,0, gridsize};
-
-Point(25) = {boxdim*2/3,boxdim/3-N0*gridsize,0, gridsize};
-Point(26) = {boxdim*2/3+N0*gridsize,boxdim/3-N0*gridsize,0, gridsize};
-Point(27) = {boxdim*2/3+N0*gridsize,boxdim/3,0, gridsize};
-Point(28) = {boxdim*2/3,boxdim/3,0, gridsize};
-
-Point(29) = {boxdim*2/3,boxdim*2/3,0, gridsize};
-Point(30) = {boxdim*2/3+N0*gridsize,boxdim*2/3,0, gridsize};
-Point(31) = {boxdim*2/3+N0*gridsize,boxdim*2/3+N0*gridsize,0, gridsize};
-Point(32) = {boxdim*2/3,boxdim*2/3+N0*gridsize,0, gridsize};
-
-Point(33) = {boxdim/3-N0*gridsize,boxdim*2/3,0, gridsize};
-Point(34) = {boxdim/3,boxdim*2/3,0, gridsize};
-Point(35) = {boxdim/3,boxdim*2/3+N0*gridsize,0, gridsize};
-Point(36) = {boxdim/3-N0*gridsize,boxdim*2/3+N0*gridsize,0, gridsize};
+Point(1) = {X0,Y0,0, gridsize};
+Point(2) = {X3,Y0,0, gridsize*3};
+Point(3) = {X3,Y3,0, gridsize*3};
+Point(4) = {X0,Y3,0, gridsize};
+
+Point(5) = {X1-N0*gridsize,Y0,0, gridsize};
+Point(6) = {X1,Y0,0, gridsize};
+Point(7) = {X2,Y0,0, gridsize};
+Point(8) = {X2+N0*gridsize,Y0,0, gridsize};
+
+Point(9) = {X3, Y1-N0*gridsize,0, gridsize};
+Point(10) = {X3, Y1,0, gridsize};
+Point(11) = {X3, Y2,0, gridsize};
+Point(12) = {X3, Y2+N0*gridsize,0, gridsize};
+
+Point(13) = {X2+N0*gridsize,Y3,0, gridsize};
+Point(14) = {X2,boxdim,Y0, gridsize};
+Point(15) = {X1,boxdim,Y0, gridsize};
+Point(16) = {X1-N0*gridsize,Y3,0, gridsize};
+
+Point(17) = {X0, Y2+N0*gridsize,0, gridsize};
+Point(18) = {X0, Y2,0, gridsize};
+Point(19) = {X0, Y1,0, gridsize};
+Point(20) = {X0, Y1-N0*gridsize,0, gridsize};
+
+Point(21) = {X1-N0*gridsize,Y1-N0*gridsize,0, gridsize};
+Point(22) = {X1,Y1-N0*gridsize,0, gridsize};
+Point(23) = {X1,Y1,0, gridsize};
+Point(24) = {X1-N0*gridsize,Y1,0, gridsize};
+
+Point(25) = {X2,Y1-N0*gridsize,0, gridsize};
+Point(26) = {X2+N0*gridsize,Y1-N0*gridsize,0, gridsize};
+Point(27) = {X2+N0*gridsize,Y1,0, gridsize};
+Point(28) = {X2,Y1,0, gridsize};
+
+Point(29) = {X2,Y2,0, gridsize};
+Point(30) = {X2+N0*gridsize,Y2,0, gridsize};
+Point(31) = {X2+N0*gridsize,Y2+N0*gridsize,0, gridsize};
+Point(32) = {X2,Y2+N0*gridsize,0, gridsize};
+
+Point(33) = {X1-N0*gridsize,Y2,0, gridsize};
+Point(34) = {X1,Y2,0, gridsize};
+Point(35) = {X1,Y2+N0*gridsize,0, gridsize};
+Point(36) = {X1-N0*gridsize,Y2+N0*gridsize,0, gridsize};
 
 
 Line(1) = {1,5};
 Line(2) = {5,6};
 Line(3) = {6,7};
 Line(4) = {7,8};
 Line(5) = {8,2};
 Line(6) = {2,9};
 Line(7) = {9,10};
 Line(8) = {10,11};
 Line(9) = {11,12};
 Line(10) = {12,3};
 Line(11) = {13,3};
 Line(12) = {14,13};
 Line(13) = {15,14};
 Line(14) = {16,15};
 Line(15) = {4,16};
 Line(16) = {17,4};
 Line(17) = {18,17};
 Line(18) = {19,18};
 Line(19) = {20,19};
 Line(20) = {1,20};
 Line(21) = {20,21};
 Line(22) = {21,22};
 Line(23) = {22,25};
 Line(24) = {25,26};
 Line(25) = {26,9};
 Line(26) = {19,24};
 Line(27) = {24,23};
 Line(28) = {23,28};
 Line(29) = {28,27};
 Line(30) = {27,10};
 Line(31) = {18,33};
 Line(32) = {33,34};
 Line(33) = {34,29};
 Line(34) = {29,30};
 Line(35) = {30,11};
 Line(36) = {17,36};
 Line(37) = {36,35};
 Line(38) = {35,32};
 Line(39) = {32,31};
 Line(40) = {31,12};
 Line(41) = {5,21};
 Line(42) = {21,24};
 Line(43) = {24,33};
 Line(44) = {33,36};
 Line(45) = {36,16};
 Line(46) = {6,22};
 Line(47) = {22,23};
 Line(48) = {23,34};
 Line(49) = {34,35};
 Line(50) = {35,15};
 Line(51) = {7,25};
 Line(52) = {25,28};
 Line(53) = {28,29};
 Line(54) = {29,32};
 Line(55) = {32,14};
 Line(56) = {8,26};
 Line(57) = {26,27};
 Line(58) = {27,30};
 Line(59) = {30,31};
 Line(60) = {31,13};
 
 Line Loop(1) = {1,41,-21,-20};
 Line Loop(2) = {2,46,-22,-41};
 Line Loop(3) = {3,51,-23,-46};
 Line Loop(4) = {4,56,-24,-51};
 Line Loop(5) = {5,6,-25,-56};
 Line Loop(6) = {21,42,-26,-19};
 Line Loop(7) = {22,47,-27,-42};
 Line Loop(8) = {23,52,-28,-47};
 Line Loop(9) = {24,57,-29,-52};
 Line Loop(10) = {25,7,-30,-57};
 Line Loop(11) = {26,43,-31,-18};
 Line Loop(12) = {27,48,-32,-43};
 Line Loop(13) = {28,53,-33,-48};
 Line Loop(14) = {29,58,-34,-53};
 Line Loop(15) = {30,8,-35,-58};
 Line Loop(16) = {31,44,-36,-17};
 Line Loop(17) = {32,49,-37,-44};
 Line Loop(18) = {33,54,-38,-49};
 Line Loop(19) = {34,59,-39,-54};
 Line Loop(20) = {35,9,-40,-59};
 Line Loop(21) = {36,45,-15,-16};
 Line Loop(22) = {37,50,-14,-45};
 Line Loop(23) = {38,55,-13,-50};
 Line Loop(24) = {39,60,-12,-55};
 Line Loop(25) = {40,10,-11,-60};
 
 Plane Surface(1) = {1};
 Plane Surface(2) = {2};
 Plane Surface(3) = {3};
 Plane Surface(4) = {4};
 Plane Surface(5) = {5};
 Plane Surface(6) = {6};
 Plane Surface(7) = {7};
 Plane Surface(8) = {8};
 Plane Surface(9) = {9};
 Plane Surface(10) = {10};
 Plane Surface(11) = {11};
 Plane Surface(12) = {12};
 Plane Surface(13) = {13};
 Plane Surface(14) = {14};
 Plane Surface(15) = {15};
 Plane Surface(16) = {16};
 Plane Surface(17) = {17};
 Plane Surface(18) = {18};
 Plane Surface(19) = {19};
 Plane Surface(20) = {20};
 Plane Surface(21) = {21};
 Plane Surface(22) = {22};
 Plane Surface(23) = {23};
 Plane Surface(24) = {24};
 Plane Surface(25) = {25};
 
 Physical Surface("tri_0") = {13};
 Physical Surface("qdr_0") = {1};
 Physical Surface("qdr_1") = {3};
 Physical Surface("qdr_2") = {5};
 Physical Surface("qdr_3") = {11};
 Physical Surface("qdr_4") = {15};
 Physical Surface("qdr_5") = {21};
 Physical Surface("qdr_6") = {23};
 Physical Surface("qdr_7") = {25};
 Physical Surface("mid_0") = {8};
 Physical Surface("mid_1") = {12};
 Physical Surface("mid_2") = {14};
 Physical Surface("mid_3") = {18};
 Physical Surface("q2q_0") = {2};
 Physical Surface("q2q_1") = {4};
 Physical Surface("q2q_2") = {6};
 Physical Surface("q2q_3") = {10};
 Physical Surface("q2q_4") = {16};
 Physical Surface("q2q_5") = {20};
 Physical Surface("q2q_6") = {22};
 Physical Surface("q2q_7") = {24};
 Physical Surface("rst_1") = {7};
 Physical Surface("rst_2") = {9};
 Physical Surface("rst_3") = {17};
 Physical Surface("rst_4") = {19};
 
 Physical Line("inflow") = {20,19,18,17,16};
 Physical Line("outflow") = {6,7,8,9,10};
 Physical Line("slipWall") = {1,2,3,4,5,15,14,13,12,11};
 Physical Line("q2i") = {23,58,38,43,22,47,27,42,24,57,29,52,34,59,39,54,32,49,37,44};
 Physical Line("t2i") = {28,53,33,48};
 Physical Line("q2q") = {41,46,51,56,45,50,55,60,21,26,31,36,25,30,35,40};
 
-Transfinite Curve{1,21,26,31,36,15,5,25,30,35,40,11,20,41,46,51,56,6,16,45,50,55,60,10} = (N-1)/3+1 - N0;
+Transfinite Curve{1,21,26,31,36,15} = Nx1;
+Transfinite Curve{5,25,30,35,40,11} = Nx3;
+Transfinite Curve{20,41,46,51,56,6} = Ny1;
+Transfinite Curve{16,45,50,55,60,10} = Ny3;
 Transfinite Curve{2,22,27,32,37,14,4,24,29,34,39,12,19,42,47,52,57,7,17,44,49,54,59,9} = N0+1;
-Transfinite Curve{3,23,28,33,38,13,18,43,48,53,58,8} = ((N-1)/3) + 1;
+Transfinite Curve{3,23,28,33,38,13} = Nx2;
+Transfinite Curve{18,43,48,53,58,8} = Ny2;
 Transfinite Surface{1,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,19,20,21,22,23,24,25};
 Recombine Surface{1,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,19,20,21,22,23,24,25};
diff --git a/ConSol/Examples/HybridTest/burgers/BaseTriple4.geo b/ConSol/Examples/HybridTest/burgers/BaseTriple4.geo
index 8db95cc..f3ce57e 100644
--- a/ConSol/Examples/HybridTest/burgers/BaseTriple4.geo
+++ b/ConSol/Examples/HybridTest/burgers/BaseTriple4.geo
@@ -1,29 +1,29 @@
 // Variables
 boxdim = 1;
-N = 2*8+1;
+N = 2*17+1;
 N0 = 2;
 gridsize = boxdim/(N-1);
 
 // Points
 Point(1) = {-boxdim,-boxdim,0, gridsize};
 Point(2) = {2*boxdim,-boxdim,0, gridsize*3};
 Point(3) = {2*boxdim, 2*boxdim,0, gridsize*3};
 Point(4) = {-boxdim,2*boxdim,0, gridsize};
 
 Line(1) = {1,2};
 Line(2) = {2,3};
 Line(3) = {3,4};
 Line(4) = {4,1};
 
 
 Line Loop(1) = {1,2,3,4};
 
 Plane Surface(1) = {1};
 
 Physical Surface("qdr") = {1};
 
 Physical Line("absorb") = {1,2,3,4};
 
 Transfinite Curve{1,2,3,4} = 3*(N);
 Transfinite Surface{1};
 Recombine Surface{1};