add L4 as a parameter

Team25/shape.geo

@@ -4,7 +4,7 @@ DefineConstant[
   R1 = 6*mm
   L2 = 18*mm
   L3 = 15*mm
-  L4 = L2/L3*Sqrt[L3^2-(12.5*mm)^2]
+  L4 = {L2/L3*Sqrt[L3^2-(12.5*mm)^2], Name "Constructive parameters/L4"}
   angleMeasure = 50*deg
   lc = 12*mm
   lcd = lc/15
@@ -28,19 +28,21 @@ BSpline(4020) = {2020,2021, 2022, 2023};
 BSpline(4021) = {2023, 2024, 2025, 2026};
 BSpline(4022) = {2026, 2027, 2028, 2029, 2030};
 
-Point(26) = {L2/L3*Sqrt[L3^2-((12.5-2)*mm)^2], (12.5-2)*mm, 0, lcd};
+//Point(26) = {L2/L3*Sqrt[L3^2-((12.5-2)*mm)^2], (12.5-2)*mm, 0, lcd};
 
-For k In {0:10}
-  theta = k * 35/10 * deg;
+For k In {0:9}
+  theta = k * 50/10 * deg;
   DefineConstant[Rso~{k} = {L2*L3/Sqrt[(L3*Cos[theta])^2+(L2*Sin[theta])^2], 
     Name Sprintf["Constructive parameters/outer spline radius %g",k+1]}];
   Point(6020+k) = {Rso~{k}*Cos[theta], Rso~{k}*Sin[theta], 0, lcd};  
 EndFor
 
+Point(24) = {20*mm-L4, 12.5*mm, 0, lcd};
+
 BSpline(4023) = {6020, 6021, 6022, 6023};
 BSpline(4024) = {6023, 6024, 6025, 6026};
 BSpline(4025) = {6026, 6027, 6028};
-BSpline(4026) = {6028, 6029, 6030, 26};
+BSpline(4026) = {6028, 6029, 24};
 
 Point(6) = {20*mm, 0, 0, lcd};
 Point(8) = {0, L3, 0, lc};
@@ -61,8 +63,10 @@ Point(1021) = {(9.5+2.25)*Cos[angleMeasure]*mm, (9.5+2.25)*Sin[angleMeasure]*mm,
 Point(1022) = {(9.5+2.25)*mm, 0, 0, lcd};
 
 Point(23) = {20*mm, 12.5*mm, 0, lcd};
-Point(24) = {20*mm-L4, 12.5*mm, 0, lcd};
-Point(25) = {20*mm-L4, (12.5-2)*mm, 0, lcd};
+
+//DefineConstant[edge_x_1 = {20*mm-L4, Name "Constructive parameters/edge radius 1"}];
+//DefineConstant[edge_y_1 = {(12.5-2)*mm, Name "Constructive parameters/edge radius 2"}];
+//Point(25) = {edge_x_1, edge_y_1, 0, lcd};
 
 Circle(1016) = {1022, 1, 1021};
 Line(2) = {9, 10};
@@ -83,21 +87,22 @@ Line(24) = {2020, 6020};
 Line(22) = {1, 2030};
 Line(26) = {6, 23};
 Line(27) = {24, 23};
-Line(28) = {24, 25};
-Line(29) = {25, 26};
+
 Line(30) = {6020, 6};
 Line(31) = {6, 9};
 Line(32) = {2030, 14};
 
 Curve Loop(1) = {-22, 18, 4020, 4021, 4022};
 Plane Surface(1) = {1};
-Curve Loop(2) = {4023,4024,4025,4026, -29, -28, 27, -26, -30};
+Curve Loop(2) = {4023,4024,4025,4026, 27, -26, -30};
 Plane Surface(2) = {2};
 Curve Loop(3) = {9, 2, 3, 4, 5, 6, -15, -12, -11, 8};
 Plane Surface(3) = {3};
 Curve Loop(4) = {13, 14, 10, 12};
 Plane Surface(4) = {4};
-Curve Loop(6) = {24, 4023,4024,4025,4026, -29, -28, 27, -26, 31, -9, -8, 11, -10, -14, -13, 15, -6, -32, -4020, -4021, -4022};
+//Curve Loop(6) = {24, 4023,4024,4025,4026, 27, 26, 31, -9, -8, 11, -10, -14, -13, 15, -6, -32, -4020, -4021, -4022};
+//Plane Surface(6) = {6};
+Curve Loop(6) = {24, 4023, 4024, 4025, 4026, 27, -26, 31, -9, -8, 11, -10, -14, -13, 15, -6, -32, -4022, -4021, -4020};
 Plane Surface(6) = {6};
 
 Physical Surface("pole", 1) = {3};

Team25/shape.pro

@@ -338,6 +338,7 @@ PostOperation {
         File StrCat[Opt_ResDir,"bTarget.pos"]];
       Print[b, OnGrid {(9.5e-3+2.25e-3)*Cos[$A],(9.5e-3+2.25e-3)*Sin[$A],0}{0:50*Pi/180:5*Pi/180,0,0},
         File StrCat[Opt_ResDir,"b.pos"]];
+      //  Print[az, OnElementsOf Domain, File StrCat[Opt_ResDir,"az.pos"]];
       If(Flag_PrintLevel>5)
         Print[mur, OnElementsOf Domain, File StrCat[Opt_ResDir,"mur.pos"]];
         Print[az, OnElementsOf Domain, File StrCat[Opt_ResDir,"az.pos"]];

Team25/shape.py

@@ -55,11 +55,13 @@ for k in xrange(11):
 sizeX = len(x.keys())
 
 L2 = 18.0e-3;L3 = 15.0e-3
-for k in xrange(11):
-    theta = float(k) * 35.0/10.0 * np.pi/180.0
+for k in xrange(10):
+    theta = float(k) * 50.0/10.0 * np.pi/180.0
     xe = L2*L3/((L3*np.cos(theta))**2.0+(L2*np.sin(theta))**2.0)**0.5
     x[sizeX+k] = ['Constructive parameters/outer spline radius '+str(k+1), xe, xe-4.0e-3, xe+1.5e-3, 'Rso_'+str(k)]
 
+x[len(x.keys())] = ['Constructive parameters/L4', 0.00994987, 0.00994987-4.0e-3, xe+4.0e-3, 'L4']
+
 def readSimpleTable(path):
     with open(path) as FileObj:
         return np.array([float(lines.split()[-1]) for lines in FileObj])