designix 0.5.21 → 0.5.22

package/dist/index.js

@@ -1447,19 +1447,19 @@ var pDef3 = {
   partName: "pole_static",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber3("D1", "mm", 1e3, 100, 4e3, 10),
-    pNumber3("D2", "mm", 700, 100, 4e3, 10),
-    pNumber3("D3", "mm", 800, 100, 4e3, 10),
-    pNumber3("H1", "mm", 3e3, 100, 4e4, 10),
-    pNumber3("H2", "mm", 7e3, 100, 4e4, 10),
+    pNumber3("D1", "mm", 1e3, 20, 4e3, 1),
+    pNumber3("D2", "mm", 700, 10, 4e3, 1),
+    pNumber3("D3", "mm", 800, 10, 4e3, 1),
+    pNumber3("H1", "mm", 3e3, 10, 4e4, 10),
+    pNumber3("H2", "mm", 7e3, 50, 4e4, 10),
     pNumber3("E1", "mm", 30, 1, 80, 1),
     pNumber3("E2", "mm", 5, 1, 80, 1),
     pNumber3("N1", "", 32, 3, 100, 1),
     pNumber3("D5", "mm", 40, 1, 100, 1),
     pNumber3("L1", "mm", 45, 1, 300, 1),
-    pNumber3("D4", "mm", 600, 200, 1200, 1),
-    pNumber3("H3", "mm", 300, 50, 1200, 1),
-    pNumber3("H4", "mm", 1800, 200, 2500, 1),
+    pNumber3("D4", "mm", 600, 1, 1200, 1),
+    pNumber3("H3", "mm", 300, 5, 1200, 1),
+    pNumber3("H4", "mm", 1800, 10, 2500, 1),
     pNumber3("L2", "mm", 30, 1, 100, 1),
     pNumber3("E3", "mm", 40, 1, 100, 1)
   ],
