diff --git a/README.md b/README.md
index 0a78c948474e700bf3c7ff0787567f6824f3a0a9..e214e7f52c9665ff92f5fccd523af6c2fb477de2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# RobertsFlow
-We follow Charbonneau for sulutions to this dynamo and check for alternative flows.
+We follow Charbonneau for solutions to this dynamo and check for alternative flows.
In Julia.
## Getting started
@@ -10,9 +10,6 @@ Already a pro? Just edit this README.md and make it your own. Want to make it ea
-->
## Checkout project
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
```
cd existing_repo
git remote add origin https://gitlab.cosma.dur.ac.uk/fastasyszyn/RobertsFlow.git
diff --git a/RobTry.ipynb b/RobTry.ipynb
index b4b108b825ca04afbba0ee490753622f4205b344..e07f0b85780c664b4c681720092dc1321108797a 100644
--- a/RobTry.ipynb
+++ b/RobTry.ipynb
@@ -2,27 +2,10 @@
"cells": [
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": null,
"id": "3f0e0a63-5d32-440c-9e89-815ed0aa1008",
"metadata": {},
- "outputs": [
- {
- "ename": "LoadError",
- "evalue": "ArgumentError: Package DifferentialEquations not found in current path.\n- Run `import Pkg; Pkg.add(\"DifferentialEquations\")` to install the DifferentialEquations package.",
- "output_type": "error",
- "traceback": [
- "ArgumentError: Package DifferentialEquations not found in current path.\n- Run `import Pkg; Pkg.add(\"DifferentialEquations\")` to install the DifferentialEquations package.",
- "",
- "Stacktrace:",
- " [1] macro expansion",
- " @ ./loading.jl:1163 [inlined]",
- " [2] macro expansion",
- " @ ./lock.jl:223 [inlined]",
- " [3] require(into::Module, mod::Symbol)",
- " @ Base ./loading.jl:1144"
- ]
- }
- ],
+ "outputs": [],
"source": [
"using Plots\n",
"gr()\n",
@@ -31,102 +14,114 @@
},
{
"cell_type": "code",
- "execution_count": 10,
+ "execution_count": null,
+ "id": "2ec180b2-2b58-49b1-9af7-be67bc0ef114",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "#Basic Roberts Flow\n",
+ "#Add the 2/3 Dimention dependence \n",
+ "#function RobFlow(x :: Float64, y :: Float64)\n",
+ "function RobFlow(x, y)\n",
+ "\n",
+ " fx = cos(y)\n",
+ " fy = -sin(x)\n",
+ " fz = cos(x)+sin(y)\n",
+ " (Dict(:x=>fx, :y=>fy, :z=>fz))\n",
+ "end\n",
+ "\n",
+ "function MakeMat(Nmax=32; Lmax=2.0*pi)\n",
+ " \n",
+ " dx= Lmax/Nmax\n",
+ " #CHECK CHECK maybe wrong dx in range\n",
+ " x = range(dx/2.0, Lmax-dx/2.0, length=Nmax)\n",
+ " y = range(dx/2.0, Lmax-dx/2.0, length=Nmax)\n",
+ " A = zeros((Nmax, Nmax))\n",
+ " B = zeros((Nmax, Nmax))\n",
+ " C = zeros((Nmax, Nmax))\n",
+ " \n",
+ " (Dict(:Nmax=>Nmax, :Lmax=>Lmax, :x=>x, :y=>y, :Mx=>A, :My=>B, :Mz=>C))\n",
+ "end\n",
+ "\n",
+ "function FillMat(Mat)\n",
+ " for ix in 1:Mat[:Nmax]\n",
+ " for iy in 1:Mat[:Nmax]\n",
+ " TT=RobFlow(Mat[:x][ix],Mat[:y][iy])\n",
+ " Mat[:Mx][ix,iy]=TT[:x]\n",
+ " Mat[:My][ix,iy]=TT[:y]\n",
+ " Mat[:Mz][ix,iy]=TT[:z]\n",
+ " end\n",
+ " end\n",
+ "end"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
"id": "fdeb6d37-1e7d-4697-b0e7-bc53ea06dc4b",
"metadata": {},
- "outputs": [
- {
- "data": {
- "image/svg+xml": [
- "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n",
- "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"600\" height=\"400\" viewBox=\"0 0 2400 1600\">\n",
- "<defs>\n",
- " <clipPath id=\"clip730\">\n",
- " <rect x=\"0\" y=\"0\" width=\"2400\" height=\"1600\"/>\n",
- " </clipPath>\n",
- "</defs>\n",
- "<path clip-path=\"url(#clip730)\" d=\"M0 1600 L2400 1600 L2400 0 L0 0 Z\" fill=\"#ffffff\" fill-rule=\"evenodd\" fill-opacity=\"1\"/>\n",
- "<defs>\n",
- " <clipPath id=\"clip731\">\n",
- " <rect x=\"480\" y=\"0\" width=\"1681\" height=\"1600\"/>\n",
- " </clipPath>\n",
- "</defs>\n",
- "<path clip-path=\"url(#clip730)\" d=\"M110.881 1486.45 L2112.76 1486.45 L2112.76 47.2441 L110.881 47.2441 Z\" fill=\"#ffffff\" fill-rule=\"evenodd\" fill-opacity=\"1\"/>\n",
- "<defs>\n",
- " <clipPath id=\"clip732\">\n",
- " <rect x=\"110\" y=\"47\" width=\"2003\" height=\"1440\"/>\n",
- " </clipPath>\n",
- "</defs>\n",
- "<polyline clip-path=\"url(#clip732)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:2; stroke-opacity:0.1; fill:none\" points=\"110.881,1486.45 110.881,47.2441 \"/>\n",
- "<polyline clip-path=\"url(#clip732)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:2; stroke-opacity:0.1; fill:none\" points=\"748.421,1486.45 748.421,47.2441 \"/>\n",
- "<polyline clip-path=\"url(#clip732)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:2; stroke-opacity:0.1; fill:none\" points=\"1385.96,1486.45 1385.96,47.2441 \"/>\n",
- "<polyline clip-path=\"url(#clip732)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:2; stroke-opacity:0.1; fill:none\" points=\"2023.5,1486.45 2023.5,47.2441 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"110.881,1486.45 2112.76,1486.45 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"110.881,1486.45 110.881,1467.55 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"748.421,1486.45 748.421,1467.55 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"1385.96,1486.45 1385.96,1467.55 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2023.5,1486.45 2023.5,1467.55 \"/>\n",
- "<path clip-path=\"url(#clip730)\" d=\"M110.881 1517.37 Q107.27 1517.37 105.441 1520.93 Q103.636 1524.47 103.636 1531.6 Q103.636 1538.71 105.441 1542.27 Q107.27 1545.82 110.881 1545.82 Q114.515 1545.82 116.321 1542.27 Q118.149 1538.71 118.149 1531.6 Q118.149 1524.47 116.321 1520.93 Q114.515 1517.37 110.881 1517.37 M110.881 1513.66 Q116.691 1513.66 119.747 1518.27 Q122.825 1522.85 122.825 1531.6 Q122.825 1540.33 119.747 1544.94 Q116.691 1549.52 110.881 1549.52 Q105.071 1549.52 101.992 1544.94 Q98.9365 1540.33 98.9365 1531.6 Q98.9365 1522.85 101.992 1518.27 Q105.071 1513.66 110.881 1513.66 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M738.803 1544.91 L746.442 1544.91 L746.442 1518.55 L738.131 1520.21 L738.131 1515.95 L746.395 1514.29 L751.071 1514.29 L751.071 1544.91 L758.71 1544.91 L758.71 1548.85 L738.803 1548.85 L738.803 1544.91 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M1380.61 1544.91 L1396.93 1544.91 L1396.93 1548.85 L1374.99 1548.85 L1374.99 1544.91 Q1377.65 1542.16 1382.23 1537.53 Q1386.84 1532.88 1388.02 1531.53 Q1390.27 1529.01 1391.15 1527.27 Q1392.05 1525.51 1392.05 1523.82 Q1392.05 1521.07 1390.1 1519.33 Q1388.18 1517.6 1385.08 1517.6 Q1382.88 1517.6 1380.43 1518.36 Q1378 1519.13 1375.22 1520.68 L1375.22 1515.95 Q1378.04 1514.82 1380.5 1514.24 Q1382.95 1513.66 1384.99 1513.66 Q1390.36 1513.66 1393.55 1516.35 Q1396.75 1519.03 1396.75 1523.52 Q1396.75 1525.65 1395.94 1527.57 Q1395.15 1529.47 1393.04 1532.07 Q1392.47 1532.74 1389.36 1535.95 Q1386.26 1539.15 1380.61 1544.91 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2027.75 1530.21 Q2031.1 1530.93 2032.98 1533.2 Q2034.88 1535.47 2034.88 1538.8 Q2034.88 1543.92 2031.36 1546.72 Q2027.84 1549.52 2021.36 1549.52 Q2019.18 1549.52 2016.87 1549.08 Q2014.58 1548.66 2012.12 1547.81 L2012.12 1543.29 Q2014.07 1544.43 2016.38 1545.01 Q2018.7 1545.58 2021.22 1545.58 Q2025.62 1545.58 2027.91 1543.85 Q2030.22 1542.11 2030.22 1538.8 Q2030.22 1535.75 2028.07 1534.03 Q2025.94 1532.3 2022.12 1532.3 L2018.1 1532.3 L2018.1 1528.45 L2022.31 1528.45 Q2025.76 1528.45 2027.59 1527.09 Q2029.41 1525.7 2029.41 1523.11 Q2029.41 1520.45 2027.52 1519.03 Q2025.64 1517.6 2022.12 1517.6 Q2020.2 1517.6 2018 1518.01 Q2015.8 1518.43 2013.16 1519.31 L2013.16 1515.14 Q2015.83 1514.4 2018.14 1514.03 Q2020.48 1513.66 2022.54 1513.66 Q2027.86 1513.66 2030.97 1516.09 Q2034.07 1518.5 2034.07 1522.62 Q2034.07 1525.49 2032.42 1527.48 Q2030.78 1529.45 2027.75 1530.21 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><polyline clip-path=\"url(#clip732)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:2; stroke-opacity:0.1; fill:none\" points=\"110.881,1486.45 2112.76,1486.45 \"/>\n",
- "<polyline clip-path=\"url(#clip732)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:2; stroke-opacity:0.1; fill:none\" points=\"110.881,1028.1 2112.76,1028.1 \"/>\n",
- "<polyline clip-path=\"url(#clip732)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:2; stroke-opacity:0.1; fill:none\" points=\"110.881,569.758 2112.76,569.758 \"/>\n",
- "<polyline clip-path=\"url(#clip732)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:2; stroke-opacity:0.1; fill:none\" points=\"110.881,111.412 2112.76,111.412 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"110.881,1486.45 110.881,47.2441 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"110.881,1486.45 127.755,1486.45 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"110.881,1028.1 127.755,1028.1 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"110.881,569.758 127.755,569.758 \"/>\n",
- "<polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"110.881,111.412 127.755,111.412 \"/>\n",
- "<path clip-path=\"url(#clip730)\" d=\"M62.9365 1472.25 Q59.3254 1472.25 57.4967 1475.81 Q55.6912 1479.35 55.6912 1486.48 Q55.6912 1493.59 57.4967 1497.15 Q59.3254 1500.7 62.9365 1500.7 Q66.5707 1500.7 68.3763 1497.15 Q70.205 1493.59 70.205 1486.48 Q70.205 1479.35 68.3763 1475.81 Q66.5707 1472.25 62.9365 1472.25 M62.9365 1468.54 Q68.7467 1468.54 71.8022 1473.15 Q74.8809 1477.73 74.8809 1486.48 Q74.8809 1495.21 71.8022 1499.82 Q68.7467 1504.4 62.9365 1504.4 Q57.1264 1504.4 54.0477 1499.82 Q50.9921 1495.21 50.9921 1486.48 Q50.9921 1477.73 54.0477 1473.15 Q57.1264 1468.54 62.9365 1468.54 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M54.9736 1041.45 L62.6124 1041.45 L62.6124 1015.08 L54.3023 1016.75 L54.3023 1012.49 L62.5661 1010.82 L67.242 1010.82 L67.242 1041.45 L74.8809 1041.45 L74.8809 1045.38 L54.9736 1045.38 L54.9736 1041.45 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M58.5615 583.102 L74.8809 583.102 L74.8809 587.038 L52.9366 587.038 L52.9366 583.102 Q55.5986 580.348 60.1819 575.718 Q64.7883 571.065 65.9689 569.723 Q68.2143 567.2 69.0939 565.464 Q69.9967 563.704 69.9967 562.015 Q69.9967 559.26 68.0522 557.524 Q66.1309 555.788 63.0291 555.788 Q60.83 555.788 58.3763 556.552 Q55.9458 557.316 53.168 558.866 L53.168 554.144 Q55.9921 553.01 58.4458 552.431 Q60.8995 551.853 62.9365 551.853 Q68.3068 551.853 71.5013 554.538 Q74.6957 557.223 74.6957 561.714 Q74.6957 563.843 73.8855 565.765 Q73.0985 567.663 70.992 570.255 Q70.4133 570.927 67.3115 574.144 Q64.2096 577.339 58.5615 583.102 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M67.7513 110.058 Q71.1078 110.776 72.9827 113.044 Q74.8809 115.313 74.8809 118.646 Q74.8809 123.762 71.3624 126.563 Q67.8439 129.364 61.3624 129.364 Q59.1865 129.364 56.8717 128.924 Q54.5801 128.507 52.1264 127.651 L52.1264 123.137 Q54.0708 124.271 56.3856 124.85 Q58.7004 125.429 61.2236 125.429 Q65.6217 125.429 67.9133 123.692 Q70.2281 121.956 70.2281 118.646 Q70.2281 115.591 68.0754 113.878 Q65.9457 112.142 62.1263 112.142 L58.0986 112.142 L58.0986 108.299 L62.3115 108.299 Q65.7606 108.299 67.5893 106.933 Q69.418 105.544 69.418 102.952 Q69.418 100.29 67.5198 98.8778 Q65.6448 97.4426 62.1263 97.4426 Q60.205 97.4426 58.006 97.8592 Q55.8069 98.2759 53.168 99.1555 L53.168 94.9889 Q55.8301 94.2482 58.1449 93.8778 Q60.4828 93.5074 62.543 93.5074 Q67.867 93.5074 70.9689 95.938 Q74.0707 98.3454 74.0707 102.466 Q74.0707 105.336 72.4272 107.327 Q70.7837 109.294 67.7513 110.058 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><defs>\n",
- " <clipPath id=\"clip733\">\n",
- " <rect x=\"2160\" y=\"47\" width=\"73\" height=\"1440\"/>\n",
- " </clipPath>\n",
- "</defs>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#0a0723; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,1396.5 2232.76,1396.5 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#200c4a; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,1306.55 2232.76,1306.55 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#3c0965; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,1216.6 2232.76,1216.6 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#570f6d; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,1126.65 2232.76,1126.65 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#70196e; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,1036.7 2232.76,1036.7 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#892269; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,946.746 2232.76,946.746 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#a32b61; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,856.796 2232.76,856.796 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#bb3754; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,766.846 2232.76,766.846 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#d04544; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,676.896 2232.76,676.896 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#e35832; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,586.946 2232.76,586.946 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#f0701e; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,496.995 2232.76,496.995 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#f98c09; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,407.045 2232.76,407.045 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#fbaa0e; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,317.095 2232.76,317.095 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#f8c931; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,227.145 2232.76,227.145 \"/>\n",
- "<polyline clip-path=\"url(#clip733)\" style=\"stroke:#f1e864; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2160.76,137.194 2232.76,137.194 \"/>\n",
- "<path clip-path=\"url(#clip730)\" d=\"M2268.76 1335.08 L2298.43 1335.08 L2298.43 1339.01 L2268.76 1339.01 L2268.76 1335.08 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2318.52 1320.42 Q2314.91 1320.42 2313.08 1323.99 Q2311.28 1327.53 2311.28 1334.66 Q2311.28 1341.77 2313.08 1345.33 Q2314.91 1348.87 2318.52 1348.87 Q2322.16 1348.87 2323.96 1345.33 Q2325.79 1341.77 2325.79 1334.66 Q2325.79 1327.53 2323.96 1323.99 Q2322.16 1320.42 2318.52 1320.42 M2318.52 1316.72 Q2324.33 1316.72 2327.39 1321.33 Q2330.47 1325.91 2330.47 1334.66 Q2330.47 1343.39 2327.39 1347.99 Q2324.33 1352.58 2318.52 1352.58 Q2312.71 1352.58 2309.64 1347.99 Q2306.58 1343.39 2306.58 1334.66 Q2306.58 1325.91 2309.64 1321.33 Q2312.71 1316.72 2318.52 1316.72 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2338.69 1346.03 L2343.57 1346.03 L2343.57 1351.91 L2338.69 1351.91 L2338.69 1346.03 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2352.57 1317.35 L2374.8 1317.35 L2374.8 1319.34 L2362.25 1351.91 L2357.37 1351.91 L2369.17 1321.28 L2352.57 1321.28 L2352.57 1317.35 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2383.96 1317.35 L2402.32 1317.35 L2402.32 1321.28 L2388.25 1321.28 L2388.25 1329.75 Q2389.26 1329.41 2390.28 1329.24 Q2391.3 1329.06 2392.32 1329.06 Q2398.11 1329.06 2401.49 1332.23 Q2404.87 1335.4 2404.87 1340.82 Q2404.87 1346.4 2401.39 1349.5 Q2397.92 1352.58 2391.6 1352.58 Q2389.43 1352.58 2387.16 1352.21 Q2384.91 1351.84 2382.51 1351.1 L2382.51 1346.4 Q2384.59 1347.53 2386.81 1348.09 Q2389.03 1348.64 2391.51 1348.64 Q2395.51 1348.64 2397.85 1346.53 Q2400.19 1344.43 2400.19 1340.82 Q2400.19 1337.21 2397.85 1335.1 Q2395.51 1332.99 2391.51 1332.99 Q2389.63 1332.99 2387.76 1333.41 Q2385.91 1333.83 2383.96 1334.71 L2383.96 1317.35 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2268.76 1185.93 L2298.43 1185.93 L2298.43 1189.87 L2268.76 1189.87 L2268.76 1185.93 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2318.52 1171.28 Q2314.91 1171.28 2313.08 1174.84 Q2311.28 1178.39 2311.28 1185.52 Q2311.28 1192.62 2313.08 1196.19 Q2314.91 1199.73 2318.52 1199.73 Q2322.16 1199.73 2323.96 1196.19 Q2325.79 1192.62 2325.79 1185.52 Q2325.79 1178.39 2323.96 1174.84 Q2322.16 1171.28 2318.52 1171.28 M2318.52 1167.58 Q2324.33 1167.58 2327.39 1172.18 Q2330.47 1176.77 2330.47 1185.52 Q2330.47 1194.24 2327.39 1198.85 Q2324.33 1203.43 2318.52 1203.43 Q2312.71 1203.43 2309.64 1198.85 Q2306.58 1194.24 2306.58 1185.52 Q2306.58 1176.77 2309.64 1172.18 Q2312.71 1167.58 2318.52 1167.58 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2338.69 1196.88 L2343.57 1196.88 L2343.57 1202.76 L2338.69 1202.76 L2338.69 1196.88 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2353.8 1168.2 L2372.16 1168.2 L2372.16 1172.14 L2358.08 1172.14 L2358.08 1180.61 Q2359.1 1180.26 2360.12 1180.1 Q2361.14 1179.91 2362.16 1179.91 Q2367.95 1179.91 2371.32 1183.08 Q2374.7 1186.26 2374.7 1191.67 Q2374.7 1197.25 2371.23 1200.35 Q2367.76 1203.43 2361.44 1203.43 Q2359.26 1203.43 2357 1203.06 Q2354.75 1202.69 2352.34 1201.95 L2352.34 1197.25 Q2354.43 1198.39 2356.65 1198.94 Q2358.87 1199.5 2361.35 1199.5 Q2365.35 1199.5 2367.69 1197.39 Q2370.03 1195.28 2370.03 1191.67 Q2370.03 1188.06 2367.69 1185.96 Q2365.35 1183.85 2361.35 1183.85 Q2359.47 1183.85 2357.6 1184.27 Q2355.75 1184.68 2353.8 1185.56 L2353.8 1168.2 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2393.92 1171.28 Q2390.31 1171.28 2388.48 1174.84 Q2386.67 1178.39 2386.67 1185.52 Q2386.67 1192.62 2388.48 1196.19 Q2390.31 1199.73 2393.92 1199.73 Q2397.55 1199.73 2399.36 1196.19 Q2401.19 1192.62 2401.19 1185.52 Q2401.19 1178.39 2399.36 1174.84 Q2397.55 1171.28 2393.92 1171.28 M2393.92 1167.58 Q2399.73 1167.58 2402.78 1172.18 Q2405.86 1176.77 2405.86 1185.52 Q2405.86 1194.24 2402.78 1198.85 Q2399.73 1203.43 2393.92 1203.43 Q2388.11 1203.43 2385.03 1198.85 Q2381.97 1194.24 2381.97 1185.52 Q2381.97 1176.77 2385.03 1172.18 Q2388.11 1167.58 2393.92 1167.58 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2268.76 1036.79 L2298.43 1036.79 L2298.43 1040.72 L2268.76 1040.72 L2268.76 1036.79 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2318.52 1022.13 Q2314.91 1022.13 2313.08 1025.7 Q2311.28 1029.24 2311.28 1036.37 Q2311.28 1043.48 2313.08 1047.04 Q2314.91 1050.58 2318.52 1050.58 Q2322.16 1050.58 2323.96 1047.04 Q2325.79 1043.48 2325.79 1036.37 Q2325.79 1029.24 2323.96 1025.7 Q2322.16 1022.13 2318.52 1022.13 M2318.52 1018.43 Q2324.33 1018.43 2327.39 1023.04 Q2330.47 1027.62 2330.47 1036.37 Q2330.47 1045.1 2327.39 1049.7 Q2324.33 1054.29 2318.52 1054.29 Q2312.71 1054.29 2309.64 1049.7 Q2306.58 1045.1 2306.58 1036.37 Q2306.58 1027.62 2309.64 1023.04 Q2312.71 1018.43 2318.52 1018.43 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2338.69 1047.74 L2343.57 1047.74 L2343.57 1053.62 L2338.69 1053.62 L2338.69 1047.74 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2357.78 1049.68 L2374.1 1049.68 L2374.1 1053.62 L2352.16 1053.62 L2352.16 1049.68 Q2354.82 1046.93 2359.4 1042.3 Q2364.01 1037.64 2365.19 1036.3 Q2367.44 1033.78 2368.32 1032.04 Q2369.22 1030.28 2369.22 1028.59 Q2369.22 1025.84 2367.27 1024.1 Q2365.35 1022.37 2362.25 1022.37 Q2360.05 1022.37 2357.6 1023.13 Q2355.17 1023.89 2352.39 1025.44 L2352.39 1020.72 Q2355.21 1019.59 2357.67 1019.01 Q2360.12 1018.43 2362.16 1018.43 Q2367.53 1018.43 2370.72 1021.12 Q2373.92 1023.8 2373.92 1028.29 Q2373.92 1030.42 2373.11 1032.34 Q2372.32 1034.24 2370.21 1036.83 Q2369.63 1037.5 2366.53 1040.72 Q2363.43 1043.92 2357.78 1049.68 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2383.96 1019.06 L2402.32 1019.06 L2402.32 1022.99 L2388.25 1022.99 L2388.25 1031.46 Q2389.26 1031.12 2390.28 1030.95 Q2391.3 1030.77 2392.32 1030.77 Q2398.11 1030.77 2401.49 1033.94 Q2404.87 1037.11 2404.87 1042.53 Q2404.87 1048.11 2401.39 1051.21 Q2397.92 1054.29 2391.6 1054.29 Q2389.43 1054.29 2387.16 1053.92 Q2384.91 1053.55 2382.51 1052.81 L2382.51 1048.11 Q2384.59 1049.24 2386.81 1049.8 Q2389.03 1050.35 2391.51 1050.35 Q2395.51 1050.35 2397.85 1048.25 Q2400.19 1046.14 2400.19 1042.53 Q2400.19 1038.92 2397.85 1036.81 Q2395.51 1034.7 2391.51 1034.7 Q2389.63 1034.7 2387.76 1035.12 Q2385.91 1035.54 2383.96 1036.42 L2383.96 1019.06 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2280.7 872.99 Q2277.09 872.99 2275.26 876.555 Q2273.45 880.096 2273.45 887.226 Q2273.45 894.332 2275.26 897.897 Q2277.09 901.439 2280.7 901.439 Q2284.33 901.439 2286.14 897.897 Q2287.97 894.332 2287.97 887.226 Q2287.97 880.096 2286.14 876.555 Q2284.33 872.99 2280.7 872.99 M2280.7 869.286 Q2286.51 869.286 2289.57 873.893 Q2292.64 878.476 2292.64 887.226 Q2292.64 895.953 2289.57 900.559 Q2286.51 905.143 2280.7 905.143 Q2274.89 905.143 2271.81 900.559 Q2268.76 895.953 2268.76 887.226 Q2268.76 878.476 2271.81 873.893 Q2274.89 869.286 2280.7 869.286 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2280.7 723.845 Q2277.09 723.845 2275.26 727.41 Q2273.45 730.952 2273.45 738.081 Q2273.45 745.188 2275.26 748.753 Q2277.09 752.294 2280.7 752.294 Q2284.33 752.294 2286.14 748.753 Q2287.97 745.188 2287.97 738.081 Q2287.97 730.952 2286.14 727.41 Q2284.33 723.845 2280.7 723.845 M2280.7 720.142 Q2286.51 720.142 2289.57 724.748 Q2292.64 729.331 2292.64 738.081 Q2292.64 746.808 2289.57 751.415 Q2286.51 755.998 2280.7 755.998 Q2274.89 755.998 2271.81 751.415 Q2268.76 746.808 2268.76 738.081 Q2268.76 729.331 2271.81 724.748 Q2274.89 720.142 2280.7 720.142 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2300.86 749.447 L2305.75 749.447 L2305.75 755.327 L2300.86 755.327 L2300.86 749.447 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2319.96 751.391 L2336.28 751.391 L2336.28 755.327 L2314.33 755.327 L2314.33 751.391 Q2317 748.637 2321.58 744.007 Q2326.19 739.354 2327.37 738.012 Q2329.61 735.489 2330.49 733.753 Q2331.39 731.993 2331.39 730.304 Q2331.39 727.549 2329.45 725.813 Q2327.53 724.077 2324.43 724.077 Q2322.23 724.077 2319.77 724.841 Q2317.34 725.605 2314.57 727.155 L2314.57 722.433 Q2317.39 721.299 2319.84 720.72 Q2322.3 720.142 2324.33 720.142 Q2329.7 720.142 2332.9 722.827 Q2336.09 725.512 2336.09 730.003 Q2336.09 732.132 2335.28 734.054 Q2334.5 735.952 2332.39 738.544 Q2331.81 739.216 2328.71 742.433 Q2325.61 745.628 2319.96 751.391 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2346.14 720.767 L2364.5 720.767 L2364.5 724.702 L2350.42 724.702 L2350.42 733.174 Q2351.44 732.827 2352.46 732.665 Q2353.48 732.479 2354.5 732.479 Q2360.28 732.479 2363.66 735.651 Q2367.04 738.822 2367.04 744.239 Q2367.04 749.817 2363.57 752.919 Q2360.1 755.998 2353.78 755.998 Q2351.6 755.998 2349.33 755.628 Q2347.09 755.257 2344.68 754.516 L2344.68 749.817 Q2346.76 750.952 2348.99 751.507 Q2351.21 752.063 2353.69 752.063 Q2357.69 752.063 2360.03 749.956 Q2362.37 747.85 2362.37 744.239 Q2362.37 740.628 2360.03 738.521 Q2357.69 736.415 2353.69 736.415 Q2351.81 736.415 2349.94 736.831 Q2348.08 737.248 2346.14 738.128 L2346.14 720.767 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2280.7 574.701 Q2277.09 574.701 2275.26 578.265 Q2273.45 581.807 2273.45 588.937 Q2273.45 596.043 2275.26 599.608 Q2277.09 603.15 2280.7 603.15 Q2284.33 603.15 2286.14 599.608 Q2287.97 596.043 2287.97 588.937 Q2287.97 581.807 2286.14 578.265 Q2284.33 574.701 2280.7 574.701 M2280.7 570.997 Q2286.51 570.997 2289.57 575.603 Q2292.64 580.187 2292.64 588.937 Q2292.64 597.663 2289.57 602.27 Q2286.51 606.853 2280.7 606.853 Q2274.89 606.853 2271.81 602.27 Q2268.76 597.663 2268.76 588.937 Q2268.76 580.187 2271.81 575.603 Q2274.89 570.997 2280.7 570.997 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2300.86 600.302 L2305.75 600.302 L2305.75 606.182 L2300.86 606.182 L2300.86 600.302 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2315.98 571.622 L2334.33 571.622 L2334.33 575.557 L2320.26 575.557 L2320.26 584.029 Q2321.28 583.682 2322.3 583.52 Q2323.32 583.335 2324.33 583.335 Q2330.12 583.335 2333.5 586.506 Q2336.88 589.677 2336.88 595.094 Q2336.88 600.673 2333.41 603.775 Q2329.94 606.853 2323.62 606.853 Q2321.44 606.853 2319.17 606.483 Q2316.93 606.112 2314.52 605.372 L2314.52 600.673 Q2316.6 601.807 2318.83 602.362 Q2321.05 602.918 2323.52 602.918 Q2327.53 602.918 2329.87 600.812 Q2332.2 598.705 2332.2 595.094 Q2332.2 591.483 2329.87 589.376 Q2327.53 587.27 2323.52 587.27 Q2321.65 587.27 2319.77 587.687 Q2317.92 588.103 2315.98 588.983 L2315.98 571.622 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2356.09 574.701 Q2352.48 574.701 2350.65 578.265 Q2348.85 581.807 2348.85 588.937 Q2348.85 596.043 2350.65 599.608 Q2352.48 603.15 2356.09 603.15 Q2359.73 603.15 2361.53 599.608 Q2363.36 596.043 2363.36 588.937 Q2363.36 581.807 2361.53 578.265 Q2359.73 574.701 2356.09 574.701 M2356.09 570.997 Q2361.9 570.997 2364.96 575.603 Q2368.04 580.187 2368.04 588.937 Q2368.04 597.663 2364.96 602.27 Q2361.9 606.853 2356.09 606.853 Q2350.28 606.853 2347.2 602.27 Q2344.15 597.663 2344.15 588.937 Q2344.15 580.187 2347.2 575.603 Q2350.28 570.997 2356.09 570.997 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2280.7 425.556 Q2277.09 425.556 2275.26 429.121 Q2273.45 432.662 2273.45 439.792 Q2273.45 446.898 2275.26 450.463 Q2277.09 454.005 2280.7 454.005 Q2284.33 454.005 2286.14 450.463 Q2287.97 446.898 2287.97 439.792 Q2287.97 432.662 2286.14 429.121 Q2284.33 425.556 2280.7 425.556 M2280.7 421.852 Q2286.51 421.852 2289.57 426.459 Q2292.64 431.042 2292.64 439.792 Q2292.64 448.519 2289.57 453.125 Q2286.51 457.709 2280.7 457.709 Q2274.89 457.709 2271.81 453.125 Q2268.76 448.519 2268.76 439.792 Q2268.76 431.042 2271.81 426.459 Q2274.89 421.852 2280.7 421.852 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2300.86 451.158 L2305.75 451.158 L2305.75 457.037 L2300.86 457.037 L2300.86 451.158 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2314.75 422.477 L2336.97 422.477 L2336.97 424.468 L2324.43 457.037 L2319.54 457.037 L2331.35 426.412 L2314.75 426.412 L2314.75 422.477 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2346.14 422.477 L2364.5 422.477 L2364.5 426.412 L2350.42 426.412 L2350.42 434.885 Q2351.44 434.537 2352.46 434.375 Q2353.48 434.19 2354.5 434.19 Q2360.28 434.19 2363.66 437.361 Q2367.04 440.533 2367.04 445.949 Q2367.04 451.528 2363.57 454.63 Q2360.1 457.709 2353.78 457.709 Q2351.6 457.709 2349.33 457.338 Q2347.09 456.968 2344.68 456.227 L2344.68 451.528 Q2346.76 452.662 2348.99 453.218 Q2351.21 453.773 2353.69 453.773 Q2357.69 453.773 2360.03 451.667 Q2362.37 449.56 2362.37 445.949 Q2362.37 442.338 2360.03 440.232 Q2357.69 438.125 2353.69 438.125 Q2351.81 438.125 2349.94 438.542 Q2348.08 438.959 2346.14 439.838 L2346.14 422.477 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2269.43 303.957 L2277.07 303.957 L2277.07 277.592 L2268.76 279.258 L2268.76 274.999 L2277.02 273.333 L2281.7 273.333 L2281.7 303.957 L2289.33 303.957 L2289.33 307.893 L2269.43 307.893 L2269.43 303.957 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2298.78 302.013 L2303.66 302.013 L2303.66 307.893 L2298.78 307.893 L2298.78 302.013 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2323.85 276.411 Q2320.24 276.411 2318.41 279.976 Q2316.6 283.518 2316.6 290.647 Q2316.6 297.754 2318.41 301.319 Q2320.24 304.86 2323.85 304.86 Q2327.48 304.86 2329.29 301.319 Q2331.12 297.754 2331.12 290.647 Q2331.12 283.518 2329.29 279.976 Q2327.48 276.411 2323.85 276.411 M2323.85 272.708 Q2329.66 272.708 2332.71 277.314 Q2335.79 281.897 2335.79 290.647 Q2335.79 299.374 2332.71 303.981 Q2329.66 308.564 2323.85 308.564 Q2318.04 308.564 2314.96 303.981 Q2311.9 299.374 2311.9 290.647 Q2311.9 281.897 2314.96 277.314 Q2318.04 272.708 2323.85 272.708 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2354.01 276.411 Q2350.4 276.411 2348.57 279.976 Q2346.76 283.518 2346.76 290.647 Q2346.76 297.754 2348.57 301.319 Q2350.4 304.86 2354.01 304.86 Q2357.64 304.86 2359.45 301.319 Q2361.28 297.754 2361.28 290.647 Q2361.28 283.518 2359.45 279.976 Q2357.64 276.411 2354.01 276.411 M2354.01 272.708 Q2359.82 272.708 2362.88 277.314 Q2365.95 281.897 2365.95 290.647 Q2365.95 299.374 2362.88 303.981 Q2359.82 308.564 2354.01 308.564 Q2348.2 308.564 2345.12 303.981 Q2342.07 299.374 2342.07 290.647 Q2342.07 281.897 2345.12 277.314 Q2348.2 272.708 2354.01 272.708 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2269.43 154.813 L2277.07 154.813 L2277.07 128.447 L2268.76 130.114 L2268.76 125.855 L2277.02 124.188 L2281.7 124.188 L2281.7 154.813 L2289.33 154.813 L2289.33 158.748 L2269.43 158.748 L2269.43 154.813 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2298.78 152.868 L2303.66 152.868 L2303.66 158.748 L2298.78 158.748 L2298.78 152.868 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2317.88 154.813 L2334.2 154.813 L2334.2 158.748 L2312.25 158.748 L2312.25 154.813 Q2314.91 152.058 2319.5 147.429 Q2324.1 142.776 2325.28 141.433 Q2327.53 138.91 2328.41 137.174 Q2329.31 135.415 2329.31 133.725 Q2329.31 130.97 2327.37 129.234 Q2325.45 127.498 2322.34 127.498 Q2320.14 127.498 2317.69 128.262 Q2315.26 129.026 2312.48 130.577 L2312.48 125.855 Q2315.31 124.72 2317.76 124.142 Q2320.21 123.563 2322.25 123.563 Q2327.62 123.563 2330.82 126.248 Q2334.01 128.933 2334.01 133.424 Q2334.01 135.554 2333.2 137.475 Q2332.41 139.373 2330.31 141.966 Q2329.73 142.637 2326.63 145.854 Q2323.52 149.049 2317.88 154.813 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><path clip-path=\"url(#clip730)\" d=\"M2344.06 124.188 L2362.41 124.188 L2362.41 128.123 L2348.34 128.123 L2348.34 136.595 Q2349.36 136.248 2350.38 136.086 Q2351.39 135.901 2352.41 135.901 Q2358.2 135.901 2361.58 139.072 Q2364.96 142.243 2364.96 147.66 Q2364.96 153.239 2361.49 156.34 Q2358.01 159.419 2351.7 159.419 Q2349.52 159.419 2347.25 159.049 Q2345.01 158.678 2342.6 157.938 L2342.6 153.239 Q2344.68 154.373 2346.9 154.928 Q2349.13 155.484 2351.6 155.484 Q2355.61 155.484 2357.95 153.378 Q2360.28 151.271 2360.28 147.66 Q2360.28 144.049 2357.95 141.942 Q2355.61 139.836 2351.6 139.836 Q2349.73 139.836 2347.85 140.253 Q2346 140.669 2344.06 141.549 L2344.06 124.188 Z\" fill=\"#000000\" fill-rule=\"evenodd\" fill-opacity=\"1\" /><polyline clip-path=\"url(#clip730)\" style=\"stroke:#000000; stroke-linecap:round; stroke-linejoin:round; stroke-width:4; stroke-opacity:1; fill:none\" points=\"2232.76,1486.45 2232.76,1338.25 2256.76,1338.25 2232.76,1338.25 2232.76,1189.11 2256.76,1189.11 2232.76,1189.11 2232.76,1039.96 2256.76,1039.96 2232.76,1039.96 2232.76,890.82 2256.76,890.82 2232.76,890.82 2232.76,741.675 2256.76,741.675 2232.76,741.675 2232.76,592.531 2256.76,592.531 2232.76,592.531 2232.76,443.386 2256.76,443.386 2232.76,443.386 2232.76,294.241 2256.76,294.241 2232.76,294.241 2232.76,145.097 2256.76,145.097 2232.76,145.097 2232.76,47.2441 \"/>\n",
- "</svg>\n"
- ]
- },
- "execution_count": 10,
- "metadata": {},
- "output_type": "execute_result"
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Arrays have incorrect length or dimension.\n"
- ]
- }
- ],
+ "outputs": [],
+ "source": [
+ "#A=MakeMat(28,Lmax=4*pi)\n",
+ "A=MakeMat(28)\n",
+ "FillMat(A)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "0644cbcc-5d1e-4ee5-9350-c7695c6a8fc5",
+ "metadata": {},
+ "outputs": [],
"source": [
- "fx(x,y) = -cos(y)\n",
- "fy(x,y) = -sin(x)\n",
- "fz(x,y) = cos(x)+sin(y)\n",
+ "contour(A[:x],A[:y],A[:Mz],fill=true)\n",
+ "\n",
+ "meshgrid(x, y) = (repeat(x, outer=length(y)), repeat(y, inner=length(x))) # helper that should be removed\n",
+ "xx , yy = meshgrid(A[:x],A[:y])\n",
"\n",
- "x = range(0, 3.14, length=50)\n",
- "y = range(0, 3.14, length=50)\n",
- "z = @. fx(x', y)+fy(x',y)\n",
- "z = @. fz(x,y)\n",
- "contour(x,y,z)"
+ "quiver!(xx,yy,quiver=(A[:Mx][1,:] , A[:My][:,1]).*0.2,c=:red,headsize=0.1)"
]
},
{
"cell_type": "code",
"execution_count": null,
- "id": "2ec180b2-2b58-49b1-9af7-be67bc0ef114",
+ "id": "50803cf4-a6c3-406e-ac3b-0c2c258cf1c2",
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "242bb65c-75b8-409f-86ba-0ff96fc48315",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "?quiver"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "c407adf5-91cc-4b51-8e93-6996bb6950ca",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "help(quiver)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "a68ed901-cd5b-447e-89ad-30efd702ecae",
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "bb5c48bf-6439-4329-af2e-ae3f2db8807e",
"metadata": {},
"outputs": [],
"source": []
diff --git a/RobTryMakie.ipynb b/RobTryMakie.ipynb
new file mode 100644
index 0000000000000000000000000000000000000000..ba0195c2a23c41ee9cde130eca46e95788f5927c
--- /dev/null
+++ b/RobTryMakie.ipynb
@@ -0,0 +1,156 @@
+{
+ "cells": [
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "3f0e0a63-5d32-440c-9e89-815ed0aa1008",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "using Makie\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "2ec180b2-2b58-49b1-9af7-be67bc0ef114",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "#Basic Roberts Flow\n",
+ "#Add the 2/3 Dimention dependence \n",
+ "#function RobFlow(x :: Float64, y :: Float64)\n",
+ "function RobFlow(x, y)\n",
+ "\n",
+ " fx = cos(y)\n",
+ " fy = -sin(x)\n",
+ " fz = cos(x)+sin(y)\n",
+ " (Dict(:x=>fx, :y=>fy, :z=>fz))\n",
+ "end\n",
+ "\n",
+ "function MakeMat(Nmax=32; Lmax=2.0*pi)\n",
+ " \n",
+ " dx= Lmax/Nmax\n",
+ " #CHECK CHECK maybe wrong dx in range\n",
+ " x = range(dx/2.0, Lmax-dx/2.0, length=Nmax)\n",
+ " y = range(dx/2.0, Lmax-dx/2.0, length=Nmax)\n",
+ " A = zeros((Nmax, Nmax))\n",
+ " B = zeros((Nmax, Nmax))\n",
+ " C = zeros((Nmax, Nmax))\n",
+ " \n",
+ " (Dict(:Nmax=>Nmax, :Lmax=>Lmax, :x=>x, :y=>y, :Mx=>A, :My=>B, :Mz=>C))\n",
+ "end\n",
+ "\n",
+ "function FillMat(Mat)\n",
+ " for ix in 1:Mat[:Nmax]\n",
+ " for iy in 1:Mat[:Nmax]\n",
+ " TT=RobFlow(Mat[:x][ix],Mat[:y][iy])\n",
+ " Mat[:Mx][ix,iy]=TT[:x]\n",
+ " Mat[:My][ix,iy]=TT[:y]\n",
+ " Mat[:Mz][ix,iy]=TT[:z]\n",
+ " end\n",
+ " end\n",
+ "end"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "fdeb6d37-1e7d-4697-b0e7-bc53ea06dc4b",
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 1,
+ "id": "0644cbcc-5d1e-4ee5-9350-c7695c6a8fc5",
+ "metadata": {},
+ "outputs": [
+ {
+ "ename": "LoadError",
+ "evalue": "UndefVarError: A not defined",
+ "output_type": "error",
+ "traceback": [
+ "UndefVarError: A not defined",
+ "",
+ "Stacktrace:",
+ " [1] top-level scope",
+ " @ In[1]:1"
+ ]
+ }
+ ],
+ "source": [
+ "\n",
+ "\n",
+ "\n",
+ "\n",
+ "contour(A[:x],A[:y],A[:Mz],fill=true)\n",
+ "\n",
+ "meshgrid(x, y) = (repeat(x, outer=length(y)), repeat(y, inner=length(x))) # helper that should be removed\n",
+ "xx , yy = meshgrid(A[:x],A[:y])\n",
+ "\n",
+ "quiver!(xx,yy,quiver=(A[:Mx][1,:] , A[:My][:,1]).*0.2,c=:red,headsize=0.1)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "50803cf4-a6c3-406e-ac3b-0c2c258cf1c2",
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "242bb65c-75b8-409f-86ba-0ff96fc48315",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "?quiver"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "c407adf5-91cc-4b51-8e93-6996bb6950ca",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "help(quiver)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "a68ed901-cd5b-447e-89ad-30efd702ecae",
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "bb5c48bf-6439-4329-af2e-ae3f2db8807e",
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ }
+ ],
+ "metadata": {
+ "kernelspec": {
+ "display_name": "Julia 1.8.3",
+ "language": "julia",
+ "name": "julia-1.8"
+ },
+ "language_info": {
+ "file_extension": ".jl",
+ "mimetype": "application/julia",
+ "name": "julia",
+ "version": "1.8.3"
+ }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}