@@ -1671,33 +1671,33 @@ var pDef4 = {
   partName: "rake",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber4("D1", "mm", 600, 100, 4e3, 10),
-    pNumber4("D2", "mm", 400, 100, 4e3, 10),
-    pNumber4("D3", "mm", 400, 100, 4e3, 10),
-    pNumber4("H1", "mm", 800, 100, 4e3, 10),
-    pNumber4("H2", "mm", 3e3, 100, 6e3, 10),
+    pNumber4("D1", "mm", 600, 10, 4e3, 10),
+    pNumber4("D2", "mm", 400, 10, 4e3, 10),
+    pNumber4("D3", "mm", 400, 10, 4e3, 10),
+    pNumber4("H1", "mm", 800, 1, 4e3, 10),
+    pNumber4("H2", "mm", 3e3, 20, 6e3, 10),
     pNumber4("H3", "mm", 400, 0, 4e3, 10),
     pNumber4("E1", "mm", 20, 1, 80, 1),
     pNumber4("E3", "mm", 30, 1, 80, 1),
-    pNumber4("H4", "mm", 400, 100, 1e3, 10),
-    pNumber4("D4", "mm", 300, 100, 1e3, 10),
+    pNumber4("H4", "mm", 400, 10, 1e3, 10),
+    pNumber4("D4", "mm", 300, 10, 1e3, 10),
     pNumber4("E4", "mm", 20, 1, 80, 1),
-    pNumber4("H5", "mm", 1e3, 100, 2e3, 10),
-    pNumber4("D5", "mm", 200, 10, 1e3, 10),
-    pNumber4("L4", "mm", 300, 10, 1e3, 10),
-    pNumber4("L5", "mm", 2e3, 100, 4e3, 10),
-    pNumber4("L6", "mm", 2e3, 100, 4e3, 10),
-    pNumber4("D6", "mm", 100, 10, 600, 10),
+    pNumber4("H5", "mm", 1e3, 10, 2e3, 10),
+    pNumber4("D5", "mm", 200, 1, 1e3, 10),
+    pNumber4("L4", "mm", 300, 1, 1e3, 10),
+    pNumber4("L5", "mm", 2e3, 10, 4e3, 10),
+    pNumber4("L6", "mm", 2e3, 1, 4e3, 10),
+    pNumber4("D6", "mm", 100, 1, 600, 10),
     pNumber4("E6", "mm", 10, 1, 80, 1),
-    pNumber4("L7", "mm", 100, 10, 1e3, 1),
-    pNumber4("L8", "mm", 200, 10, 1e3, 1),
+    pNumber4("L7", "mm", 100, 1, 1e3, 1),
+    pNumber4("L8", "mm", 200, 1, 1e3, 1),
     pNumber4("N1", "", 24, 3, 100, 1),
     pNumber4("D7", "mm", 40, 1, 100, 1),
     pNumber4("L1", "mm", 30, 1, 300, 1),
-    pNumber4("D8", "mm", 400, 100, 1e3, 10),
-    pNumber4("H6", "mm", 100, 50, 1e3, 10),
-    pNumber4("H7", "mm", 600, 100, 2e3, 10),
-    pNumber4("L9", "mm", 300, 100, 1e3, 10),
+    pNumber4("D8", "mm", 400, 1, 1e3, 10),
+    pNumber4("H6", "mm", 100, 1, 1e3, 10),
+    pNumber4("H7", "mm", 600, 10, 2e3, 10),
+    pNumber4("L9", "mm", 300, 1, 1e3, 10),
     pNumber4("R9", "mm", 50, 0, 300, 1)
   ],
   paramSvg: {
@@ -1819,7 +1819,7 @@ function pGeom4(t, param) {
     const doorLowX = param.L9 / 2;
     const doorHighX = doorLowX - param.H7 * Math.tan(coneAngle);
     if (doorHighX < param.R9) {
-      throw `err177: R9 ${param.R9} too large compare to coneAngle and L9 ${param.L9}`;
+      throw `err177: R9 ${param.R9} too large compare to doorHighX ${doorHighX} and L9 ${param.L9}`;
     }
     if (param.L9 > param.D1) {
       throw `err180: L9 ${param.L9} too large compare to D1 ${param.D1}`;
@@ -2088,12 +2088,12 @@ var pDef5 = {
   partName: "spider",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber5("D1", "mm", 100, 10, 400, 1),
-    pNumber5("L1", "mm", 400, 100, 1e3, 10),
-    pNumber5("L2", "mm", 400, 100, 1e3, 10),
-    pNumber5("L3", "mm", 100, 10, 400, 1),
-    pNumber5("L4", "mm", 3e3, 500, 8e3, 10),
-    pNumber5("L5", "mm", 2e3, 100, 8e3, 10),
+    pNumber5("D1", "mm", 100, 1, 400, 1),
+    pNumber5("L1", "mm", 400, 1, 1e3, 1),
+    pNumber5("L2", "mm", 400, 1, 1e3, 1),
+    pNumber5("L3", "mm", 100, 1, 400, 1),
+    pNumber5("L4", "mm", 3e3, 10, 8e3, 10),
+    pNumber5("L5", "mm", 2e3, 1, 8e3, 1),
     pNumber5("L6", "mm", 30, 1, 100, 1),
     pNumber5("E1", "mm", 3, 1, 80, 1),
     pNumber5("E2", "mm", 50, 1, 200, 1),
@@ -2274,24 +2274,24 @@ var pDef6 = {
   partName: "swing",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber6("L1", "mm", 12500, 1e3, 4e4, 10),
-    pNumber6("L2", "mm", 6e3, 1e3, 4e4, 10),
-    pNumber6("L3", "mm", 500, 100, 4e3, 10),
-    pNumber6("L4", "mm", 600, 100, 4e3, 10),
-    pNumber6("L5", "mm", 2e3, 100, 1e4, 10),
-    pNumber6("L6", "mm", 2e3, 100, 1e4, 10),
-    pNumber6("D1", "mm", 400, 50, 1e3, 1),
-    pNumber6("H1", "mm", 100, 10, 400, 1),
-    pNumber6("H2", "mm", 100, 10, 400, 1),
-    pNumber6("H3", "mm", 100, 10, 400, 1),
-    pNumber6("H4", "mm", 100, 10, 400, 1),
+    pNumber6("L1", "mm", 12500, 100, 4e4, 10),
+    pNumber6("L2", "mm", 6e3, 100, 4e4, 10),
+    pNumber6("L3", "mm", 500, 1, 4e3, 1),
+    pNumber6("L4", "mm", 600, 1, 4e3, 1),
+    pNumber6("L5", "mm", 2e3, 1, 1e4, 1),
+    pNumber6("L6", "mm", 2e3, 1, 1e4, 1),
+    pNumber6("D1", "mm", 400, 1, 1e3, 1),
+    pNumber6("H1", "mm", 100, 1, 400, 1),
+    pNumber6("H2", "mm", 100, 1, 400, 1),
+    pNumber6("H3", "mm", 100, 1, 400, 1),
+    pNumber6("H4", "mm", 100, 1, 400, 1),
     pNumber6("E1", "mm", 5, 1, 80, 1),
     pNumber6("E2", "mm", 3, 1, 80, 1),
     pNumber6("E3", "mm", 3, 1, 80, 1),
     pNumber6("rod1", "", 10, 1, 40, 1),
-    pNumber6("rod2", "mm", 1300, 100, 4e3, 10),
-    pNumber6("rod3", "mm", 400, 50, 1e3, 10),
-    pNumber6("rod4", "mm", 100, 50, 400, 10)
+    pNumber6("rod2", "mm", 1300, 10, 4e3, 10),
+    pNumber6("rod3", "mm", 400, 10, 1e3, 10),
+    pNumber6("rod4", "mm", 100, 1, 400, 1)
   ],
   paramSvg: {
     L1: "swing_top.svg",
@@ -2467,36 +2467,36 @@ var pDef7 = {
   partName: "heliostat",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber7("H1", "mm", 3e3, 100, 4e4, 10),
-    pNumber7("H2", "mm", 2500, 100, 4e4, 10),
-    pNumber7("H3", "mm", 200, 10, 500, 10),
-    pNumber7("H4", "mm", 800, 100, 4e3, 10),
-    pNumber7("H5", "mm", 3e3, 100, 6e3, 10),
-    pNumber7("H6", "mm", 200, 100, 4e3, 10),
-    pNumber7("H7", "mm", 800, 100, 4e3, 10),
-    pNumber7("H8", "mm", 200, 100, 4e3, 10),
-    pNumber7("H9", "mm", 100, 10, 400, 10),
-    pNumber7("D1", "mm", 1e3, 100, 4e3, 10),
-    pNumber7("D2", "mm", 700, 100, 4e3, 10),
-    pNumber7("D3", "mm", 900, 100, 4e3, 10),
-    pNumber7("D4", "mm", 400, 100, 4e3, 10),
-    pNumber7("D5", "mm", 300, 100, 1e3, 10),
-    pNumber7("D6", "mm", 200, 100, 1e3, 10),
-    pNumber7("D7", "mm", 400, 100, 1e3, 10),
-    pNumber7("D8", "mm", 100, 10, 1e3, 10),
-    pNumber7("D9", "mm", 100, 10, 1e3, 10),
-    pNumber7("S1", "mm", 250, 10, 800, 10),
-    pNumber7("S2", "mm", 200, 10, 800, 10),
+    pNumber7("H1", "mm", 3e3, 10, 4e4, 10),
+    pNumber7("H2", "mm", 2500, 50, 4e4, 10),
+    pNumber7("H3", "mm", 200, 1, 500, 1),
+    pNumber7("H4", "mm", 800, 1, 4e3, 1),
+    pNumber7("H5", "mm", 3e3, 50, 6e3, 10),
+    pNumber7("H6", "mm", 200, 1, 4e3, 1),
+    pNumber7("H7", "mm", 800, 1, 4e3, 1),
+    pNumber7("H8", "mm", 200, 1, 4e3, 1),
+    pNumber7("H9", "mm", 100, 1, 400, 1),
+    pNumber7("D1", "mm", 1e3, 20, 4e3, 10),
+    pNumber7("D2", "mm", 700, 20, 4e3, 10),
+    pNumber7("D3", "mm", 900, 20, 4e3, 10),
+    pNumber7("D4", "mm", 400, 20, 4e3, 10),
+    pNumber7("D5", "mm", 300, 20, 1e3, 10),
+    pNumber7("D6", "mm", 200, 10, 1e3, 10),
+    pNumber7("D7", "mm", 400, 10, 1e3, 10),
+    pNumber7("D8", "mm", 100, 1, 1e3, 1),
+    pNumber7("D9", "mm", 100, 1, 1e3, 1),
+    pNumber7("S1", "mm", 250, 1, 800, 1),
+    pNumber7("S2", "mm", 200, 1, 800, 1),
     pNumber7("E1", "mm", 30, 1, 80, 1),
     pNumber7("E2", "mm", 50, 1, 80, 1),
-    pNumber7("L1", "mm", 12500, 1e3, 4e4, 10),
-    pNumber7("L2", "mm", 6e3, 1e3, 4e4, 10),
-    pNumber7("L3", "mm", 100, 10, 500, 10),
-    pNumber7("L4", "mm", 600, 100, 4e3, 10),
-    pNumber7("L5", "mm", 2e3, 100, 6e3, 10),
-    pNumber7("L6", "mm", 2e3, 100, 6e3, 10),
-    pNumber7("L7", "mm", 100, 10, 1e3, 10),
-    pNumber7("L8", "mm", 200, 10, 1e3, 10),
+    pNumber7("L1", "mm", 12500, 100, 4e4, 10),
+    pNumber7("L2", "mm", 6e3, 100, 4e4, 10),
+    pNumber7("L3", "mm", 100, 1, 500, 1),
+    pNumber7("L4", "mm", 600, 1, 4e3, 1),
+    pNumber7("L5", "mm", 2e3, 10, 6e3, 1),
+    pNumber7("L6", "mm", 2e3, 1, 6e3, 1),
+    pNumber7("L7", "mm", 100, 1, 1e3, 1),
+    pNumber7("L8", "mm", 200, 1, 1e3, 1),
     pNumber7("al", "degree", 80, 0, 95, 1),
     pNumber7("ar", "degree", 80, 0, 95, 1)
   ],
@@ -2535,7 +2535,7 @@ var pDef7 = {
     ar: "heliostat_side_sizing.svg"
   },
   sim: {
-    tMax: 180,
+    tMax: 100,
     tStep: 0.5,
     tUpdate: 500
     // every 0.5 second
@@ -2569,19 +2569,41 @@ function pGeom7(t, param) {
     poleStaticParam.setVal("H2", param.H2);
     poleStaticParam.setVal("D1", param.D1);
     poleStaticParam.setVal("D2", param.D2);
+    poleStaticParam.setVal("D3", param.D1 - 6 * param.E1);
     poleStaticParam.setVal("E1", param.E1);
     poleStaticParam.setVal("E2", param.E1);
+    const poleStaticN1 = 32;
+    const poleStaticD5 = (param.D1 - 6 * param.E1) / (poleStaticN1 * 4);
+    poleStaticParam.setVal("N1", poleStaticN1);
+    poleStaticParam.setVal("D5", poleStaticD5);
+    poleStaticParam.setVal("L1", param.E1 + poleStaticD5 / 2);
+    poleStaticParam.setVal("H3", param.H1 / 4);
+    poleStaticParam.setVal("H4", param.H1 / 2);
+    poleStaticParam.setVal("D4", param.H1 / 4);
+    poleStaticParam.setVal("L2", param.H1 / 80);
+    poleStaticParam.setVal("E3", param.H1 / 80);
     rakeParam.setVal("H1", param.H4);
     rakeParam.setVal("H2", param.H5);
+    rakeParam.setVal("H3", param.H4 - 2 * param.E1);
     rakeParam.setVal("D1", param.D3);
     rakeParam.setVal("D2", param.D4);
     rakeParam.setVal("L9", param.D3 / 2);
+    rakeParam.setVal("H7", param.D3 / 2 * 1.6);
+    rakeParam.setVal("H6", param.D3 / 20);
+    rakeParam.setVal("R9", param.D3 / 20);
     rakeParam.setVal("E1", param.E1);
     rakeParam.setVal("E3", param.E1);
-    rakeParam.setVal("D3", param.D2 * 0.6);
+    rakeParam.setVal("E4", param.E1);
+    const rakeD3 = param.D2 * 0.6;
+    const rakeN1 = 24;
+    const rakeD7 = rakeD3 / (rakeN1 * 4);
+    rakeParam.setVal("D3", rakeD3);
     if (param.D2 > param.D3 - 2 * param.E1) {
       throw `err153: D2 ${param.D2} too large compare to D3 ${param.D3} and E1 ${param.E1}`;
     }
+    rakeParam.setVal("N1", rakeN1);
+    rakeParam.setVal("D7", rakeD7);
+    rakeParam.setVal("L1", rakeD7);
     rakeParam.setVal("H4", param.H6);
     rakeParam.setVal("D4", param.D5);
     rakeParam.setVal("L7", param.L7);
@@ -2601,14 +2623,22 @@ function pGeom7(t, param) {
     rakeParam.setVal("L5", param.L5 + 2 * param.L3);
     rakeParam.setVal("L6", param.L6 + 2 * param.L3);
     const spiderL5 = param.L5 * 0.96;
+    const spiderN1 = 6;
     spiderParam.setVal("L5", spiderL5);
     spiderParam.setVal("D1", param.D8);
     spiderParam.setVal("L1", param.S1);
     spiderParam.setVal("L2", param.S2);
+    spiderParam.setVal("L3", param.E2 * 2);
+    spiderParam.setVal("E1", param.E1);
     spiderParam.setVal("E2", param.E2);
+    spiderParam.setVal("E3", param.E1);
     spiderParam.setVal("L4", param.L2 / 2 - param.H8);
+    spiderParam.setVal("R2", 0);
+    spiderParam.setVal("N1", spiderN1);
+    spiderParam.setVal("L6", spiderL5 / (spiderN1 * 10));
     swingParam.setVal("L2", param.L2);
     swingParam.setVal("D1", param.D6);
+    swingParam.setVal("H3", param.H9);
     swingParam.setVal("H4", param.H9);
     swingParam.setVal("L1", param.L1);
     if (param.L1 < 4 * param.L4 + 2 * param.L6 + param.L5 + 2 * param.L3) {
@@ -2707,8 +2737,8 @@ function pGeom7(t, param) {
       position: [0, 0, rakePosY]
     };
     const subSpider = {
-      partName: rakeParam.getPartName(),
-      dparam: rakeParam.getDesignParamList(),
+      partName: spiderParam.getPartName(),
+      dparam: spiderParam.getDesignParamList(),
       orientation: [Math.PI / 2, 0, 0],
       position: [0, spiderL5 / 2, spiderPosY]
     };
@@ -2772,36 +2802,36 @@ var pDef8 = {
   partName: "rake_stopper",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber8("D1", "mm", 600, 100, 4e3, 10),
-    pNumber8("D2", "mm", 400, 100, 4e3, 10),
-    pNumber8("D3", "mm", 400, 100, 4e3, 10),
-    pNumber8("H1", "mm", 800, 100, 4e3, 10),
-    pNumber8("H2", "mm", 3e3, 100, 6e3, 10),
-    pNumber8("H3", "mm", 400, 0, 4e3, 10),
+    pNumber8("D1", "mm", 600, 10, 4e3, 10),
+    pNumber8("D2", "mm", 400, 10, 4e3, 10),
+    pNumber8("D3", "mm", 400, 1, 4e3, 1),
+    pNumber8("H1", "mm", 800, 1, 4e3, 1),
+    pNumber8("H2", "mm", 3e3, 20, 6e3, 10),
+    pNumber8("H3", "mm", 400, 0, 4e3, 1),
     pNumber8("E1", "mm", 20, 1, 80, 1),
     pNumber8("E3", "mm", 30, 1, 80, 1),
-    pNumber8("H4", "mm", 200, 100, 1e3, 10),
-    pNumber8("D4", "mm", 300, 100, 1e3, 10),
+    pNumber8("H4", "mm", 200, 1, 1e3, 1),
+    pNumber8("D4", "mm", 300, 1, 1e3, 1),
     pNumber8("E4", "mm", 20, 1, 80, 1),
-    pNumber8("H5", "mm", 400, 100, 2e3, 10),
-    pNumber8("D5", "mm", 200, 10, 1e3, 10),
-    pNumber8("L4", "mm", 300, 10, 1e3, 10),
-    pNumber8("L5", "mm", 2e3, 100, 4e3, 10),
-    pNumber8("L6", "mm", 2e3, 100, 4e3, 10),
-    pNumber8("D6", "mm", 100, 10, 600, 10),
+    pNumber8("H5", "mm", 400, 1, 2e3, 1),
+    pNumber8("D5", "mm", 200, 1, 1e3, 1),
+    pNumber8("L4", "mm", 300, 1, 1e3, 1),
+    pNumber8("L5", "mm", 2e3, 1, 4e3, 1),
+    pNumber8("L6", "mm", 2e3, 1, 4e3, 1),
+    pNumber8("D6", "mm", 100, 1, 600, 1),
     pNumber8("E6", "mm", 10, 1, 80, 1),
-    pNumber8("L7", "mm", 100, 10, 1e3, 1),
-    pNumber8("L8", "mm", 200, 10, 1e3, 1),
+    pNumber8("L7", "mm", 100, 1, 1e3, 1),
+    pNumber8("L8", "mm", 200, 1, 1e3, 1),
     pNumber8("N1", "", 24, 3, 100, 1),
     pNumber8("D7", "mm", 40, 1, 100, 1),
     pNumber8("L1", "mm", 30, 1, 300, 1),
-    pNumber8("D8", "mm", 400, 100, 1e3, 10),
-    pNumber8("H6", "mm", 100, 50, 1e3, 10),
-    pNumber8("H7", "mm", 600, 100, 2e3, 10),
-    pNumber8("L9", "mm", 300, 100, 1e3, 10),
+    pNumber8("D8", "mm", 400, 1, 1e3, 1),
+    pNumber8("H6", "mm", 100, 1, 1e3, 1),
+    pNumber8("H7", "mm", 600, 1, 2e3, 1),
+    pNumber8("L9", "mm", 300, 1, 1e3, 1),
     pNumber8("R9", "mm", 50, 0, 300, 1),
-    pNumber8("S1", "mm", 100, 10, 300, 1),
-    pNumber8("S2", "mm", 2e3, 100, 8e3, 10),
+    pNumber8("S1", "mm", 100, 1, 300, 1),
+    pNumber8("S2", "mm", 2e3, 1, 8e3, 1),
     pNumber8("E7", "mm", 5, 1, 80, 1)
   ],
   paramSvg: {
@@ -2875,8 +2905,8 @@ function pGeom8(t, param) {
     if (2 * param.E7 >= param.S1) {
       throw `err135: E7 ${param.E7} too large compare to S1 ${param.S1}`;
     }
-    if (param.L5 < param.D1 + 4 * param.S1) {
-      throw `err138: L5 ${param.L5} too small compare to D1 ${param.D1} and S1 ${param.S1}`;
+    if (param.L5 < param.D2) {
+      throw `err138: L5 ${param.L5} too small compare to D2 ${param.D2}`;
     }
     const stopper1H = H1H5 - param.S2;
     if (stopper1H < 0) {
@@ -3127,33 +3157,33 @@ var pDef9 = {
   partName: "heliostat_2",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber9("H1", "mm", 3e3, 100, 4e4, 10),
-    pNumber9("H2", "mm", 2500, 100, 4e4, 10),
-    pNumber9("H3", "mm", 200, 10, 500, 10),
-    pNumber9("H4", "mm", 800, 100, 4e3, 10),
-    pNumber9("H5", "mm", 3e3, 100, 6e3, 10),
-    pNumber9("H6", "mm", 200, 100, 4e3, 10),
-    pNumber9("H7", "mm", 400, 100, 4e3, 10),
-    pNumber9("H9", "mm", 100, 10, 400, 10),
-    pNumber9("D1", "mm", 1e3, 100, 4e3, 10),
-    pNumber9("D2", "mm", 700, 100, 4e3, 10),
-    pNumber9("D3", "mm", 900, 100, 4e3, 10),
-    pNumber9("D4", "mm", 400, 100, 4e3, 10),
-    pNumber9("D5", "mm", 300, 100, 1e3, 10),
-    pNumber9("D6", "mm", 200, 100, 1e3, 10),
-    pNumber9("D7", "mm", 400, 100, 1e3, 10),
-    pNumber9("D9", "mm", 100, 10, 1e3, 10),
+    pNumber9("H1", "mm", 3e3, 10, 4e4, 10),
+    pNumber9("H2", "mm", 2500, 50, 4e4, 10),
+    pNumber9("H3", "mm", 200, 1, 500, 1),
+    pNumber9("H4", "mm", 800, 1, 4e3, 1),
+    pNumber9("H5", "mm", 3e3, 50, 6e3, 10),
+    pNumber9("H6", "mm", 200, 1, 4e3, 1),
+    pNumber9("H7", "mm", 400, 1, 4e3, 1),
+    pNumber9("H9", "mm", 100, 1, 400, 1),
+    pNumber9("D1", "mm", 1e3, 20, 4e3, 10),
+    pNumber9("D2", "mm", 700, 20, 4e3, 10),
+    pNumber9("D3", "mm", 900, 20, 4e3, 10),
+    pNumber9("D4", "mm", 400, 20, 4e3, 10),
+    pNumber9("D5", "mm", 300, 20, 1e3, 10),
+    pNumber9("D6", "mm", 200, 10, 1e3, 10),
+    pNumber9("D7", "mm", 400, 10, 1e3, 10),
+    pNumber9("D9", "mm", 100, 1, 1e3, 1),
     pNumber9("E1", "mm", 30, 1, 80, 1),
-    pNumber9("L1", "mm", 12500, 1e3, 4e4, 10),
-    pNumber9("L2", "mm", 6e3, 1e3, 4e4, 10),
-    pNumber9("L3", "mm", 100, 10, 500, 10),
-    pNumber9("L4", "mm", 600, 100, 4e3, 10),
-    pNumber9("L5", "mm", 2e3, 100, 6e3, 10),
-    pNumber9("L6", "mm", 2e3, 100, 6e3, 10),
-    pNumber9("L7", "mm", 100, 10, 1e3, 10),
-    pNumber9("L8", "mm", 200, 10, 1e3, 10),
+    pNumber9("L1", "mm", 12500, 100, 4e4, 10),
+    pNumber9("L2", "mm", 6e3, 100, 4e4, 10),
+    pNumber9("L3", "mm", 100, 1, 500, 1),
+    pNumber9("L4", "mm", 600, 1, 4e3, 1),
+    pNumber9("L5", "mm", 2e3, 10, 6e3, 10),
+    pNumber9("L6", "mm", 2e3, 1, 6e3, 1),
+    pNumber9("L7", "mm", 100, 1, 1e3, 1),
+    pNumber9("L8", "mm", 200, 1, 1e3, 1),
     pNumber9("al", "degree", 80, 0, 95, 1),
-    pNumber9("S1", "mm", 100, 10, 800, 1)
+    pNumber9("S1", "mm", 100, 1, 800, 1)
   ],
   paramSvg: {
     H1: "heliostat_overview.svg",
@@ -3185,7 +3215,7 @@ var pDef9 = {
     S1: "heliostat2_side_sizing.svg"
   },
   sim: {
-    tMax: 180,
+    tMax: 100,
     tStep: 0.5,
     tUpdate: 500
     // every 0.5 second
@@ -3217,19 +3247,43 @@ function pGeom9(t, param) {
     poleStaticParam.setVal("H2", param.H2);
     poleStaticParam.setVal("D1", param.D1);
     poleStaticParam.setVal("D2", param.D2);
+    poleStaticParam.setVal("D3", param.D1 - 6 * param.E1);
     poleStaticParam.setVal("E1", param.E1);
     poleStaticParam.setVal("E2", param.E1);
+    const poleStaticN1 = 32;
+    const poleStaticD5 = (param.D1 - 6 * param.E1) / (poleStaticN1 * 4);
+    poleStaticParam.setVal("N1", poleStaticN1);
+    poleStaticParam.setVal("D5", poleStaticD5);
+    poleStaticParam.setVal("L1", param.E1 + poleStaticD5 / 2);
+    poleStaticParam.setVal("H3", param.H1 / 4);
+    poleStaticParam.setVal("H4", param.H1 / 2);
+    poleStaticParam.setVal("D4", param.H1 / 4);
+    poleStaticParam.setVal("L2", param.H1 / 80);
+    poleStaticParam.setVal("E3", param.H1 / 80);
     rakeParam.setVal("H1", param.H4);
     rakeParam.setVal("H2", param.H5);
+    rakeParam.setVal("H3", param.H4 - 2 * param.E1);
     rakeParam.setVal("D1", param.D3);
     rakeParam.setVal("D2", param.D4);
     rakeParam.setVal("L9", param.D3 / 2);
+    rakeParam.setVal("H7", param.D3 / 2 * 1.6);
+    rakeParam.setVal("H6", param.D3 / 20);
+    rakeParam.setVal("R9", param.D3 / 20);
     rakeParam.setVal("E1", param.E1);
     rakeParam.setVal("E3", param.E1);
-    rakeParam.setVal("D3", param.D2 * 0.6);
+    rakeParam.setVal("E4", param.E1);
+    rakeParam.setVal("E6", param.E1);
+    rakeParam.setVal("E7", param.E1);
+    const rakeD3 = param.D2 * 0.6;
+    const rakeN1 = 24;
+    const rakeD7 = rakeD3 / (rakeN1 * 4);
+    rakeParam.setVal("D3", rakeD3);
     if (param.D2 > param.D3 - 2 * param.E1) {
       throw `err153: D2 ${param.D2} too large compare to D3 ${param.D3} and E1 ${param.E1}`;
     }
+    rakeParam.setVal("N1", rakeN1);
+    rakeParam.setVal("D7", rakeD7);
+    rakeParam.setVal("L1", rakeD7);
     rakeParam.setVal("H4", param.H6);
     rakeParam.setVal("D4", param.D5);
     rakeParam.setVal("L7", param.L7);
@@ -3252,6 +3306,7 @@ function pGeom9(t, param) {
     rakeParam.setVal("S2", param.L2 / 2);
     swingParam.setVal("L2", param.L2);
     swingParam.setVal("D1", param.D6);
+    swingParam.setVal("H3", param.H9);
     swingParam.setVal("H4", param.H9);
     swingParam.setVal("L1", param.L1);
     if (param.L1 < 4 * param.L4 + 2 * param.L6 + param.L5 + 2 * param.L3) {
@@ -3380,15 +3435,15 @@ var pDef10 = {
   partName: "base",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber10("D1", "mm", 600, 100, 4e3, 10),
-    pNumber10("D2", "mm", 700, 100, 4e3, 10),
-    pNumber10("D3", "mm", 400, 100, 4e3, 10),
-    pNumber10("D4", "mm", 500, 100, 4e3, 10),
+    pNumber10("D1", "mm", 600, 10, 4e3, 10),
+    pNumber10("D2", "mm", 700, 10, 4e3, 10),
+    pNumber10("D3", "mm", 400, 10, 4e3, 10),
+    pNumber10("D4", "mm", 500, 10, 4e3, 10),
     pNumber10("E1", "mm", 30, 1, 80, 1),
     pNumber10("E2", "mm", 30, 1, 80, 1),
     pNumber10("E3", "mm", 30, 1, 80, 1),
     pNumber10("H1", "mm", 800, 10, 4e3, 10),
-    pNumber10("H2", "mm", 50, 10, 4e3, 10),
+    pNumber10("H2", "mm", 50, 1, 4e3, 1),
     pNumber10("H3", "mm", 400, 10, 4e3, 10),
     pNumber10("N2", "", 12, 1, 100, 1),
     pNumber10("L2", "mm", 100, 1, 400, 1),
@@ -3446,6 +3501,9 @@ function pGeom10(t, param) {
     rGeome.logstr += `base-height: ${ffix11(param.H1)} mm
 `;
     rGeome.logstr += `base-external-diameter: ${ffix11(param.D2)} mm
+`;
+    const interHollow = param.D1 * Math.PI / param.N2 - param.L2;
+    rGeome.logstr += `inter-hollow: ${ffix11(interHollow)} mm
 `;
     ctrBaseCut1 = function(orient) {
       const rBaseCut1 = contour9(orient * R2, 0).addSegStrokeA(orient * R2, param.E3).addSegStrokeA(orient * R1, param.E3).addSegStrokeA(orient * R1, param.H1).addSegStrokeA(orient * (R1 - param.E2), param.H1).addSegStrokeA(orient * (R1 - param.E2), param.E3).addSegStrokeA(orient * R4, param.E3).addSegStrokeA(orient * R4, 0).closeSegStroke();
@@ -3587,9 +3645,9 @@ var pDef11 = {
   partName: "pole_rotor",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber11("D1", "mm", 600, 100, 4e3, 10),
-    pNumber11("D2", "mm", 400, 100, 4e3, 10),
-    pNumber11("H1", "mm", 8e3, 100, 4e4, 10),
+    pNumber11("D1", "mm", 600, 1, 4e3, 1),
+    pNumber11("D2", "mm", 400, 1, 4e3, 1),
+    pNumber11("H1", "mm", 8e3, 10, 4e4, 10),
     pNumber11("E1", "mm", 5, 1, 80, 1),
     pNumber11("E2", "mm", 30, 1, 80, 1),
     pNumber11("N1", "", 24, 3, 100, 1),
@@ -3874,10 +3932,10 @@ var pDef13 = {
   partName: "trapeze",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber13("L1", "mm", 1600, 100, 4e3, 10),
-    pNumber13("L2", "mm", 1e3, 100, 4e3, 10),
-    pNumber13("L3", "mm", 400, 5, 800, 5),
-    pNumber13("L4", "mm", 300, 5, 800, 5),
+    pNumber13("L1", "mm", 1600, 10, 4e3, 1),
+    pNumber13("L2", "mm", 1e3, 10, 4e3, 1),
+    pNumber13("L3", "mm", 400, 5, 800, 1),
+    pNumber13("L4", "mm", 300, 5, 800, 1),
     pNumber13("N1", "", 7, 1, 20, 1),
     pNumber13("N2", "", 4, 1, 20, 1),
     pNumber13("N3", "", 2, 1, 20, 1),
@@ -3885,10 +3943,10 @@ var pDef13 = {
     pNumber13("L5", "mm", 100, 1, 400, 1),
     pNumber13("L6", "mm", 20, 1, 400, 1),
     pNumber13("L7", "mm", 20, 1, 400, 1),
-    pNumber13("D1", "mm", 10, 1, 40, 10),
-    pNumber13("D2", "mm", 10, 1, 40, 10),
-    pNumber13("D3", "mm", 30, 1, 100, 10),
-    pNumber13("D4", "mm", 26, 1, 100, 10),
+    pNumber13("D1", "mm", 10, 1, 40, 1),
+    pNumber13("D2", "mm", 10, 1, 40, 1),
+    pNumber13("D3", "mm", 30, 1, 100, 1),
+    pNumber13("D4", "mm", 26, 1, 100, 1),
     pNumber13("R1", "mm", 60, 1, 400, 1),
     pNumber13("R2", "mm", 20, 1, 400, 1),
     pNumber13("R3", "mm", 20, 1, 400, 1),

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "designix",
-	"version": "0.5.21",
+	"version": "0.5.22",
 	"description": "The first designs made with parametrix",
 	"private": false,
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/charlyoleg2/parametrix.git"
 	},
-	"homepage": "https://github.com/charlyoleg2/parametrix/tree/main/pkg/designix#readme",
+	"homepage": "https://charlyoleg2.github.io/parametrix/",
 	"keywords": [
 		"cad",
 		"programmatic",
@@ -49,12 +49,12 @@
 		"clean": "shx rm -fr dist dist2 node_modules"
 	},
 	"dependencies": {
-		"geometrix": "^0.5.16"
+		"geometrix": "^0.5.20"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
-		"esbuild": "^0.20.0",
+		"esbuild": "^0.20.1",
 		"eslint": "^8.56.0",
 		"eslint-config-prettier": "^9.1.0",
 		"npm-run-all": "^4.1.5",
@@ -63,7 +63,7 @@
 		"svgo": "^3.2.0",
 		"tsup": "^8.0.2",
 		"typescript": "^5.3.3",
-		"vitest": "^1.3.0"
+		"vitest": "^1.3.1"
 	},
 	"exports": {
 		".": {