From f0467762f8460ea08af4e5b7f52a7f7b665eab34 Mon Sep 17 00:00:00 2001 From: mwoussen Date: Mon, 18 Sep 2023 16:09:00 +0200 Subject: [PATCH] test and debug after dynamic import --- notebooks/environment_parameters.ipynb | 657 ++++++++++++++- notebooks/example_canopy.ipynb | 44 +- notebooks/input_scenes.ipynb | 416 ++++++++-- notebooks/lightmodels_functionnalities.ipynb | 148 ++-- notebooks/misc_functionnalities.ipynb | 255 +++--- .../outputs_and_plantmodels_transfer.ipynb | 761 ++++++++++-------- notebooks/tool_basics.ipynb | 262 +++--- s2v/fort.51 | 10 +- s2v/leafarea | 6 +- s2v/out.dang | 4 +- s2v/s2v.area | 10 +- s2v/s2v.can | 10 +- s2v/s2v.par | 8 +- s5/fort.51 | 10 +- s5/fort.60 | 106 ++- s5/leafarea | 42 +- s5/s5.par | 6 +- 17 files changed, 1909 insertions(+), 846 deletions(-) diff --git a/notebooks/environment_parameters.ipynb b/notebooks/environment_parameters.ipynb index b19e202..8a90d7c 100644 --- a/notebooks/environment_parameters.ipynb +++ b/notebooks/environment_parameters.ipynb @@ -35,7 +35,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "id": "b8cabb25", "metadata": {}, "outputs": [], @@ -54,7 +54,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "id": "4f37d299", "metadata": {}, "outputs": [], @@ -92,7 +92,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 9, "id": "5d3ea6e8", "metadata": {}, "outputs": [], @@ -108,19 +108,129 @@ "\n", "environment = {\n", " \"coordinates\": coordinates ,\n", - " \"infinite\": infinite\n", + " \"infinite\": infinite,\n", " \"reflected\": reflected,\n", - " \"direct\": False,\n", - " \"diffuse\": True\n", + " \"direct\": direct,\n", + " \"diffuse\": diffuse\n", " }" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 10, "id": "c16d6a23", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Triangle Organ VegetationType Area par Eabs \\\n", + "0 264 15 0 0 0 25.726272 371.6035 \n", + "1 264 15 1 0 0 13.783029 349.2170 \n", + "2 264 15 2 0 0 12.763108 398.2390 \n", + "3 264 15 3 0 0 53.316476 337.0940 \n", + "4 264 15 4 0 0 77.530371 324.5620 \n", + "5 264 15 5 0 0 91.101325 345.7510 \n", + "6 264 15 6 0 0 10.561639 402.4780 \n", + "7 264 15 7 0 0 34.807818 391.7425 \n", + "8 264 15 8 0 0 50.741522 380.4250 \n", + "9 264 15 9 0 0 65.094222 357.9895 \n", + "10 264 15 10 0 0 11.478336 392.0880 \n", + "11 264 15 11 0 0 7.336318 411.0825 \n", + "12 264 15 12 0 0 67.098056 351.8955 \n", + "13 264 15 13 0 0 110.406048 349.7170 \n", + "14 264 15 14 0 0 25.205634 349.1045 \n", + "15 264 15 15 0 0 58.188870 381.7025 \n", + "16 264 15 16 0 0 4.697984 315.1850 \n", + "17 264 15 17 0 0 158.216511 327.8690 \n", + "18 264 15 18 0 0 20.092209 365.8025 \n", + "19 264 15 19 0 0 36.665943 380.5700 \n", + "20 264 15 20 0 0 41.407838 354.4745 \n", + "21 264 15 21 0 0 59.198310 392.9965 \n", + "22 264 15 22 0 0 123.069355 396.1230 \n", + "23 264 15 23 0 0 15.799376 378.0230 \n", + "24 264 15 24 0 0 83.618705 321.3325 \n", + "25 264 15 25 0 0 22.376188 421.3345 \n", + "26 264 15 26 0 0 16.980147 369.1415 \n", + "27 264 15 27 0 0 4.021323 391.9065 \n", + "28 264 15 28 0 0 101.989262 368.2225 \n", + "29 264 15 29 0 0 35.045032 362.7380 \n", + "30 264 15 30 0 0 7.279495 358.4765 \n", + "31 264 15 31 0 0 8.076740 379.1885 \n", + "32 264 15 32 0 0 25.380136 408.9655 \n", + "33 264 15 33 0 0 23.214325 362.2340 \n", + "34 264 15 34 0 0 24.755145 383.8100 \n", + "35 264 15 35 0 0 12.075043 347.8985 \n", + "36 264 15 36 0 0 5.433152 375.6225 \n", + "37 264 15 37 0 0 7.593431 329.0015 \n", + "38 264 15 38 0 0 11.336904 391.5000 \n", + "39 264 15 39 0 0 13.960928 364.9205 \n", + "40 264 15 40 0 0 51.442895 356.8665 \n", + "41 264 15 41 0 0 6.913750 358.1685 \n", + "42 264 15 42 0 0 27.859798 351.1215 \n", + "43 264 15 43 0 0 21.513230 363.2890 \n", + "44 264 15 44 0 0 0.365187 357.0700 \n", + "45 264 15 45 0 0 16.871122 345.0545 \n", + "46 264 15 46 0 0 18.246579 343.5880 \n", + "47 264 15 47 0 0 42.620629 412.0505 \n", + "48 264 15 48 0 0 24.966061 366.0345 \n", + "49 264 15 49 0 0 7.325236 392.4830 \n", + "\n", + " par Ei \n", + "0 437.180588 \n", + "1 410.843529 \n", + "2 468.516471 \n", + "3 396.581176 \n", + "4 381.837647 \n", + "5 406.765882 \n", + "6 473.503529 \n", + "7 460.873529 \n", + "8 447.558824 \n", + "9 421.164118 \n", + "10 461.280000 \n", + "11 483.626471 \n", + "12 413.994706 \n", + "13 411.431765 \n", + "14 410.711176 \n", + "15 449.061765 \n", + "16 370.805882 \n", + "17 385.728235 \n", + "18 430.355882 \n", + "19 447.729412 \n", + "20 417.028824 \n", + "21 462.348824 \n", + "22 466.027059 \n", + "23 444.732941 \n", + "24 378.038235 \n", + "25 495.687647 \n", + "26 434.284118 \n", + "27 461.066471 \n", + "28 433.202941 \n", + "29 426.750588 \n", + "30 421.737059 \n", + "31 446.104118 \n", + "32 481.135882 \n", + "33 426.157647 \n", + "34 451.541176 \n", + "35 409.292353 \n", + "36 441.908824 \n", + "37 387.060588 \n", + "38 460.588235 \n", + "39 429.318235 \n", + "40 419.842941 \n", + "41 421.374706 \n", + "42 413.084118 \n", + "43 427.398824 \n", + "44 420.082353 \n", + "45 405.946471 \n", + "46 404.221176 \n", + "47 484.765294 \n", + "48 430.628824 \n", + "49 461.744706 \n" + ] + } + ], "source": [ "lighting = LightVegeManager(lightmodel=\"caribu\", environment=environment)\n", "lighting.build(geometry=triangles)\n", @@ -151,7 +261,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 11, "id": "a39681ea", "metadata": {}, "outputs": [], @@ -162,10 +272,120 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 12, "id": "039321e4", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Triangle Organ VegetationType Area par Eabs \\\n", + "0 264 15 0 0 0 25.726272 371.6035 \n", + "1 264 15 1 0 0 13.783029 349.2170 \n", + "2 264 15 2 0 0 12.763108 398.2390 \n", + "3 264 15 3 0 0 53.316476 337.0940 \n", + "4 264 15 4 0 0 77.530371 324.5620 \n", + "5 264 15 5 0 0 91.101325 345.7510 \n", + "6 264 15 6 0 0 10.561639 402.4780 \n", + "7 264 15 7 0 0 34.807818 391.7425 \n", + "8 264 15 8 0 0 50.741522 380.4250 \n", + "9 264 15 9 0 0 65.094222 357.9895 \n", + "10 264 15 10 0 0 11.478336 392.0880 \n", + "11 264 15 11 0 0 7.336318 411.0825 \n", + "12 264 15 12 0 0 67.098056 351.8955 \n", + "13 264 15 13 0 0 110.406048 349.7170 \n", + "14 264 15 14 0 0 25.205634 349.1045 \n", + "15 264 15 15 0 0 58.188870 381.7025 \n", + "16 264 15 16 0 0 4.697984 315.1850 \n", + "17 264 15 17 0 0 158.216511 327.8690 \n", + "18 264 15 18 0 0 20.092209 365.8025 \n", + "19 264 15 19 0 0 36.665943 380.5700 \n", + "20 264 15 20 0 0 41.407838 354.4745 \n", + "21 264 15 21 0 0 59.198310 392.9965 \n", + "22 264 15 22 0 0 123.069355 396.1230 \n", + "23 264 15 23 0 0 15.799376 378.0230 \n", + "24 264 15 24 0 0 83.618705 321.3325 \n", + "25 264 15 25 0 0 22.376188 421.3345 \n", + "26 264 15 26 0 0 16.980147 369.1415 \n", + "27 264 15 27 0 0 4.021323 391.9065 \n", + "28 264 15 28 0 0 101.989262 368.2225 \n", + "29 264 15 29 0 0 35.045032 362.7380 \n", + "30 264 15 30 0 0 7.279495 358.4765 \n", + "31 264 15 31 0 0 8.076740 379.1885 \n", + "32 264 15 32 0 0 25.380136 408.9655 \n", + "33 264 15 33 0 0 23.214325 362.2340 \n", + "34 264 15 34 0 0 24.755145 383.8100 \n", + "35 264 15 35 0 0 12.075043 347.8985 \n", + "36 264 15 36 0 0 5.433152 375.6225 \n", + "37 264 15 37 0 0 7.593431 329.0015 \n", + "38 264 15 38 0 0 11.336904 391.5000 \n", + "39 264 15 39 0 0 13.960928 364.9205 \n", + "40 264 15 40 0 0 51.442895 356.8665 \n", + "41 264 15 41 0 0 6.913750 358.1685 \n", + "42 264 15 42 0 0 27.859798 351.1215 \n", + "43 264 15 43 0 0 21.513230 363.2890 \n", + "44 264 15 44 0 0 0.365187 357.0700 \n", + "45 264 15 45 0 0 16.871122 345.0545 \n", + "46 264 15 46 0 0 18.246579 343.5880 \n", + "47 264 15 47 0 0 42.620629 412.0505 \n", + "48 264 15 48 0 0 24.966061 366.0345 \n", + "49 264 15 49 0 0 7.325236 392.4830 \n", + "\n", + " par Ei \n", + "0 437.180588 \n", + "1 410.843529 \n", + "2 468.516471 \n", + "3 396.581176 \n", + "4 381.837647 \n", + "5 406.765882 \n", + "6 473.503529 \n", + "7 460.873529 \n", + "8 447.558824 \n", + "9 421.164118 \n", + "10 461.280000 \n", + "11 483.626471 \n", + "12 413.994706 \n", + "13 411.431765 \n", + "14 410.711176 \n", + "15 449.061765 \n", + "16 370.805882 \n", + "17 385.728235 \n", + "18 430.355882 \n", + "19 447.729412 \n", + "20 417.028824 \n", + "21 462.348824 \n", + "22 466.027059 \n", + "23 444.732941 \n", + "24 378.038235 \n", + "25 495.687647 \n", + "26 434.284118 \n", + "27 461.066471 \n", + "28 433.202941 \n", + "29 426.750588 \n", + "30 421.737059 \n", + "31 446.104118 \n", + "32 481.135882 \n", + "33 426.157647 \n", + "34 451.541176 \n", + "35 409.292353 \n", + "36 441.908824 \n", + "37 387.060588 \n", + "38 460.588235 \n", + "39 429.318235 \n", + "40 419.842941 \n", + "41 421.374706 \n", + "42 413.084118 \n", + "43 427.398824 \n", + "44 420.082353 \n", + "45 405.946471 \n", + "46 404.221176 \n", + "47 484.765294 \n", + "48 430.628824 \n", + "49 461.744706 \n" + ] + } + ], "source": [ "lighting = LightVegeManager(lightmodel=\"caribu\", environment=environment)\n", "lighting.build(geometry=triangles)\n", @@ -184,10 +404,21 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 17, "id": "a2c5c662", "metadata": {}, - "outputs": [], + "outputs": [ + { + "data": { + "text/plain": [ + "'C:\\\\Users\\\\mwoussen\\\\cdd\\\\codes\\\\dev\\\\lightvegemanager\\\\data\\\\sky_5.data'" + ] + }, + "execution_count": 17, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "import os\n", "datafile = os.path.join(os.path.join(os.path.dirname(os.path.abspath(\"\")), \"data\"), \"sky_5.data\")\n", @@ -196,21 +427,131 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 20, "id": "86958bd3", "metadata": {}, "outputs": [], "source": [ - "sky = [\"file\", datafile]\n", + "sky = datafile\n", "environment.update({\"sky\": sky})" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 21, "id": "7626d4e9", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Triangle Organ VegetationType Area par Eabs \\\n", + "0 264 15 0 0 0 25.726272 278.0720 \n", + "1 264 15 1 0 0 13.783029 403.3195 \n", + "2 264 15 2 0 0 12.763108 366.8215 \n", + "3 264 15 3 0 0 53.316476 397.2600 \n", + "4 264 15 4 0 0 77.530371 261.5960 \n", + "5 264 15 5 0 0 91.101325 360.5290 \n", + "6 264 15 6 0 0 10.561639 384.0350 \n", + "7 264 15 7 0 0 34.807818 397.7035 \n", + "8 264 15 8 0 0 50.741522 365.7650 \n", + "9 264 15 9 0 0 65.094222 422.4610 \n", + "10 264 15 10 0 0 11.478336 388.2775 \n", + "11 264 15 11 0 0 7.336318 408.1320 \n", + "12 264 15 12 0 0 67.098056 393.2045 \n", + "13 264 15 13 0 0 110.406048 402.1410 \n", + "14 264 15 14 0 0 25.205634 369.9850 \n", + "15 264 15 15 0 0 58.188870 349.8555 \n", + "16 264 15 16 0 0 4.697984 381.5470 \n", + "17 264 15 17 0 0 158.216511 338.6050 \n", + "18 264 15 18 0 0 20.092209 401.2725 \n", + "19 264 15 19 0 0 36.665943 360.8795 \n", + "20 264 15 20 0 0 41.407838 393.0395 \n", + "21 264 15 21 0 0 59.198310 374.3005 \n", + "22 264 15 22 0 0 123.069355 364.7995 \n", + "23 264 15 23 0 0 15.799376 335.7830 \n", + "24 264 15 24 0 0 83.618705 320.5145 \n", + "25 264 15 25 0 0 22.376188 422.5700 \n", + "26 264 15 26 0 0 16.980147 384.9540 \n", + "27 264 15 27 0 0 4.021323 356.1805 \n", + "28 264 15 28 0 0 101.989262 392.4935 \n", + "29 264 15 29 0 0 35.045032 374.7005 \n", + "30 264 15 30 0 0 7.279495 392.2800 \n", + "31 264 15 31 0 0 8.076740 397.8520 \n", + "32 264 15 32 0 0 25.380136 380.5840 \n", + "33 264 15 33 0 0 23.214325 394.5560 \n", + "34 264 15 34 0 0 24.755145 367.5900 \n", + "35 264 15 35 0 0 12.075043 324.4830 \n", + "36 264 15 36 0 0 5.433152 356.6220 \n", + "37 264 15 37 0 0 7.593431 376.8265 \n", + "38 264 15 38 0 0 11.336904 327.6150 \n", + "39 264 15 39 0 0 13.960928 408.6110 \n", + "40 264 15 40 0 0 51.442895 385.7540 \n", + "41 264 15 41 0 0 6.913750 404.1470 \n", + "42 264 15 42 0 0 27.859798 411.5640 \n", + "43 264 15 43 0 0 21.513230 403.3165 \n", + "44 264 15 44 0 0 0.365187 446.3670 \n", + "45 264 15 45 0 0 16.871122 426.9325 \n", + "46 264 15 46 0 0 18.246579 393.3755 \n", + "47 264 15 47 0 0 42.620629 397.4675 \n", + "48 264 15 48 0 0 24.966061 380.4310 \n", + "49 264 15 49 0 0 7.325236 365.7570 \n", + "\n", + " par Ei \n", + "0 327.143529 \n", + "1 474.493529 \n", + "2 431.554706 \n", + "3 467.364706 \n", + "4 307.760000 \n", + "5 424.151765 \n", + "6 451.805882 \n", + "7 467.886471 \n", + "8 430.311765 \n", + "9 497.012941 \n", + "10 456.797059 \n", + "11 480.155294 \n", + "12 462.593529 \n", + "13 473.107059 \n", + "14 435.276471 \n", + "15 411.594706 \n", + "16 448.878824 \n", + "17 398.358824 \n", + "18 472.085294 \n", + "19 424.564118 \n", + "20 462.399412 \n", + "21 440.353529 \n", + "22 429.175882 \n", + "23 395.038824 \n", + "24 377.075882 \n", + "25 497.141176 \n", + "26 452.887059 \n", + "27 419.035882 \n", + "28 461.757059 \n", + "29 440.824118 \n", + "30 461.505882 \n", + "31 468.061176 \n", + "32 447.745882 \n", + "33 464.183529 \n", + "34 432.458824 \n", + "35 381.744706 \n", + "36 419.555294 \n", + "37 443.325294 \n", + "38 385.429412 \n", + "39 480.718824 \n", + "40 453.828235 \n", + "41 475.467059 \n", + "42 484.192941 \n", + "43 474.490000 \n", + "44 525.137647 \n", + "45 502.273529 \n", + "46 462.794706 \n", + "47 467.608824 \n", + "48 447.565882 \n", + "49 430.302353 \n" + ] + } + ], "source": [ "lighting = LightVegeManager(lightmodel=\"caribu\", environment=environment)\n", "lighting.build(geometry=triangles)\n", @@ -229,7 +570,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 22, "id": "1622b9ed", "metadata": {}, "outputs": [], @@ -243,10 +584,120 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 23, "id": "653e163c", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Triangle Organ VegetationType Area par Eabs \\\n", + "0 264 15 0 0 0 25.726272 367.4435 \n", + "1 264 15 1 0 0 13.783029 359.6625 \n", + "2 264 15 2 0 0 12.763108 396.5770 \n", + "3 264 15 3 0 0 53.316476 329.5710 \n", + "4 264 15 4 0 0 77.530371 302.7720 \n", + "5 264 15 5 0 0 91.101325 359.4800 \n", + "6 264 15 6 0 0 10.561639 402.0455 \n", + "7 264 15 7 0 0 34.807818 390.0475 \n", + "8 264 15 8 0 0 50.741522 380.4095 \n", + "9 264 15 9 0 0 65.094222 370.5000 \n", + "10 264 15 10 0 0 11.478336 365.8330 \n", + "11 264 15 11 0 0 7.336318 416.4730 \n", + "12 264 15 12 0 0 67.098056 330.1160 \n", + "13 264 15 13 0 0 110.406048 347.6350 \n", + "14 264 15 14 0 0 25.205634 355.7915 \n", + "15 264 15 15 0 0 58.188870 380.4485 \n", + "16 264 15 16 0 0 4.697984 303.9940 \n", + "17 264 15 17 0 0 158.216511 340.1875 \n", + "18 264 15 18 0 0 20.092209 374.8530 \n", + "19 264 15 19 0 0 36.665943 363.3585 \n", + "20 264 15 20 0 0 41.407838 361.5830 \n", + "21 264 15 21 0 0 59.198310 390.9105 \n", + "22 264 15 22 0 0 123.069355 393.2975 \n", + "23 264 15 23 0 0 15.799376 376.2630 \n", + "24 264 15 24 0 0 83.618705 334.4305 \n", + "25 264 15 25 0 0 22.376188 422.7645 \n", + "26 264 15 26 0 0 16.980147 370.2740 \n", + "27 264 15 27 0 0 4.021323 388.2480 \n", + "28 264 15 28 0 0 101.989262 358.1445 \n", + "29 264 15 29 0 0 35.045032 354.0735 \n", + "30 264 15 30 0 0 7.279495 350.6900 \n", + "31 264 15 31 0 0 8.076740 381.7745 \n", + "32 264 15 32 0 0 25.380136 393.2310 \n", + "33 264 15 33 0 0 23.214325 369.4760 \n", + "34 264 15 34 0 0 24.755145 375.5270 \n", + "35 264 15 35 0 0 12.075043 336.7025 \n", + "36 264 15 36 0 0 5.433152 391.4570 \n", + "37 264 15 37 0 0 7.593431 311.4770 \n", + "38 264 15 38 0 0 11.336904 370.1265 \n", + "39 264 15 39 0 0 13.960928 363.4625 \n", + "40 264 15 40 0 0 51.442895 368.7145 \n", + "41 264 15 41 0 0 6.913750 359.2955 \n", + "42 264 15 42 0 0 27.859798 357.7250 \n", + "43 264 15 43 0 0 21.513230 369.9830 \n", + "44 264 15 44 0 0 0.365187 331.4810 \n", + "45 264 15 45 0 0 16.871122 360.2515 \n", + "46 264 15 46 0 0 18.246579 364.6100 \n", + "47 264 15 47 0 0 42.620629 414.3330 \n", + "48 264 15 48 0 0 24.966061 360.7975 \n", + "49 264 15 49 0 0 7.325236 390.5770 \n", + "\n", + " par Ei \n", + "0 432.286471 \n", + "1 423.132353 \n", + "2 466.561176 \n", + "3 387.730588 \n", + "4 356.202353 \n", + "5 422.917647 \n", + "6 472.994706 \n", + "7 458.879412 \n", + "8 447.540588 \n", + "9 435.882353 \n", + "10 430.391765 \n", + "11 489.968235 \n", + "12 388.371765 \n", + "13 408.982353 \n", + "14 418.578235 \n", + "15 447.586471 \n", + "16 357.640000 \n", + "17 400.220588 \n", + "18 441.003529 \n", + "19 427.480588 \n", + "20 425.391765 \n", + "21 459.894706 \n", + "22 462.702941 \n", + "23 442.662353 \n", + "24 393.447647 \n", + "25 497.370000 \n", + "26 435.616471 \n", + "27 456.762353 \n", + "28 421.346471 \n", + "29 416.557059 \n", + "30 412.576471 \n", + "31 449.146471 \n", + "32 462.624706 \n", + "33 434.677647 \n", + "34 441.796471 \n", + "35 396.120588 \n", + "36 460.537647 \n", + "37 366.443529 \n", + "38 435.442941 \n", + "39 427.602941 \n", + "40 433.781765 \n", + "41 422.700588 \n", + "42 420.852941 \n", + "43 435.274118 \n", + "44 389.977647 \n", + "45 423.825294 \n", + "46 428.952941 \n", + "47 487.450588 \n", + "48 424.467647 \n", + "49 459.502353 \n" + ] + } + ], "source": [ "lighting = LightVegeManager(lightmodel=\"caribu\", environment=environment)\n", "lighting.build(geometry=triangles)\n", @@ -265,10 +716,172 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 24, "id": "a565276b", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Triangle Organ Voxel VegetationType primitive_area Day Hour Nx \\\n", + "0 0 0 1.0 1 25.726272 264.0 15.0 1 \n", + "14 1 0 2.0 1 13.783029 264.0 15.0 2 \n", + "20 2 0 3.0 1 12.763108 264.0 15.0 2 \n", + "15 3 0 2.0 1 53.316476 264.0 15.0 2 \n", + "1 4 0 1.0 1 77.530371 264.0 15.0 1 \n", + "2 5 0 1.0 1 91.101325 264.0 15.0 1 \n", + "26 6 0 4.0 1 10.561639 264.0 15.0 1 \n", + "34 7 0 5.0 1 34.807818 264.0 15.0 2 \n", + "38 8 0 6.0 1 50.741522 264.0 15.0 1 \n", + "39 9 0 6.0 1 65.094222 264.0 15.0 1 \n", + "41 10 0 7.0 1 11.478336 264.0 15.0 2 \n", + "3 11 0 1.0 1 7.336318 264.0 15.0 1 \n", + "44 12 0 8.0 1 67.098056 264.0 15.0 1 \n", + "45 13 0 8.0 1 110.406048 264.0 15.0 1 \n", + "35 14 0 5.0 1 25.205634 264.0 15.0 2 \n", + "46 15 0 8.0 1 58.188870 264.0 15.0 1 \n", + "21 16 0 3.0 1 4.697984 264.0 15.0 2 \n", + "47 17 0 8.0 1 158.216511 264.0 15.0 1 \n", + "16 18 0 2.0 1 20.092209 264.0 15.0 2 \n", + "4 19 0 1.0 1 36.665943 264.0 15.0 1 \n", + "5 20 0 1.0 1 41.407838 264.0 15.0 1 \n", + "6 21 0 1.0 1 59.198310 264.0 15.0 1 \n", + "7 22 0 1.0 1 123.069355 264.0 15.0 1 \n", + "17 23 0 2.0 1 15.799376 264.0 15.0 2 \n", + "8 24 0 1.0 1 83.618705 264.0 15.0 1 \n", + "22 25 0 3.0 1 22.376188 264.0 15.0 2 \n", + "23 26 0 3.0 1 16.980147 264.0 15.0 2 \n", + "48 27 0 8.0 1 4.021323 264.0 15.0 1 \n", + "42 28 0 7.0 1 101.989262 264.0 15.0 2 \n", + "27 29 0 4.0 1 35.045032 264.0 15.0 1 \n", + "18 30 0 2.0 1 7.279495 264.0 15.0 2 \n", + "28 31 0 4.0 1 8.076740 264.0 15.0 1 \n", + "49 32 0 8.0 1 25.380136 264.0 15.0 1 \n", + "9 33 0 1.0 1 23.214325 264.0 15.0 1 \n", + "10 34 0 1.0 1 24.755145 264.0 15.0 1 \n", + "40 35 0 6.0 1 12.075043 264.0 15.0 1 \n", + "24 36 0 3.0 1 5.433152 264.0 15.0 2 \n", + "43 37 0 7.0 1 7.593431 264.0 15.0 2 \n", + "11 38 0 1.0 1 11.336904 264.0 15.0 1 \n", + "36 39 0 5.0 1 13.960928 264.0 15.0 2 \n", + "19 40 0 2.0 1 51.442895 264.0 15.0 2 \n", + "37 41 0 5.0 1 6.913750 264.0 15.0 2 \n", + "25 42 0 3.0 1 27.859798 264.0 15.0 2 \n", + "29 43 0 4.0 1 21.513230 264.0 15.0 1 \n", + "12 44 0 1.0 1 0.365187 264.0 15.0 1 \n", + "30 45 0 4.0 1 16.871122 264.0 15.0 1 \n", + "13 46 0 1.0 1 18.246579 264.0 15.0 1 \n", + "31 47 0 4.0 1 42.620629 264.0 15.0 1 \n", + "32 48 0 4.0 1 24.966061 264.0 15.0 1 \n", + "33 49 0 4.0 1 7.325236 264.0 15.0 1 \n", + "\n", + " Ny Nz ShadedPAR SunlitPAR ShadedArea SunlitArea Area \\\n", + "0 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "14 2 2 526.623230 526.623230 2.050629 159.662857 161.713486 \n", + "20 2 1 534.147095 534.147095 0.696129 89.414246 90.110374 \n", + "15 2 2 526.623230 526.623230 2.050629 159.662857 161.713486 \n", + "1 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "2 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "26 2 1 532.629761 532.629761 1.871048 165.108658 166.979706 \n", + "34 1 1 534.452026 534.452026 0.622597 80.265533 80.888130 \n", + "38 1 1 533.396484 533.396484 1.338730 126.572052 127.910782 \n", + "39 1 1 533.396484 533.396484 1.338730 126.572052 127.910782 \n", + "41 1 2 528.159302 528.159302 1.488289 119.572739 121.061028 \n", + "3 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "44 1 2 521.193115 521.193115 15.492981 407.817963 423.310944 \n", + "45 1 2 521.193115 521.193115 15.492981 407.817963 423.310944 \n", + "35 1 1 534.452026 534.452026 0.622597 80.265533 80.888130 \n", + "46 1 2 521.193115 521.193115 15.492981 407.817963 423.310944 \n", + "21 2 1 534.147095 534.147095 0.696129 89.414246 90.110374 \n", + "47 1 2 521.193115 521.193115 15.492981 407.817963 423.310944 \n", + "16 2 2 526.623230 526.623230 2.050629 159.662857 161.713486 \n", + "4 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "5 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "6 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "7 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "17 2 2 526.623230 526.623230 2.050629 159.662857 161.713486 \n", + "8 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "22 2 1 534.147095 534.147095 0.696129 89.414246 90.110374 \n", + "23 2 1 534.147095 534.147095 0.696129 89.414246 90.110374 \n", + "48 1 2 521.193115 521.193115 15.492981 407.817963 423.310944 \n", + "42 1 2 528.159302 528.159302 1.488289 119.572739 121.061028 \n", + "27 2 1 532.629761 532.629761 1.871048 165.108658 166.979706 \n", + "18 2 2 526.623230 526.623230 2.050629 159.662857 161.713486 \n", + "28 2 1 532.629761 532.629761 1.871048 165.108658 166.979706 \n", + "49 1 2 521.193115 521.193115 15.492981 407.817963 423.310944 \n", + "9 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "10 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "40 1 1 533.396484 533.396484 1.338730 126.572052 127.910782 \n", + "24 2 1 534.147095 534.147095 0.696129 89.414246 90.110374 \n", + "43 1 2 528.159302 528.159302 1.488289 119.572739 121.061028 \n", + "11 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "36 1 1 534.452026 534.452026 0.622597 80.265533 80.888130 \n", + "19 2 2 526.623230 526.623230 2.050629 159.662857 161.713486 \n", + "37 1 1 534.452026 534.452026 0.622597 80.265533 80.888130 \n", + "25 2 1 534.147095 534.147095 0.696129 89.414246 90.110374 \n", + "29 2 1 532.629761 532.629761 1.871048 165.108658 166.979706 \n", + "12 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "30 2 1 532.629761 532.629761 1.871048 165.108658 166.979706 \n", + "13 2 2 517.164368 517.164368 24.775818 598.796692 623.572510 \n", + "31 2 1 532.629761 532.629761 1.871048 165.108658 166.979706 \n", + "32 2 1 532.629761 532.629761 1.871048 165.108658 166.979706 \n", + "33 2 1 532.629761 532.629761 1.871048 165.108658 166.979706 \n", + "\n", + " PARa Intercepted Transmitted \n", + "0 517.164368 644.978943 4682.598145 \n", + "14 526.623230 170.324142 4792.181152 \n", + "20 534.147095 96.264381 4884.172363 \n", + "15 526.623230 170.324142 4792.181152 \n", + "1 517.164368 644.978943 4682.598145 \n", + "2 517.164368 644.978943 4682.598145 \n", + "26 532.629761 177.876724 4864.585938 \n", + "34 534.452087 86.461655 4888.371582 \n", + "38 533.396423 136.454315 4874.791504 \n", + "39 533.396423 136.454315 4874.791504 \n", + "41 528.159302 127.879021 4811.868652 \n", + "3 517.164368 644.978943 4682.598145 \n", + "44 521.193115 441.253510 4728.966797 \n", + "45 521.193115 441.253510 4728.966797 \n", + "35 534.452087 86.461655 4888.371582 \n", + "46 521.193115 441.253510 4728.966797 \n", + "21 534.147095 96.264381 4884.172363 \n", + "47 521.193115 441.253510 4728.966797 \n", + "16 526.623230 170.324142 4792.181152 \n", + "4 517.164368 644.978943 4682.598145 \n", + "5 517.164368 644.978943 4682.598145 \n", + "6 517.164368 644.978943 4682.598145 \n", + "7 517.164368 644.978943 4682.598145 \n", + "17 526.623230 170.324142 4792.181152 \n", + "8 517.164368 644.978943 4682.598145 \n", + "22 534.147095 96.264381 4884.172363 \n", + "23 534.147095 96.264381 4884.172363 \n", + "48 521.193115 441.253510 4728.966797 \n", + "42 528.159302 127.879021 4811.868652 \n", + "27 532.629761 177.876724 4864.585938 \n", + "18 526.623230 170.324142 4792.181152 \n", + "28 532.629761 177.876724 4864.585938 \n", + "49 521.193115 441.253510 4728.966797 \n", + "9 517.164368 644.978943 4682.598145 \n", + "10 517.164368 644.978943 4682.598145 \n", + "40 533.396423 136.454315 4874.791504 \n", + "24 534.147095 96.264381 4884.172363 \n", + "43 528.159302 127.879021 4811.868652 \n", + "11 517.164368 644.978943 4682.598145 \n", + "36 534.452087 86.461655 4888.371582 \n", + "19 526.623230 170.324142 4792.181152 \n", + "37 534.452087 86.461655 4888.371582 \n", + "25 534.147095 96.264381 4884.172363 \n", + "29 532.629761 177.876724 4864.585938 \n", + "12 517.164368 644.978943 4682.598145 \n", + "30 532.629761 177.876724 4864.585938 \n", + "13 517.164368 644.978943 4682.598145 \n", + "31 532.629761 177.876724 4864.585938 \n", + "32 532.629761 177.876724 4864.585938 \n", + "33 532.629761 177.876724 4864.585938 \n" + ] + } + ], "source": [ "lighting = LightVegeManager(lightmodel=\"ratp\", environment=environment)\n", "lighting.build(geometry=triangles)\n", diff --git a/notebooks/example_canopy.ipynb b/notebooks/example_canopy.ipynb index 063b8c3..ff49de6 100644 --- a/notebooks/example_canopy.ipynb +++ b/notebooks/example_canopy.ipynb @@ -34,7 +34,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 2, "id": "8a256e07", "metadata": {}, "outputs": [ @@ -45,7 +45,7 @@ " 'C:\\\\Users\\\\mwoussen\\\\cdd\\\\codes\\\\dev\\\\lightvegemanager\\\\data\\\\LD-F1.bgeom']" ] }, - "execution_count": 3, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } @@ -67,7 +67,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 3, "id": "4748bbba", "metadata": {}, "outputs": [], @@ -143,7 +143,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 5, "id": "d0a11760", "metadata": {}, "outputs": [ @@ -152,17 +152,17 @@ "output_type": "stream", "text": [ " Day Hour Organ VegetationType Area par Eabs par Ei\n", - "0 264 15 825510368 0 83.332180 68.469279 80.552093\n", - "1 264 15 825501440 0 75.958035 174.799148 205.646057\n", - "2 264 15 825503168 0 4.520565 71.441463 84.048780\n", - "3 264 15 825503824 0 57.771363 75.469741 88.787931\n", - "4 264 15 825498448 0 5.711880 113.087842 133.044520\n", + "0 264 15 825510368 0 83.332180 76.246899 89.702234\n", + "1 264 15 825501440 0 75.958035 212.034963 249.452897\n", + "2 264 15 825503168 0 4.520565 108.134153 127.216650\n", + "3 264 15 825503824 0 57.771363 79.214402 93.193414\n", + "4 264 15 825498448 0 5.711880 97.236152 114.395473\n", ".. ... ... ... ... ... ... ...\n", - "321 264 15 825485200 1 2.625990 266.464178 313.487268\n", - "322 264 15 825485904 1 18.000312 119.617531 140.726507\n", - "323 264 15 825486976 1 12.152513 93.015484 109.429981\n", - "324 264 15 825488784 1 9.200676 594.787384 699.749863\n", - "325 264 15 825489120 1 9.200676 419.272837 493.262162\n", + "321 264 15 825485200 1 2.625990 287.633701 338.392589\n", + "322 264 15 825485904 1 18.000312 82.696127 97.289562\n", + "323 264 15 825486976 1 12.152513 78.609077 92.481268\n", + "324 264 15 825488784 1 9.200676 519.140172 610.753143\n", + "325 264 15 825489120 1 9.200676 424.977325 499.973324\n", "\n", "[326 rows x 7 columns]\n" ] @@ -190,22 +190,22 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 6, "id": "89796080", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "f0ea148ac54849e680a6906f47acf159", + "model_id": "af68f411fbf7401da8457c3d4bbf9f53", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'iscrYkj7jZcxvvYDWDY2BWYsh', 'data': b'x\\xda\\x94}\\t\\x98%E\\x95n\\xa…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'iscrYkj7jZcxvvYDWDY2BWYsh', 'data': b'x\\xda\\x94\\x9d\\t|eE\\x95\\xff…" ] }, - "execution_count": 7, + "execution_count": 6, "metadata": {}, "output_type": "execute_result" } @@ -219,6 +219,14 @@ " size_world = 100, \n", " axes_helper=True)" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "b5c47bbe", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/notebooks/input_scenes.ipynb b/notebooks/input_scenes.ipynb index 1aafc3a..2e9cd17 100644 --- a/notebooks/input_scenes.ipynb +++ b/notebooks/input_scenes.ipynb @@ -24,7 +24,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 1, "id": "533d5d6d", "metadata": {}, "outputs": [], @@ -35,7 +35,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "id": "d60e30fc", "metadata": {}, "outputs": [], @@ -53,10 +53,10 @@ "\n", "environment = {\n", " \"coordinates\": coordinates ,\n", - " \"infinite\": infinite\n", + " \"infinite\": infinite,\n", " \"reflected\": reflected,\n", - " \"direct\": False,\n", - " \"diffuse\": True,\n", + " \"direct\": direct,\n", + " \"diffuse\": diffuse,\n", " \"sky\": sky\n", " }" ] @@ -87,7 +87,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 4, "id": "1ce4b2f8", "metadata": {}, "outputs": [], @@ -112,7 +112,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 5, "id": "c029f0db", "metadata": {}, "outputs": [], @@ -134,10 +134,36 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 6, "id": "458d90b0", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Organ VegetationType Area par Eabs par Ei\n", + "0 264 15 111 0 711.771321 296.177789 348.444457\n", + "1 264 15 222 0 1156.884311 306.768543 360.904168\n", + "2 264 15 333 0 654.523573 366.530439 431.212282\n" + ] + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "37dd34b323b048eb81e290412dc06cfc", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "SceneWidget(axes_helper=True, scenes=[{'id': '9RHpyfpxffDxoGLlkL287MFRR', 'data': b'x\\xda\\x85\\x9ayX\\x14W\\xd6\\x…" + ] + }, + "execution_count": 6, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "lighting = LightVegeManager(lightmodel=\"caribu\", environment=environment)\n", "lighting.build(geometry=geometry)\n", @@ -167,7 +193,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 7, "id": "51870eda", "metadata": {}, "outputs": [], @@ -180,10 +206,35 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 8, "id": "933b9683", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Organ VegetationType Area par Eabs par Ei\n", + "0 264 15 888 0 6.000000 159.643042 187.815343\n", + "1 264 15 999 0 4.475681 185.076017 217.736490\n" + ] + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "df141e710a8545b7a1bdb5ef74208ad2", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "SceneWidget(axes_helper=True, scenes=[{'id': '8kU7diEsaj9G3BXsKdlxCbLNN', 'data': b'x\\xda\\x95\\x99\\xddn\\x1bE\\x1…" + ] + }, + "execution_count": 8, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "geometry = {\n", " \"scenes\": [pgl_scene]\n", @@ -212,10 +263,21 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 9, "id": "e8c9d8fe", "metadata": {}, - "outputs": [], + "outputs": [ + { + "data": { + "text/plain": [ + "'C:\\\\Users\\\\mwoussen\\\\cdd\\\\codes\\\\dev\\\\lightvegemanager\\\\data\\\\NICatObs1P2.vgx'" + ] + }, + "execution_count": 9, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "import os\n", "\n", @@ -225,10 +287,34 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 13, "id": "6a3fb580", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Organ VegetationType Area par Eabs par Ei\n", + "0 264 15 0 0 6062.836763 193.704509 227.887658\n" + ] + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "4b54b8b47c85474a876ac15a2ce6c9ff", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "SceneWidget(axes_helper=True, scenes=[{'id': 'HLu9lkkmKusXapCESDnuJx4VP', 'data': b'x\\xda\\x94\\x9d\\x07|U\\xc5\\xb…" + ] + }, + "execution_count": 13, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "geometry = {\n", " \"scenes\": [vgx_path]\n", @@ -241,7 +327,7 @@ " position=(0.0, 0.0, 0.0), \n", " size_display=(600, 400), \n", " plane=True, \n", - " size_world = 5, \n", + " size_world = 100, \n", " axes_helper=True)" ] }, @@ -261,7 +347,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 14, "id": "b5baed34", "metadata": {}, "outputs": [], @@ -273,10 +359,37 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 16, "id": "54448444", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Organ VegetationType Area PARa Intercepted \\\n", + "0 264.0 15.0 0 1 6062.836763 307.604456 215.922903 \n", + "\n", + " Transmitted SunlitPAR SunlitArea ShadedPAR ShadedArea \n", + "0 215.922903 307.604461 252.377915 307.604461 126.601372 \n" + ] + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "92aa1a9361374af78d392edf3b92fce5", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "SceneWidget(axes_helper=True, scenes=[{'id': 'OgKLbEOYkRT69libXrZkXUjuC', 'data': b'x\\xda\\x95XMh]E\\x14\\xbe4\\x8…" + ] + }, + "execution_count": 16, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "geometry = {\n", " \"scenes\": [vgx_path]\n", @@ -292,7 +405,7 @@ " position=(0.0, 0.0, 0.0), \n", " size_display=(600, 400), \n", " plane=True, \n", - " size_world = 5, \n", + " size_world = 100, \n", " axes_helper=True)" ] }, @@ -308,7 +421,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 17, "id": "228bf66a", "metadata": {}, "outputs": [], @@ -322,10 +435,38 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 18, "id": "5a73780f", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Organ VegetationType Area par Eabs par Ei\n", + "0 264 15 19 0 0.000228 159.208612 187.304249\n", + "1 264 15 34 0 0.000013 80.953500 95.239412\n", + "2 264 15 813 0 0.000194 385.317031 453.314154\n", + "3 264 15 814 0 0.000240 367.646906 432.525772\n", + "4 264 15 51 0 0.000284 347.458387 408.774573\n" + ] + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "0d07f0a7f9c541048677b01ae0081ca0", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "SceneWidget(axes_helper=True, scenes=[{'id': 'nOBWAHxiPOAKSUmQc0cHKQkiR', 'data': b'x\\xda\\x95\\x9a{pUW\\x15\\xc6/…" + ] + }, + "execution_count": 18, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "geometry = {\n", " \"scenes\": [g]\n", @@ -353,10 +494,45 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 21, "id": "fbd0394a", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Organ VegetationType Area PARa Intercepted \\\n", + "0 264.0 15.0 19 1 0.000228 435.713379 0.000693 \n", + "1 264.0 15.0 34 1 0.000013 435.713379 0.000693 \n", + "2 264.0 15.0 813 1 0.000194 435.713379 0.000693 \n", + "3 264.0 15.0 814 1 0.000240 441.368498 0.000288 \n", + "4 264.0 15.0 51 1 0.000284 435.713379 0.000693 \n", + "\n", + " Transmitted SunlitPAR SunlitArea ShadedPAR ShadedArea \n", + "0 0.000693 435.713379 0.000776 435.713379 0.000019 \n", + "1 0.000693 435.713379 0.000776 435.713379 0.000019 \n", + "2 0.000693 435.713379 0.000776 435.713379 0.000019 \n", + "3 0.000288 441.368498 0.000322 441.368498 0.000007 \n", + "4 0.000693 435.713379 0.000776 435.713379 0.000019 \n" + ] + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "3e6998ef5bbb441a9941d18881a1b19d", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "SceneWidget(axes_helper=True, scenes=[{'id': 'wctv0d7i6YHequCnJz21Y8umG', 'data': b'x\\xda\\x95\\x9a\\x0bpT\\xd5\\x1…" + ] + }, + "execution_count": 21, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "geometry = {\n", " \"scenes\": [g]\n", @@ -365,7 +541,7 @@ "lighting.build(geometry=geometry)\n", "lighting.run(energy=energy, hour=hour, day=day)\n", "print(lighting.elements_outputs)\n", - "SceneWidget(lighting.plantGL_light(), \n", + "SceneWidget(lighting.plantGL_light(printvoxels=True), \n", " position=(0.0, 0.0, 0.0), \n", " size_display=(600, 400), \n", " plane=True, \n", @@ -404,7 +580,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 22, "id": "c5fd41ea", "metadata": {}, "outputs": [], @@ -438,7 +614,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 23, "id": "9e07c536", "metadata": {}, "outputs": [], @@ -449,7 +625,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 24, "id": "3c7fb334", "metadata": {}, "outputs": [ @@ -458,15 +634,15 @@ "output_type": "stream", "text": [ " Day Hour Organ VegetationType Area par Eabs par Ei\n", - "0 264 15 111 0 768.419509 338.824686 398.617277\n", - "1 264 15 222 0 909.148236 356.214248 419.075585\n", - "2 264 15 333 0 516.913303 347.591562 408.931249\n", - "3 264 15 111 1 752.373340 369.581197 434.801409\n", - "4 264 15 222 1 1170.981330 338.908282 398.715625\n", - "5 264 15 333 1 328.802211 367.175307 431.970949\n", - "6 264 15 111 2 455.953087 355.148363 417.821603\n", - "7 264 15 222 2 1058.844077 366.936675 431.690206\n", - "8 264 15 333 2 349.412007 343.960266 404.659136\n" + "0 264 15 111 0 865.848719 367.620782 432.495038\n", + "1 264 15 222 0 904.093391 343.903742 404.592638\n", + "2 264 15 333 0 500.476649 374.891932 441.049332\n", + "3 264 15 111 1 719.501340 330.624848 388.970410\n", + "4 264 15 222 1 1023.379192 351.641676 413.696090\n", + "5 264 15 333 1 129.105369 391.022326 460.026266\n", + "6 264 15 111 2 1047.414777 335.930702 395.212591\n", + "7 264 15 222 2 1174.044647 349.124635 410.734865\n", + "8 264 15 333 2 521.903258 361.052748 424.767939\n" ] } ], @@ -484,22 +660,22 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 25, "id": "345141f9", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "de90ddedb48d4aedb4fcc83c6e1d5d1a", + "model_id": "4a97c3e9267f4d9bb46c9c1bd9d82408", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'ts5kLc3m4n2jAYkyy7Brmkdi3', 'data': b'x\\xda\\xed\\x9d\\t\\xdcM\\xd5\\x…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'sNiVT3L9ABichdb2gAyBsVr2f', 'data': b'x\\xda\\x85}\\x07|\\x8d\\xd7\\xf…" ] }, - "execution_count": 14, + "execution_count": 25, "metadata": {}, "output_type": "execute_result" } @@ -523,10 +699,46 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 27, "id": "ceea8138", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Organ VegetationType Area PARa Intercepted \\\n", + "0 264.0 15.0 111 1 865.848719 444.431609 438.050846 \n", + "1 264.0 15.0 222 1 904.093391 439.138654 508.370824 \n", + "2 264.0 15.0 333 1 500.476649 438.358519 466.758357 \n", + "3 264.0 15.0 111 2 719.501340 441.984838 374.664274 \n", + "4 264.0 15.0 222 2 1023.379192 436.324817 446.932608 \n", + "5 264.0 15.0 333 2 129.105369 442.768841 373.148804 \n", + "6 264.0 15.0 111 3 1047.414777 437.256257 728.403508 \n", + "7 264.0 15.0 222 3 1174.044647 443.465415 536.007093 \n", + "8 264.0 15.0 333 3 521.903258 432.082470 816.087594 \n", + "\n", + " Transmitted SunlitPAR SunlitArea ShadedPAR ShadedArea \n", + "0 438.050846 450.722334 463.402916 356.222905 49.407779 \n", + "1 508.370824 446.126727 538.617195 351.627301 58.372064 \n", + "2 466.758357 446.387940 492.094716 351.888516 56.801907 \n", + "3 374.664274 449.154416 395.429864 352.554837 42.809579 \n", + "4 446.932608 444.042247 473.516975 347.442668 51.797538 \n", + "5 373.148804 449.336097 395.819748 352.736518 45.454794 \n", + "6 728.403508 444.694193 770.345275 349.806482 81.342446 \n", + "7 536.007093 450.321284 565.173551 355.433568 58.993793 \n", + "8 816.087594 440.468993 864.084337 345.581276 97.832614 \n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "c:\\users\\mwoussen\\cdd\\codes\\dev\\lightvegemanager\\src\\lightvegemanager\\outputs.py:255: UserWarning: You are merging on int and float columns where the float values are not equal to their int representation.\n", + " trianglesoutputs = pandas.merge(dftriangles, voxels_outputs)\n" + ] + } + ], "source": [ "lighting = LightVegeManager(lightmodel=\"ratp\")\n", "lighting.build(geometry=geometry)\n", @@ -560,7 +772,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 28, "id": "867c73bf", "metadata": {}, "outputs": [], @@ -580,7 +792,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 29, "id": "6782b2a5", "metadata": {}, "outputs": [], @@ -591,10 +803,26 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 31, "id": "a3efcb4c", "metadata": {}, - "outputs": [], + "outputs": [ + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "fee3996d2b7c4b8999db62483f47d72d", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "SceneWidget(axes_helper=True, scenes=[{'id': 'IsRMwySFZ9ZohWaXTXeDJB3NN', 'data': b'x\\xda\\x95\\x9a{\\x90\\x14\\xd5…" + ] + }, + "execution_count": 31, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "lighting = LightVegeManager(lightmodel=\"caribu\")\n", "lighting.build(geometry=geometry)\n", @@ -608,10 +836,38 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 32, "id": "1e700495", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " Day Hour Organ VegetationType Area par Eabs par Ei\n", + "0 264 15 19 0 0.000228 194.070089 215.633432\n", + "1 264 15 34 0 0.000013 93.806573 104.229526\n", + "2 264 15 813 0 0.000194 458.967637 539.961926\n", + "3 264 15 814 0 0.000240 392.729426 462.034618\n", + "4 264 15 51 0 0.000284 350.644177 412.522561\n" + ] + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "fd11f5056a724394a87d9c6ef72f0448", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "SceneWidget(axes_helper=True, scenes=[{'id': 'X6MEhdoPOJgZ1bvsYLGzPEHsk', 'data': b'x\\xda\\x95\\x9a{p\\x15\\xd5\\x1…" + ] + }, + "execution_count": 32, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [ "lighting.run(energy=energy, hour=hour, day=day)\n", "print(lighting.elements_outputs)\n", @@ -664,7 +920,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 33, "id": "9c6cf24b", "metadata": {}, "outputs": [], @@ -682,22 +938,22 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 34, "id": "83d85602", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "d495f93c647d4f9aadd61b9a9baaeb31", + "model_id": "b6adf98e08e04c5c9089e088354697ec", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'EUvjRViqmWGdaRiY3dfvYnlbc', 'data': b'x\\xda\\x8d\\x99\\tX\\x95e\\x16\\…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'x2kF5tS9AndLssWwjlaOy3kLL', 'data': b'x\\xda\\x8d\\x99{X\\x95U\\x16\\x…" ] }, - "execution_count": 11, + "execution_count": 34, "metadata": {}, "output_type": "execute_result" } @@ -725,7 +981,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 35, "id": "49b01ec1", "metadata": {}, "outputs": [], @@ -741,22 +997,22 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 36, "id": "3217bce8", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "dfe6d3a060484984887d3b760255ceb3", + "model_id": "a045fecc51424188aab15d51853409b6", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'XoPLZUSCWYRmPc6rCaQu4rIAG', 'data': b'x\\xda\\x8d\\x99\\x0bXUU\\x1a\\x…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'zrGQj63NhCe4kJTSuqwWzqwIq', 'data': b'x\\xda\\x8d\\x99\\x0bTT\\xe5\\x1…" ] }, - "execution_count": 13, + "execution_count": 36, "metadata": {}, "output_type": "execute_result" } @@ -784,7 +1040,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 37, "id": "e8a3c8fd", "metadata": {}, "outputs": [], @@ -799,22 +1055,22 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 38, "id": "cb13af72", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "6621a63d8bec4d4f92e0ee6932a85c2f", + "model_id": "dfd5a2b1c0d8404b98e27e168ba69c21", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'tzqYZWHLS1bM2sROjizKhZxr5', 'data': b'x\\xda\\x8d\\x99yXWe\\x16\\xc7\\…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'HMlA6Yj33bkxnz21kiTM7u5Do', 'data': b'x\\xda\\x8d\\x99{X\\x95U\\x16\\x…" ] }, - "execution_count": 17, + "execution_count": 38, "metadata": {}, "output_type": "execute_result" } @@ -840,7 +1096,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 39, "id": "b50c27e6", "metadata": {}, "outputs": [], @@ -855,22 +1111,22 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 40, "id": "f1244a12", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "cb98511d642046518610b2f0dd5d20dc", + "model_id": "421d7ad5c037463c82654ff73f3c793a", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'YOo3Dgy30xLCUA3kFElJWr1wI', 'data': b'x\\xda\\x8d\\x98yT\\x95\\xd5\\x1…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'gMUutGWi4Dc5iGozgvVOqeQ3B', 'data': b'x\\xda\\x8d\\x99{T\\x95U\\x1a\\x…" ] }, - "execution_count": 19, + "execution_count": 40, "metadata": {}, "output_type": "execute_result" } @@ -904,7 +1160,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 41, "id": "f9bdfded", "metadata": {}, "outputs": [], @@ -920,22 +1176,22 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 42, "id": "cce4df98", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "af16b80e950949a6947282a86fc3ff32", + "model_id": "7bdc83dd5fd540efac5d7a9f2e4f73ed", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'X2rN4Srd09U9mo3a5w4ruLkfw', 'data': b'x\\xda\\x8d\\x99\\x0bXUU\\x16\\x…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'nZK2fX8ANhsqBsN8J5jKjSQ2I', 'data': b'x\\xda\\x8d\\x99{TUU\\x1e\\xc7o…" ] }, - "execution_count": 21, + "execution_count": 42, "metadata": {}, "output_type": "execute_result" } @@ -950,6 +1206,14 @@ " size_world = 50., \n", " axes_helper=True)" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "7b01cc0a", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/notebooks/lightmodels_functionnalities.ipynb b/notebooks/lightmodels_functionnalities.ipynb index c5ef9bb..b3df6bc 100644 --- a/notebooks/lightmodels_functionnalities.ipynb +++ b/notebooks/lightmodels_functionnalities.ipynb @@ -76,7 +76,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 2, "id": "00259bc9", "metadata": {}, "outputs": [ @@ -104,7 +104,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 3, "id": "20273c93", "metadata": {}, "outputs": [ @@ -132,7 +132,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 4, "id": "7b0e119e", "metadata": {}, "outputs": [ @@ -166,7 +166,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 5, "id": "556e7a16", "metadata": {}, "outputs": [], @@ -179,7 +179,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 6, "id": "95967c93", "metadata": {}, "outputs": [], @@ -194,7 +194,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 7, "id": "ed022b4c", "metadata": {}, "outputs": [], @@ -215,22 +215,22 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 8, "id": "8c5f06e2", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "3a795783fa724a46b78a59d52fc5677c", + "model_id": "c4b21ddf6b534ee78c313a600f826ee8", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'rpNaRspB7H0J2oKjhBfYykU71', 'data': b'x\\xda\\x85\\x9a\\xf9\\xba\\x15G…" + "SceneWidget(axes_helper=True, scenes=[{'id': '5Vqwz9Efxkxj28jdFqCxbxcbp', 'data': b'x\\xda\\x85\\x9ai\\xa3\\x1dE\\x1…" ] }, - "execution_count": 13, + "execution_count": 8, "metadata": {}, "output_type": "execute_result" } @@ -254,7 +254,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 9, "id": "fcd4be39", "metadata": {}, "outputs": [ @@ -262,7 +262,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "{'par': {0: 0.51834194067706, 1: 0.5308753998657116, 2: 0.6356410071880358, 3: 0.6280440745835342, 4: 0.7348723244391282, 5: 0.8377871001112634, 6: 0.4617251984176415, 7: 0.495129715697577, 8: 0.6131363817804785, 9: 0.5687714360698057, 10: 0.7322514236236515, 11: 0.8691497441835251, 12: 0.501409869368752, 13: 0.5802620746019611, 14: 0.5684306740502441, 15: 0.5448581816686048, 16: 0.7425834546380425, 17: 0.9448173795583968, 18: 0.48838057941884705, 19: 0.6124255210438949, 20: 0.5122986569042225, 21: 0.5196097528711219, 22: 0.6537519378903659, 23: 0.97910108961367, 24: 0.45924012286835925, 25: 0.5461410549684866, 26: 0.551527499861868, 27: 0.6180217890182801, 28: 0.6108037693496773, 29: 0.9533450759609043, 30: 0.47920650612455634, 31: 0.48509765917006636, 32: 0.4551374400234053, 33: 0.5855859239206206, 34: 0.7597544084095198, 35: 0.8641678490671126, 36: 0.4860121934865708, 37: 0.43959299789620904, 38: 0.43956593364806973, 39: 0.4036644342974864, 40: 0.7638839031112808, 41: 0.9007351905848812, 42: 0.5251419238192803, 43: 0.46126821372044885, 44: 0.41667205111819017, 45: 0.4968340802165048, 46: 0.7948675260827973, 47: 0.9435643107424596, 48: 0.47906967265823486, 49: 0.49778880474951165, 50: 0.4204373489559713, 51: 0.5677638346661975, 52: 0.8022129525509314, 53: 0.9673922133922965, 54: 0.5283510603735843, 55: 0.44551710610975725, 56: 0.49210113391046634, 57: 0.7146955670558728, 58: 0.7356424071887203, 59: 0.9271045254957095, 60: 0.5120418333114727, 61: 0.3596728014228353, 62: 0.37398690002227297, 63: 0.6034948137913889, 64: 0.7336930328783193, 65: 0.8590324029603247, 66: 0.4834097743681514, 67: 0.3910286540349822, 68: 0.3907557306621735, 69: 0.39198401423947576, 70: 0.508504590642667, 71: 0.9416354297249045, 72: 0.4754397848783006, 73: 0.3771805822156766, 74: 0.48198742477852835, 75: 0.40281836559829853, 76: 0.8028721943895224, 77: 0.9700996640514535, 78: 0.4324765007908733, 79: 0.40286405265932684, 80: 0.4517569674397516, 81: 0.5708668477747182, 82: 0.8710161873157761, 83: 0.9559789002347753, 84: 0.4143262511261377, 85: 0.35189874346231115, 86: 0.4504073473488214, 87: 0.6042034732308468, 88: 0.7670304386890762, 89: 0.8370007349434336, 90: 0.46668495886542527, 91: 0.4854025755573592, 92: 0.5345979721002958, 93: 0.62521366369586, 94: 0.651247522500461, 95: 0.8361066859773177, 96: 0.46501102937511973, 97: 0.4923827085324488, 98: 0.5641887632230667, 99: 0.6244764939935656, 100: 0.6782646532084828, 101: 0.9176886772444335, 102: 0.43231267350112107, 103: 0.43287245502849897, 104: 0.5535162151364506, 105: 0.7375322721560529, 106: 0.8536240714978374, 107: 0.9212006440344006, 108: 0.4145466067128266, 109: 0.4810271968225363, 110: 0.5234041338458567, 111: 0.5822987916276953, 112: 0.7415684051648578, 113: 0.816947437440918, 114: 0.3541767811681498, 115: 0.4250647962523507, 116: 0.4917133187582134, 117: 0.5692356324728592, 118: 0.6023285489385215, 119: 0.4528014905789319, 120: 0.5144710738020222, 121: 0.5368482445866736, 122: 0.6732298585703681, 123: 0.6857984441696575, 124: 0.6038900904068507, 125: 0.8493901265405036, 126: 0.4358880212918314, 127: 0.48329446189795555, 128: 0.6598711427288821, 129: 0.6519413545787534, 130: 0.6073208628736244, 131: 0.930992314691149, 132: 0.5067107970636116, 133: 0.524213064318667, 134: 0.6315028079173408, 135: 0.6370967379539592, 136: 0.6800813165981127, 137: 0.9139708890616902, 138: 0.4376666339795125, 139: 0.5281068049896077, 140: 0.5994199029108521, 141: 0.4977449274533771, 142: 0.4408512805419674, 143: 0.8936171526701367, 144: 0.41178392940457, 145: 0.5055553902936644, 146: 0.6188786457511692, 147: 0.6059780088098925, 148: 0.5696229915527733, 149: 0.8506266556565081}}\n" + "{'par': {0: 0.4560724473971301, 1: 0.5597166461228308, 2: 0.6986380128556864, 3: 0.6845203904383483, 4: 0.6906468953330336, 5: 0.9987378235520781, 6: 0.5310573079813798, 7: 0.467795931803776, 8: 0.6538145674220506, 9: 0.7236034554986488, 10: 0.8572887301698419, 11: 0.998669244158108, 12: 0.511913521816071, 13: 0.39631908042333885, 14: 0.46969240011946356, 15: 0.5903884616056262, 16: 0.9084580599815228, 17: 0.9990156380849111, 18: 0.48702812641362986, 19: 0.4205418304454306, 20: 0.5971990625876635, 21: 0.8058332876390724, 22: 0.8607864300703283, 23: 0.9990854702131475, 24: 0.4501434457248188, 25: 0.5894430533669032, 26: 0.6723992524655475, 27: 0.7648694261577343, 28: 0.9318459165061888, 29: 0.9993280153519044, 30: 0.45474822288861627, 31: 0.546989522018469, 32: 0.658102048001646, 33: 0.7095541719414544, 34: 0.7739174998275351, 35: 0.9962935671991479, 36: 0.5377586676014298, 37: 0.5382639317346481, 38: 0.5408160927438361, 39: 0.7935959927971068, 40: 0.920196831289358, 41: 0.9975696089957445, 42: 0.4575451377636548, 43: 0.4036439194570512, 44: 0.4629005218114519, 45: 0.7549075175888795, 46: 0.9344286303567234, 47: 0.9973638583526065, 48: 0.3593421074458185, 49: 0.464355422688018, 50: 0.4894984165408405, 51: 0.7187810081555954, 52: 0.8779509595989947, 53: 0.9968141657812191, 54: 0.4374935829159728, 55: 0.5195157706289963, 56: 0.6565213414057143, 57: 0.7729795069285983, 58: 0.8623410211362983, 59: 0.9979269460524829, 60: 0.44586454300295997, 61: 0.4348611335897764, 62: 0.6148082004039533, 63: 0.8324504678080485, 64: 0.9124491374752436, 65: 0.9983942731821154, 66: 0.47642684964200865, 67: 0.515955760765495, 68: 0.5153631174483889, 69: 0.7996662166867451, 70: 0.8669882197327463, 71: 0.9613470264092893, 72: 0.3774759244588849, 73: 0.37054974913539224, 74: 0.6067861089636581, 75: 0.7522868804721149, 76: 0.8257344311627344, 77: 0.9915175072021412, 78: 0.46610953441102604, 79: 0.4176267985376496, 80: 0.5816549331691615, 81: 0.5340600258694032, 82: 0.6291900376440045, 83: 0.9824065502754242, 84: 0.41011567246694364, 85: 0.49749834575770147, 86: 0.6504402992478163, 87: 0.7268510492952461, 88: 0.8716554984611687, 89: 0.9949911274718047, 90: 0.4753288758620162, 91: 0.6264822051112617, 92: 0.6350025517881998, 93: 0.8457093231724656, 94: 0.8496522506896284, 95: 0.9978168938158875, 96: 0.520343405638044, 97: 0.5752986948647784, 98: 0.6154304899020375, 99: 0.6507350368554838, 100: 0.870876811854064, 101: 0.9110524680856302, 102: 0.48391879596716003, 103: 0.4379432719551198, 104: 0.6559593103708854, 105: 0.7057688255344525, 106: 0.7489938563512457, 107: 0.9359418936260193, 108: 0.47316970901611205, 109: 0.4901027314173215, 110: 0.6565758189863061, 111: 0.7386660945797882, 112: 0.6809050141156036, 113: 0.9863509160454065, 114: 0.497664038000291, 115: 0.5620618011591737, 116: 0.680023672013987, 117: 0.8132931975715953, 118: 0.8359532384794398, 119: 0.9944751487289748, 120: 0.49410835028203914, 121: 0.6335778821330184, 122: 0.6995101564860964, 123: 0.7957274522610597, 124: 0.7714318345743875, 125: 0.9983821980240223, 126: 0.523007540302683, 127: 0.5913991658596133, 128: 0.723803258296944, 129: 0.7780059226307945, 130: 0.9284260571472582, 131: 0.98273443024487, 132: 0.5652129376170574, 133: 0.5512760273474778, 134: 0.688505915312587, 135: 0.8013038104452361, 136: 0.8600777428183627, 137: 0.9911055809424814, 138: 0.47240896668946614, 139: 0.3742115838914664, 140: 0.48899247235676224, 141: 0.790849797442867, 142: 0.8013351276529527, 143: 0.9977262538727758, 144: 0.49695358186675836, 145: 0.5766839072377725, 146: 0.6534937344672704, 147: 0.7943642004984268, 148: 0.8327292330291998, 149: 0.9987524980695914}}\n" ] } ], @@ -285,22 +285,22 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 10, "id": "3258001b", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "05f30102f14341ecb4653a8ea0141448", + "model_id": "8fb46ebde7124a8ea12027669a3774bd", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': '5oUEYlG3YRLDXmFUN2Lt207uh', 'data': b'x\\xda\\x8d\\x9by\\x9f\\x16G\\x1…" + "SceneWidget(axes_helper=True, scenes=[{'id': '0vMmSlh4jzpepdy4s3WDR4UPn', 'data': b'x\\xda\\x8d\\x9b\\xeb\\x83VU\\x1…" ] }, - "execution_count": 18, + "execution_count": 10, "metadata": {}, "output_type": "execute_result" } @@ -316,22 +316,22 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 11, "id": "5f2b40d2", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "f9145d6171ca4f0bb5bf8d2deb69d5ed", + "model_id": "2b5e06124ce741ab8849cdad61f61a18", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'JRXUARzeztEqD2KcWxWb1bEoI', 'data': b'x\\xda\\x8d\\x9c\\t\\x98\\x16\\xc…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'A5C5KpsvluofwnlhgGz2Qa4N7', 'data': b'x\\xda\\x8d\\x9c\\t\\x98\\x16\\xc…" ] }, - "execution_count": 15, + "execution_count": 11, "metadata": {}, "output_type": "execute_result" } @@ -357,7 +357,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 12, "id": "494b7ef9", "metadata": {}, "outputs": [ @@ -371,17 +371,17 @@ }, { "ename": "FileNotFoundError", - "evalue": "[Errno 2] No such file or directory: './caribuscene_3041942304848\\\\cscene.can'", + "evalue": "[Errno 2] No such file or directory: './caribuscene_2255566074448\\\\cscene.can'", "output_type": "error", "traceback": [ "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m", "\u001b[1;31mFileNotFoundError\u001b[0m Traceback (most recent call last)", - "Cell \u001b[1;32mIn[20], line 9\u001b[0m\n\u001b[0;32m 7\u001b[0m hour \u001b[38;5;241m=\u001b[39m \u001b[38;5;241m15\u001b[39m\n\u001b[0;32m 8\u001b[0m day \u001b[38;5;241m=\u001b[39m \u001b[38;5;241m264\u001b[39m\n\u001b[1;32m----> 9\u001b[0m \u001b[43mlighting\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mrun\u001b[49m\u001b[43m(\u001b[49m\u001b[43menergy\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43menergy\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mhour\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mhour\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mday\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mday\u001b[49m\u001b[43m)\u001b[49m\n", - "File \u001b[1;32mc:\\users\\mwoussen\\cdd\\codes\\dev\\lightvegemanager\\src\\lightvegemanager\\tool.py:477\u001b[0m, in \u001b[0;36mLightVegeManager.run\u001b[1;34m(self, energy, day, hour, parunit, truesolartime, id_sensors)\u001b[0m\n\u001b[0;32m 475\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m sun_sky_option \u001b[38;5;241m==\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mmix\u001b[39m\u001b[38;5;124m\"\u001b[39m:\n\u001b[0;32m 476\u001b[0m start \u001b[38;5;241m=\u001b[39m time\u001b[38;5;241m.\u001b[39mtime()\n\u001b[1;32m--> 477\u001b[0m raw_sun, aggregated_sun \u001b[38;5;241m=\u001b[39m \u001b[43mrun_caribu\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;241;43m*\u001b[39;49m\u001b[43marg\u001b[49m\u001b[43m)\u001b[49m\n\u001b[0;32m 478\u001b[0m arg[\u001b[38;5;241m0\u001b[39m] \u001b[38;5;241m=\u001b[39m c_scene_sky\n\u001b[0;32m 479\u001b[0m raw_sky, aggregated_sky \u001b[38;5;241m=\u001b[39m run_caribu(\u001b[38;5;241m*\u001b[39marg)\n", - "File \u001b[1;32mc:\\users\\mwoussen\\cdd\\codes\\dev\\lightvegemanager\\src\\lightvegemanager\\CARIBUinputs.py:372\u001b[0m, in \u001b[0;36mrun_caribu\u001b[1;34m(c_scene, direct_active, infinite, sensors, energy)\u001b[0m\n\u001b[0;32m 331\u001b[0m \u001b[38;5;250m\u001b[39m\u001b[38;5;124;03m\"\"\"runs caribu depending on input options\u001b[39;00m\n\u001b[0;32m 332\u001b[0m \n\u001b[0;32m 333\u001b[0m \u001b[38;5;124;03m:param c_scene: instance of CaribuScene containing geometry, light source(s), opt etc...\u001b[39;00m\n\u001b[1;32m (...)\u001b[0m\n\u001b[0;32m 369\u001b[0m \u001b[38;5;124;03m:rtype: dict of dict, dict of dict\u001b[39;00m\n\u001b[0;32m 370\u001b[0m \u001b[38;5;124;03m\"\"\"\u001b[39;00m \n\u001b[0;32m 371\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m sensors \u001b[38;5;129;01mis\u001b[39;00m \u001b[38;5;28;01mNone\u001b[39;00m :\n\u001b[1;32m--> 372\u001b[0m raw, aggregated \u001b[38;5;241m=\u001b[39m \u001b[43mc_scene\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mrun\u001b[49m\u001b[43m(\u001b[49m\u001b[43mdirect\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mdirect_active\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43minfinite\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43minfinite\u001b[49m\u001b[43m)\u001b[49m\n\u001b[0;32m 373\u001b[0m \u001b[38;5;28;01melse\u001b[39;00m :\n\u001b[0;32m 374\u001b[0m raw, aggregated \u001b[38;5;241m=\u001b[39m c_scene\u001b[38;5;241m.\u001b[39mrun(direct\u001b[38;5;241m=\u001b[39mdirect_active, infinite\u001b[38;5;241m=\u001b[39minfinite, \n\u001b[0;32m 375\u001b[0m sensors\u001b[38;5;241m=\u001b[39msensors)\n", + "Cell \u001b[1;32mIn[12], line 9\u001b[0m\n\u001b[0;32m 7\u001b[0m hour \u001b[38;5;241m=\u001b[39m \u001b[38;5;241m15\u001b[39m\n\u001b[0;32m 8\u001b[0m day \u001b[38;5;241m=\u001b[39m \u001b[38;5;241m264\u001b[39m\n\u001b[1;32m----> 9\u001b[0m \u001b[43mlighting\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mrun\u001b[49m\u001b[43m(\u001b[49m\u001b[43menergy\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43menergy\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mhour\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mhour\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mday\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mday\u001b[49m\u001b[43m)\u001b[49m\n", + "File \u001b[1;32mc:\\users\\mwoussen\\cdd\\codes\\dev\\lightvegemanager\\src\\lightvegemanager\\tool.py:510\u001b[0m, in \u001b[0;36mLightVegeManager.run\u001b[1;34m(self, energy, day, hour, parunit, truesolartime, id_sensors)\u001b[0m\n\u001b[0;32m 508\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m sun_sky_option \u001b[38;5;241m==\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mmix\u001b[39m\u001b[38;5;124m\"\u001b[39m:\n\u001b[0;32m 509\u001b[0m start \u001b[38;5;241m=\u001b[39m time\u001b[38;5;241m.\u001b[39mtime()\n\u001b[1;32m--> 510\u001b[0m raw_sun, aggregated_sun \u001b[38;5;241m=\u001b[39m \u001b[43mrun_caribu\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;241;43m*\u001b[39;49m\u001b[43marg\u001b[49m\u001b[43m)\u001b[49m\n\u001b[0;32m 511\u001b[0m arg[\u001b[38;5;241m0\u001b[39m] \u001b[38;5;241m=\u001b[39m c_scene_sky\n\u001b[0;32m 512\u001b[0m raw_sky, aggregated_sky \u001b[38;5;241m=\u001b[39m run_caribu(\u001b[38;5;241m*\u001b[39marg)\n", + "File \u001b[1;32mc:\\users\\mwoussen\\cdd\\codes\\dev\\lightvegemanager\\src\\lightvegemanager\\CARIBUinputs.py:370\u001b[0m, in \u001b[0;36mrun_caribu\u001b[1;34m(c_scene, direct_active, infinite, sensors, energy)\u001b[0m\n\u001b[0;32m 329\u001b[0m \u001b[38;5;250m\u001b[39m\u001b[38;5;124;03m\"\"\"runs caribu depending on input options\u001b[39;00m\n\u001b[0;32m 330\u001b[0m \n\u001b[0;32m 331\u001b[0m \u001b[38;5;124;03m:param c_scene: instance of CaribuScene containing geometry, light source(s), opt etc...\u001b[39;00m\n\u001b[1;32m (...)\u001b[0m\n\u001b[0;32m 367\u001b[0m \u001b[38;5;124;03m:rtype: dict of dict, dict of dict\u001b[39;00m\n\u001b[0;32m 368\u001b[0m \u001b[38;5;124;03m\"\"\"\u001b[39;00m \n\u001b[0;32m 369\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m sensors \u001b[38;5;129;01mis\u001b[39;00m \u001b[38;5;28;01mNone\u001b[39;00m :\n\u001b[1;32m--> 370\u001b[0m raw, aggregated \u001b[38;5;241m=\u001b[39m \u001b[43mc_scene\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mrun\u001b[49m\u001b[43m(\u001b[49m\u001b[43mdirect\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mdirect_active\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43minfinite\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43minfinite\u001b[49m\u001b[43m)\u001b[49m\n\u001b[0;32m 371\u001b[0m \u001b[38;5;28;01melse\u001b[39;00m :\n\u001b[0;32m 372\u001b[0m raw, aggregated \u001b[38;5;241m=\u001b[39m c_scene\u001b[38;5;241m.\u001b[39mrun(direct\u001b[38;5;241m=\u001b[39mdirect_active, infinite\u001b[38;5;241m=\u001b[39minfinite, \n\u001b[0;32m 373\u001b[0m sensors\u001b[38;5;241m=\u001b[39msensors)\n", "File \u001b[1;32m~\\AppData\\Local\\miniconda3\\envs\\mobidivpy37\\lib\\site-packages\\alinea.caribu-8.0.7-py3.8.egg\\alinea\\caribu\\CaribuScene.py:568\u001b[0m, in \u001b[0;36mCaribuScene.run\u001b[1;34m(self, direct, infinite, d_sphere, layers, height, screen_size, screen_resolution, sensors, split_face, simplify)\u001b[0m\n\u001b[0;32m 566\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mcanfile \u001b[38;5;241m=\u001b[39m os\u001b[38;5;241m.\u001b[39mpath\u001b[38;5;241m.\u001b[39mjoin(\u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mtempdir,\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mcscene.can\u001b[39m\u001b[38;5;124m'\u001b[39m)\n\u001b[0;32m 567\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39moptfile \u001b[38;5;241m=\u001b[39m os\u001b[38;5;241m.\u001b[39mpath\u001b[38;5;241m.\u001b[39mjoin(\u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mtempdir,\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mband0.opt\u001b[39m\u001b[38;5;124m'\u001b[39m)\n\u001b[1;32m--> 568\u001b[0m \u001b[43mwrite_scene\u001b[49m\u001b[43m(\u001b[49m\u001b[43mtriangles\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmaterials\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mcanfile\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43m \u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mcanfile\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43moptfile\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43m \u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43moptfile\u001b[49m\u001b[43m)\u001b[49m\n\u001b[0;32m 570\u001b[0m \u001b[38;5;28;01melse\u001b[39;00m:\n\u001b[0;32m 571\u001b[0m \u001b[38;5;66;03m# self.materialvalues is a cache for the computation of the material list\u001b[39;00m\n\u001b[0;32m 572\u001b[0m materials \u001b[38;5;241m=\u001b[39m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mmaterialvalues\n", "File \u001b[1;32m~\\AppData\\Local\\miniconda3\\envs\\mobidivpy37\\lib\\site-packages\\alinea.caribu-8.0.7-py3.8.egg\\alinea\\caribu\\caribu.py:177\u001b[0m, in \u001b[0;36mwrite_scene\u001b[1;34m(triangles, materials, canfile, optfile)\u001b[0m\n\u001b[0;32m 175\u001b[0m o_string, labels \u001b[38;5;241m=\u001b[39m opt_string_and_labels(materials)\n\u001b[0;32m 176\u001b[0m can_string \u001b[38;5;241m=\u001b[39m triangles_string(triangles, labels)\n\u001b[1;32m--> 177\u001b[0m \u001b[38;5;28;43mopen\u001b[39;49m\u001b[43m(\u001b[49m\u001b[43mcanfile\u001b[49m\u001b[43m,\u001b[49m\u001b[38;5;124;43m'\u001b[39;49m\u001b[38;5;124;43mw\u001b[39;49m\u001b[38;5;124;43m'\u001b[39;49m\u001b[43m)\u001b[49m\u001b[38;5;241m.\u001b[39mwrite(can_string)\n\u001b[0;32m 178\u001b[0m \u001b[38;5;28mopen\u001b[39m(optfile,\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mw\u001b[39m\u001b[38;5;124m'\u001b[39m)\u001b[38;5;241m.\u001b[39mwrite(o_string)\n", - "\u001b[1;31mFileNotFoundError\u001b[0m: [Errno 2] No such file or directory: './caribuscene_3041942304848\\\\cscene.can'" + "\u001b[1;31mFileNotFoundError\u001b[0m: [Errno 2] No such file or directory: './caribuscene_2255566074448\\\\cscene.can'" ] } ], @@ -407,7 +407,7 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": 13, "id": "bf20d164", "metadata": {}, "outputs": [ @@ -489,7 +489,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 14, "id": "17d41b51", "metadata": {}, "outputs": [], @@ -513,7 +513,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 15, "id": "13097ed4", "metadata": {}, "outputs": [ @@ -550,7 +550,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 16, "id": "7c882e53", "metadata": {}, "outputs": [ @@ -558,7 +558,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "{'global': [[0.06155178223916461, 0.12499042395940269, 0.06445789476401936, 0.1187479400647726, 0.21074770572428322, 0.12460435598932129, 0.1405535570495526, 0.01797247992923503, 0.13637386028024864]]}\n" + "{'global': [[0.0, 0.19273415359521537, 0.11554748213196556, 0.17677495458860615, 0.18680529870130733, 0.10087211486436341, 0.03267928815256627, 0.1403135320597791, 0.05427317590619683]]}\n" ] } ], @@ -586,7 +586,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 17, "id": "397e12a3", "metadata": {}, "outputs": [ @@ -595,59 +595,59 @@ "output_type": "stream", "text": [ "Global\n", - "[[0.09035031695555507, 0.08761577143411951, 0.056255001524189746, 0.0753746859951702, 0.27007435951575953, 0.12360752121946102, 0.1302826782705683, 0.113942659680832, 0.05249700540434461]]\n", + "[[0.0, 0.19273415359521537, 0.11554748213196556, 0.17677495458860615, 0.18680529870130733, 0.10087211486436341, 0.03267928815256627, 0.1403135320597791, 0.05427317590619683]]\n", "\n", "\n", " Local\n", - "[0. 0. 0. 0. 0. 0. 0. 1. 0.]\n", - "[0. 0. 1. 0. 0. 0. 0. 0. 0.]\n", - "[0. 0. 0. 1. 0. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 0. 0. 0. 1. 0.]\n", + "[0. 0. 0. 0. 0. 0. 0. 0. 1.]\n", + "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0. 0. 1. 0. 0. 0.]\n", "[0. 0. 1. 0. 0. 0. 0. 0. 0.]\n", - "[0.55943496 0. 0.44056504 0. 0. 0.\n", - " 0. 0. 0. ]\n", "[0. 1. 0. 0. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0.99043699 0. 0. 0.\n", + " 0. 0. 0.00956301]\n", "[0. 0. 0. 0. 0. 0. 1. 0. 0.]\n", - "[0. 0. 0. 0. 0. 0. 0. 0. 1.]\n", - "[0. 0. 0. 0. 0. 0. 1. 0. 0.]\n", - "[0. 0.81407011 0. 0.18592989 0. 0.\n", - " 0. 0. 0. ]\n", - "[0. 0. 0. 0. 0. 1. 0. 0. 0.]\n", "[0. 0. 1. 0. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0.95844425 0. 0.\n", + " 0. 0.04155575 0. ]\n", "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 0. 1. 0. 0. 0.]\n", - "[0. 0.00742362 0. 0. 0. 0.\n", - " 0.30061391 0.69196247 0. ]\n", "[0. 1. 0. 0. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 1. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0.02857925 0. 0.\n", + " 0.97142075 0. 0. ]\n", "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0.303138 0. 0.696862 0. 0.\n", + " 0. ]\n", "[0. 0. 0. 0. 0. 0. 0. 1. 0.]\n", + "[0. 0. 1. 0. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 1. 0. 0. 0. 0. 0.]\n", + "[0. 1. 0. 0. 0. 0. 0. 0. 0.]\n", + "[0. 1. 0. 0. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0. 0. 1. 0. 0. 0.]\n", + "[0. 0. 0. 0. 0. 0. 0. 0. 1.]\n", + "[0. 1. 0. 0. 0. 0. 0. 0. 0.]\n", "[0. 0. 0. 0. 0. 0. 0. 1. 0.]\n", - "[0. 0. 0. 0. 0. 0. 0. 1. 0.]\n", + "[0. 0. 1. 0. 0. 0. 0. 0. 0.]\n", "[0. 0. 0. 0. 0. 0. 0. 0. 1.]\n", "[0. 1. 0. 0. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 1. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 1. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0. 0. 0. 1. 0. 0.]\n", "[0. 1. 0. 0. 0. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 0. 0. 0. 1. 0.]\n", - "[1. 0. 0. 0. 0. 0. 0. 0. 0.]\n", + "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", "[0. 0. 0. 0. 0. 1. 0. 0. 0.]\n", + "[0. 0. 0. 0. 0.23071426 0.\n", + " 0. 0.76928574 0. ]\n", "[0. 0. 0. 1. 0. 0. 0. 0. 0.]\n", "[0. 0. 0. 0. 0. 0. 1. 0. 0.]\n", - "[0. 0. 0. 0.60484427 0. 0.39515573\n", - " 0. 0. 0. ]\n", - "[0. 0. 0. 0. 0. 0. 1. 0. 0.]\n", + "[0. 0. 0. 0. 0. 0. 0. 0. 1.]\n", + "[0. 0. 0. 1. 0. 0. 0. 0. 0.]\n", "[0. 0. 1. 0. 0. 0. 0. 0. 0.]\n", "[0. 0. 0. 0. 0. 0. 1. 0. 0.]\n", - "[0. 0. 0. 0. 0. 1. 0. 0. 0.]\n", - "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", - "[0. 1. 0. 0. 0. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 1. 0. 0. 0. 0.]\n", - "[1. 0. 0. 0. 0. 0. 0. 0. 0.]\n", - "[0. 0. 0. 0. 0. 0. 1. 0. 0.]\n", - "[0. 0. 0. 0. 0. 0. 0. 0. 1.]\n" + "[0. 0. 0. 1. 0. 0. 0. 0. 0.]\n" ] } ], @@ -681,22 +681,22 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 18, "id": "9f6ae1ef", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "f959c5e51d6f46a2adf4786f7aac29c6", + "model_id": "aec11614bc4040c5a887b0de6aefeebe", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'VXiNJUbqifCr9iQOhQ9okiBdG', 'data': b'x\\xda\\x8d[\\tx\\x14E\\xda\\x1e…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'usAftBR7F6qaaxhGICGSDolmJ', 'data': b'x\\xda\\x8d\\x9b\\x0b\\x9cNe\\xf…" ] }, - "execution_count": 14, + "execution_count": 18, "metadata": {}, "output_type": "execute_result" } @@ -733,28 +733,28 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 21, "id": "b110d224", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "a4d4919bf69441cebd10a56c2a976bde", + "model_id": "06b27e827cfe46f784e8d39259bacc84", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'gV833JQsWfuarucHtF2W2o3IM', 'data': b'x\\xda\\x95[\\x0bX\\x15\\xd5\\x1…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'w9mu1jQPBqZrSzDk4B45B9Wav', 'data': b'x\\xda\\x94}\\x07\\x9c^E\\xd5~\\…" ] }, - "execution_count": 18, + "execution_count": 21, "metadata": {}, "output_type": "execute_result" } ], "source": [ - "ratp_parameters = { \"tesselation level\" : 7 }\n", + "ratp_parameters = { \"voxel size\" : [1., 1., 1.], \"tesselation level\" : 7 }\n", "\n", "# initialize the instance\n", "lighting = LightVegeManager(lightmodel=\"ratp\", lightmodel_parameters=ratp_parameters)\n", @@ -762,7 +762,7 @@ "# build the scene\n", "lighting.build(geometry=triangles)\n", "\n", - "SceneWidget(lighting.plantGL_nolight(printtriangles=True, printvoxels=False), \n", + "SceneWidget(lighting.plantGL_nolight(printtriangles=True, printvoxels=True), \n", " position=(-2.5, -2.5, 0.0), \n", " size_display=(600, 400), \n", " plane=True, \n", diff --git a/notebooks/misc_functionnalities.ipynb b/notebooks/misc_functionnalities.ipynb index 022a86e..adb63a5 100644 --- a/notebooks/misc_functionnalities.ipynb +++ b/notebooks/misc_functionnalities.ipynb @@ -20,7 +20,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 2, "id": "8fb624d3", "metadata": {}, "outputs": [], @@ -43,7 +43,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 3, "id": "4e549342", "metadata": {}, "outputs": [], @@ -57,22 +57,22 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 4, "id": "1ee0c915", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "6d6d7a0ffa0142ccb3ceb5f63d3d7024", + "model_id": "a0266ff658464ff9a89b670ad44344cd", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'oSXyv6iz2DTQz0KoxvgBXntAb', 'data': b'x\\xda\\x8d\\x9a\\tx\\x8c\\xd7\\x…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'yzVYGjZteDIrbWAmTbVRTbx1K', 'data': b'x\\xda\\x8d\\x99\\tTU\\xe5\\x16\\…" ] }, - "execution_count": 3, + "execution_count": 4, "metadata": {}, "output_type": "execute_result" } @@ -90,22 +90,22 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 5, "id": "63792b47", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "97d974ceb68348e8a7dedae8cce7ab06", + "model_id": "c625d9a816254301b7ef4a4d980830ce", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': '8r1yEjQBEvJuGRFlSzojGn4je', 'data': b'x\\xda\\x94]\\x07x^\\xb5\\xd5\\x…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'vlG27LZFPA22LwOpXszBr5NR7', 'data': b'x\\xda\\x94]\\x07\\x9c\\x9eE\\xd…" ] }, - "execution_count": 7, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } @@ -282,7 +282,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 6, "id": "20ac8017", "metadata": {}, "outputs": [], @@ -304,7 +304,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 7, "id": "0a249600", "metadata": {}, "outputs": [], @@ -316,7 +316,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 8, "id": "4f72e4bf", "metadata": {}, "outputs": [ @@ -354,7 +354,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 9, "id": "a1d0e71b", "metadata": {}, "outputs": [ @@ -362,72 +362,90 @@ "name": "stdout", "output_type": "stream", "text": [ - " dimensions de la maquette (x,y): 7.000 6.000\n", + " dimensions de la maquette (x,y): 5.000 3.000\n", " nombre de repetitions du motif: 1.0\n", "\n", " STATISTIQUES GLOBALES DE CHAQUE ESPECE\n", "\n", - " espece: 1 surface foliaire: .249D+01 lai : 0.0593\n", - " distribution en zenith: 0.0000 0.0000 0.0000 0.0000 0.6634 0.0905 0.0795 0.1666 0.0000\n", - " distribution en azimuth: 0.3231 0.1666 0.3404 0.0795 0.0000 0.0000 0.0000 0.0905 0.0000\n", + " espece: 1 surface foliaire: .411D+01 lai : 0.2738\n", + " distribution en zenith: 0.0000 0.3407 0.0000 0.1688 0.0000 0.0000 0.3105 0.0000 0.1800\n", + " distribution en azimuth: 0.0189 0.0000 0.3407 0.0000 0.3105 0.0000 0.0000 0.3299 0.0000\n", "\n", "\n", " STATISTIQUES PAR CELLULE\n", "\n", - " 1 1 1 1 0.122\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000\n", + " 1 1 1 1 0.041\n", + " 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 1 1 3 1 0.008\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000\n", + " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", + " 1 2 3 1 0.011\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000\n", + " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", + " 1 3 1 1 0.014\n", + " 0.0000 0.0000 0.0000 0.1847 0.0000 0.0000 0.0000 0.0000 0.8153\n", + " 0.1847 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.8153 0.0000\n", + " 1 3 2 1 0.180\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000\n", " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n", - " 1 2 1 1 0.003\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000\n", + " 2 1 1 1 0.032\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000\n", " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n", - " 1 5 1 1 0.177\n", + " 2 1 2 1 0.718\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4841 0.0000 0.5159\n", + " 0.0000 0.0000 0.0000 0.0000 0.4841 0.0000 0.0000 0.5159 0.0000\n", + " 2 1 3 1 0.027\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.9534 0.0000 0.0466\n", + " 0.0000 0.0000 0.0000 0.0000 0.9534 0.0000 0.0000 0.0466 0.0000\n", + " 2 2 3 1 0.005\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000\n", " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", - " 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 1 6 1 1 0.002\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000\n", + " 2 3 1 1 0.039\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000\n", " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n", - " 2 1 1 1 0.011\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000\n", + " 2 3 2 1 0.104\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000\n", " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n", - " 2 2 1 1 0.088\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n", - " 2 5 1 1 0.672\n", + " 3 1 1 1 0.058\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000\n", " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", - " 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 3 2 1 1 0.000\n", + " 3 1 2 1 0.696\n", " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000\n", - " 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 3 4 1 1 0.389\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n", + " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", + " 3 2 3 1 0.007\n", " 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 3 5 1 1 0.010\n", + " 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 3 3 3 1 0.183\n", + " 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 4 1 2 1 0.288\n", + " 0.0000 0.0000 0.0000 0.5694 0.0000 0.0000 0.4306 0.0000 0.0000\n", + " 0.0000 0.0000 0.0000 0.0000 0.4306 0.0000 0.0000 0.5694 0.0000\n", + " 4 1 3 1 0.204\n", + " 0.0000 0.4558 0.0000 0.5442 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 0.0000 0.0000 0.4558 0.0000 0.0000 0.0000 0.0000 0.5442 0.0000\n", + " 4 2 2 1 0.157\n", + " 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n", + " 4 2 3 1 0.357\n", + " 0.0000 0.6117 0.0000 0.3883 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 0.0000 0.0000 0.6117 0.0000 0.0000 0.0000 0.0000 0.3883 0.0000\n", + " 4 3 3 1 0.897\n", " 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 4 2 1 1 0.121\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000\n", + " 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 5 1 1 1 0.034\n", " 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 4 3 1 1 0.077\n", - " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000\n", + " 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 5 1 2 1 0.026\n", " 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 4 4 1 1 0.017\n", " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n", + " 5 1 3 1 0.001\n", " 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 5 4 1 1 0.017\n", - " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", - " 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 6 4 1 1 0.402\n", - " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", - " 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 6 5 1 1 0.168\n", - " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", - " 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 7 4 1 1 0.122\n", - " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", - " 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", - " 7 5 1 1 0.096\n", - " 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000\n", - " 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n" + " 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 5 2 2 1 0.019\n", + " 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000\n", + " 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000\n" ] } ], @@ -452,7 +470,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 10, "id": "7a38079a", "metadata": {}, "outputs": [ @@ -460,17 +478,30 @@ "name": "stdout", "output_type": "stream", "text": [ - " 1 2 1 1 0.014 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000\n", - " 2 1 1 1 0.084 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.613 0.000 0.000 0.387 0.000 0.000\n", - " 2 1 2 1 0.002 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000\n", - " 2 2 1 1 0.129 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000\n", - " 3 1 1 1 0.027 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000\n", - " 3 1 4 1 0.030 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000\n", - " 3 2 1 1 0.041 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000\n", - " 3 5 4 1 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n", - " 3 6 4 1 0.084 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n", - " 4 1 4 1 0.203 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000\n", - " 4 2 1 1 0.286 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000\n" + " 1 1 1 1 0.041 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000\n", + " 1 1 3 1 0.008 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000\n", + " 1 2 3 1 0.011 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000\n", + " 1 3 1 1 0.014 0.000 0.000 0.000 0.185 0.000 0.000 0.000 0.000 0.815 0.185 0.000 0.000 0.000 0.000 0.000 0.000 0.815 0.000\n", + " 1 3 2 1 0.180 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n", + " 2 1 1 1 0.032 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n", + " 2 1 2 1 0.718 0.000 0.000 0.000 0.000 0.000 0.000 0.484 0.000 0.516 0.000 0.000 0.000 0.000 0.484 0.000 0.000 0.516 0.000\n", + " 2 1 3 1 0.027 0.000 0.000 0.000 0.000 0.000 0.000 0.953 0.000 0.047 0.000 0.000 0.000 0.000 0.953 0.000 0.000 0.047 0.000\n", + " 2 2 3 1 0.005 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000\n", + " 2 3 1 1 0.039 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n", + " 2 3 2 1 0.104 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n", + " 3 1 1 1 0.058 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000\n", + " 3 1 2 1 0.696 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000\n", + " 3 2 3 1 0.007 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000\n", + " 3 3 3 1 0.183 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000\n", + " 4 1 2 1 0.288 0.000 0.000 0.000 0.569 0.000 0.000 0.431 0.000 0.000 0.000 0.000 0.000 0.000 0.431 0.000 0.000 0.569 0.000\n", + " 4 1 3 1 0.204 0.000 0.456 0.000 0.544 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.456 0.000 0.000 0.000 0.000 0.544 0.000\n", + " 4 2 2 1 0.157 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n", + " 4 2 3 1 0.357 0.000 0.612 0.000 0.388 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.612 0.000 0.000 0.000 0.000 0.388 0.000\n", + " 4 3 3 1 0.897 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000\n", + " 5 1 1 1 0.034 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000\n", + " 5 1 2 1 0.026 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n", + " 5 1 3 1 0.001 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000\n", + " 5 2 2 1 0.019 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000\n" ] } ], @@ -491,7 +522,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 11, "id": "26f525b9", "metadata": {}, "outputs": [ @@ -523,19 +554,32 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 12, "id": "61a5827e", "metadata": {}, "outputs": [ { - "ename": "NameError", - "evalue": "name 'os' is not defined", - "output_type": "error", - "traceback": [ - "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[1;31mNameError\u001b[0m Traceback (most recent call last)", - "Cell \u001b[1;32mIn[1], line 1\u001b[0m\n\u001b[1;32m----> 1\u001b[0m outfile \u001b[38;5;241m=\u001b[39m \u001b[43mos\u001b[49m\u001b[38;5;241m.\u001b[39mpath\u001b[38;5;241m.\u001b[39mjoin(os\u001b[38;5;241m.\u001b[39mpath\u001b[38;5;241m.\u001b[39mdirname(os\u001b[38;5;241m.\u001b[39mpath\u001b[38;5;241m.\u001b[39mabspath(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m\"\u001b[39m)), \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124ms2v\u001b[39m\u001b[38;5;124m\"\u001b[39m, \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124ms2v.log\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[0;32m 2\u001b[0m \u001b[38;5;28;01mwith\u001b[39;00m \u001b[38;5;28mopen\u001b[39m(outfile, \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mr\u001b[39m\u001b[38;5;124m\"\u001b[39m) \u001b[38;5;28;01mas\u001b[39;00m fichier:\n\u001b[0;32m 3\u001b[0m \u001b[38;5;28;01mfor\u001b[39;00m ligne \u001b[38;5;129;01min\u001b[39;00m fichier:\n", - "\u001b[1;31mNameError\u001b[0m: name 'os' is not defined" + "name": "stdout", + "output_type": "stream", + "text": [ + ".\\s2v++.exe \n", + "Lecture du fichier parametre dans fichier : \n", + "nji=9, nja=9, njz=4\n", + "bz[0]=4\n", + "5, 5, 1, 3, 3, 1, 1\n", + "s2v.cpp:530 -> Fin de lecture de fichier\n", + "=> Calcul des distributions\n", + "==> nje rel = 1\n", + "=> Ecriture des resultats : (c|std)err, leafarea, out.dang\n", + "Il y a eu 640 depassement en z+\n", + "xl=5, yl=3, xymaille=1\n", + "\n", + "STATISTIQUES GLOBALES DE CHAQUE ESPECE\n", + "esp 1 : surfT=4.10686 - Stot=4.10686, LAI=0.27379 dist d'inclinaison :0 0.340694 0 0.168815 0 0 0.310531 0 0.179961 \n", + "0.018865800.34069400.310531000.329910\n", + "genere le fichier out.dang => entree de sailM pour calculer la BRDF\n", + "\t: xx= 0 ; Uz= 1e-009\n", + "ferrlog stream close() called.\n" ] } ], @@ -558,7 +602,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 13, "id": "279e1477", "metadata": {}, "outputs": [ @@ -566,24 +610,11 @@ "name": "stdout", "output_type": "stream", "text": [ - ".\\s2v++.exe \n", - "Lecture du fichier parametre dans fichier : \n", - "nji=9, nja=9, njz=2\n", - "bz[0]=2\n", - "7, 7, 1, 6, 6, 1, 1\n", - "s2v.cpp:530 -> Fin de lecture de fichier\n", - "=> Calcul des distributions\n", - "==> nje rel = 1\n", - "=> Ecriture des resultats : (c|std)err, leafarea, out.dang\n", - "Il y a eu 2583 depassement en z+\n", - "xl=7, yl=6, xymaille=1\n", - "\n", - "STATISTIQUES GLOBALES DE CHAQUE ESPECE\n", - "esp 1 : surfT=2.49261 - Stot=2.49261, LAI=0.0593479 dist d'inclinaison :0 0 0 0 0.66342 0.090495 0.0795048 0.16658 0 \n", - "0.3230560.166580.3403640.07950480000.0904950\n", - "genere le fichier out.dang => entree de sailM pour calculer la BRDF\n", - "\t: xx= 0 ; Uz= 1e-009\n", - "ferrlog stream close() called.\n" + "p 2 100001001000 2 3 2.985657 4.113371 1.842963 2.750814 2.983446 1.871450 3.732794 3.462100 2.480996 \n", + "p 2 100001001000 2 3 3.433085 1.126134 1.322910 3.511158 2.888248 1.501685 1.933951 1.618254 1.795654 \n", + "p 2 100001001000 2 3 1.039979 3.215031 1.956095 0.182558 1.870699 2.746943 0.636121 2.520374 3.280594 \n", + "p 2 100001001000 2 3 2.120032 3.026543 3.191847 0.226976 3.530282 1.788605 2.980323 3.379190 2.619068 \n", + "p 2 100001001000 0 3 4.355116 3.219292 4.362386 4.516341 3.181239 4.363903 4.653955 2.345981 3.852559 \n" ] } ], @@ -606,7 +637,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 14, "id": "87a5a603", "metadata": {}, "outputs": [ @@ -614,11 +645,11 @@ "name": "stdout", "output_type": "stream", "text": [ - "100001001000\t 0\t 0.848395\n", - "100001001000\t 0\t 0.198175\n", - "100001001000\t 0\t 0.415219\n", - "100001001000\t 0\t 0.225569\n", - "100001001000\t 0\t 0.805254\n" + "100001001000\t 2\t 0.615819\n", + "100001001000\t 2\t 1.39918\n", + "100001001000\t 2\t 0.739072\n", + "100001001000\t 2\t 1.27531\n", + "100001001000\t 0\t 0.0774794\n" ] } ], @@ -643,7 +674,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 15, "id": "cba6b513", "metadata": {}, "outputs": [ @@ -651,8 +682,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "0.059348\n", - "0.000000 0.000000 0.000000 0.000000 0.663420 0.090495 0.079505 0.166580 0.000000 " + "0.273790\n", + "0.000000 0.340694 0.000000 0.168815 0.000000 0.000000 0.310531 0.000000 0.179961 " ] } ], @@ -677,7 +708,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 16, "id": "b177e1e6", "metadata": {}, "outputs": [ @@ -685,8 +716,10 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0 1 0.000000 0.000000 0.000000 0.000000 0.663420 0.090495 0.079505 0.166580 0.000000 0 0 2.492611\n", - " 0 2 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 0 0.000000\n" + " 0 1 0.000000 0.000000 0.000000 0.353762 0.000000 0.000000 0.267263 0.000000 0.378975 0 0 0.219015\n", + " 0 2 0.000000 0.000000 0.000000 0.167022 0.000000 0.000000 0.533621 0.000000 0.299357 0 0 2.189191\n", + " 0 3 0.000000 0.823702 0.000000 0.147280 0.000000 0.000000 0.028594 0.000000 0.000425 0 0 1.698650\n", + " 0 4 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 0 0.000000\n" ] } ], diff --git a/notebooks/outputs_and_plantmodels_transfer.ipynb b/notebooks/outputs_and_plantmodels_transfer.ipynb index da5e3ee..9c1a0e2 100644 --- a/notebooks/outputs_and_plantmodels_transfer.ipynb +++ b/notebooks/outputs_and_plantmodels_transfer.ipynb @@ -99,48 +99,48 @@ " \n", "\n", " Day Hour Triangle Organ VegetationType Area par Eabs \\\n", - "0 264 15 0 0 0 0.887983 333.972320 \n", - "1 264 15 1 0 0 0.064478 359.626762 \n", - "2 264 15 2 0 0 0.453055 467.189797 \n", - "3 264 15 3 0 0 1.221273 357.496425 \n", - "4 264 15 4 0 0 0.458616 475.442657 \n", - "5 264 15 5 0 0 0.280610 247.592121 \n", - "6 264 15 6 0 0 0.566238 352.833692 \n", - "7 264 15 7 0 0 0.058097 423.081287 \n", - "8 264 15 8 0 0 2.767725 334.256459 \n", - "9 264 15 9 0 0 0.374497 451.617079 \n", - "10 264 15 10 0 0 0.379997 336.551922 \n", - "11 264 15 11 0 0 0.606435 363.404537 \n", - "12 264 15 12 0 0 1.029608 342.804865 \n", - "13 264 15 13 0 0 0.418867 440.261801 \n", - "14 264 15 14 0 0 0.368815 308.680462 \n", - "15 264 15 15 0 0 0.583434 463.362150 \n", - "16 264 15 16 0 0 0.026466 276.634522 \n", - "17 264 15 17 0 0 0.456672 305.102063 \n", - "18 264 15 18 0 0 0.155659 345.261097 \n", - "19 264 15 19 0 0 0.105090 423.684444 \n", + "0 264 15 0 0 0 0.413323 343.378160 \n", + "1 264 15 1 0 0 0.172847 448.716073 \n", + "2 264 15 2 0 0 0.227250 412.930980 \n", + "3 264 15 3 0 0 0.072358 424.019184 \n", + "4 264 15 4 0 0 0.582460 410.431190 \n", + "5 264 15 5 0 0 0.060955 346.106367 \n", + "6 264 15 6 0 0 0.219918 384.828377 \n", + "7 264 15 7 0 0 0.428720 422.361688 \n", + "8 264 15 8 0 0 0.747588 424.095008 \n", + "9 264 15 9 0 0 0.238002 338.612762 \n", + "10 264 15 10 0 0 0.226070 379.473109 \n", + "11 264 15 11 0 0 0.132360 419.493663 \n", + "12 264 15 12 0 0 0.976166 319.242430 \n", + "13 264 15 13 0 0 0.081250 341.397379 \n", + "14 264 15 14 0 0 0.115151 335.991292 \n", + "15 264 15 15 0 0 0.442225 362.713388 \n", + "16 264 15 16 0 0 0.519946 411.437297 \n", + "17 264 15 17 0 0 0.087318 367.607823 \n", + "18 264 15 18 0 0 0.588817 472.540543 \n", + "19 264 15 19 0 0 0.204837 472.951962 \n", "\n", " par Ei \n", - "0 392.908611 \n", - "1 423.090309 \n", - "2 549.635055 \n", - "3 420.584029 \n", - "4 559.344302 \n", - "5 291.284848 \n", - "6 415.098461 \n", - "7 497.742691 \n", - "8 393.242893 \n", - "9 531.314211 \n", - "10 395.943438 \n", - "11 427.534749 \n", - "12 403.299841 \n", - "13 517.955060 \n", - "14 363.153485 \n", - "15 545.131942 \n", - "16 325.452379 \n", - "17 358.943604 \n", - "18 406.189526 \n", - "19 498.452287 \n" + "0 403.974305 \n", + "1 527.901262 \n", + "2 485.801153 \n", + "3 498.846099 \n", + "4 482.860224 \n", + "5 407.183962 \n", + "6 452.739267 \n", + "7 496.896103 \n", + "8 498.935304 \n", + "9 398.367955 \n", + "10 446.438952 \n", + "11 493.521957 \n", + "12 375.579329 \n", + "13 401.643976 \n", + "14 395.283873 \n", + "15 426.721633 \n", + "16 484.043879 \n", + "17 432.479792 \n", + "18 555.930050 \n", + "19 556.414072 \n" ] } ], @@ -203,62 +203,62 @@ "output_type": "stream", "text": [ " Day Hour Triangle Organ VegetationType Area par Eabs \\\n", - "0 264 15 0 0 0 0.302826 323.960353 \n", - "1 264 15 1 0 0 0.209539 425.144306 \n", - "2 264 15 2 0 0 0.197166 362.524398 \n", - "3 264 15 3 0 0 0.039327 362.423338 \n", - "4 264 15 4 0 0 0.545166 299.967366 \n", - "5 264 15 5 0 0 0.135091 479.645681 \n", - "6 264 15 6 0 0 0.096901 409.619188 \n", - "7 264 15 7 0 0 0.982999 361.504997 \n", - "8 264 15 8 0 0 0.922692 312.596716 \n", - "9 264 15 9 0 0 0.088453 356.628718 \n", - "10 264 15 10 1 0 0.435957 394.911941 \n", - "11 264 15 11 1 0 0.407852 368.080426 \n", - "12 264 15 12 1 0 0.634457 348.130774 \n", - "13 264 15 13 1 0 0.260217 380.579577 \n", - "14 264 15 14 1 0 0.214000 471.615547 \n", - "15 264 15 15 1 0 0.097946 333.103578 \n", - "16 264 15 16 1 0 0.179120 459.202360 \n", - "17 264 15 17 1 0 0.633404 382.104684 \n", - "18 264 15 18 1 0 0.441117 389.083206 \n", - "19 264 15 19 2 0 0.442670 319.499395 \n", - "20 264 15 20 2 0 0.330172 299.805634 \n", - "21 264 15 21 2 0 1.268324 442.899621 \n", - "22 264 15 22 2 0 0.024006 382.452618 \n", - "23 264 15 23 2 0 0.317721 362.006044 \n", - "24 264 15 24 2 0 1.344187 386.714779 \n", - "25 264 15 25 2 0 0.204554 348.273943 \n", - "26 264 15 26 2 0 0.039401 371.076266 \n", + "0 264 15 0 0 0 1.739104 326.521452 \n", + "1 264 15 1 0 0 0.843264 397.653648 \n", + "2 264 15 2 0 0 0.081581 336.036730 \n", + "3 264 15 3 0 0 0.994149 480.515265 \n", + "4 264 15 4 0 0 0.215432 345.838959 \n", + "5 264 15 5 0 0 0.971433 314.107822 \n", + "6 264 15 6 0 0 0.421683 357.156443 \n", + "7 264 15 7 0 0 0.429677 384.410634 \n", + "8 264 15 8 0 0 0.054939 440.365941 \n", + "9 264 15 9 0 0 0.568959 368.268011 \n", + "10 264 15 10 1 0 0.218247 471.913733 \n", + "11 264 15 11 1 0 0.721282 409.948067 \n", + "12 264 15 12 1 0 0.364244 417.853118 \n", + "13 264 15 13 1 0 0.078585 382.493528 \n", + "14 264 15 14 1 0 0.166062 446.206516 \n", + "15 264 15 15 1 0 0.101792 422.531273 \n", + "16 264 15 16 1 0 0.452046 388.509102 \n", + "17 264 15 17 1 0 2.069886 261.455727 \n", + "18 264 15 18 1 0 0.226702 327.603028 \n", + "19 264 15 19 2 0 0.593136 363.295178 \n", + "20 264 15 20 2 0 0.036706 464.387130 \n", + "21 264 15 21 2 0 0.107289 277.068171 \n", + "22 264 15 22 2 0 0.316412 312.993320 \n", + "23 264 15 23 2 0 0.788735 333.458299 \n", + "24 264 15 24 2 0 0.584531 259.404936 \n", + "25 264 15 25 2 0 0.164780 286.367825 \n", + "26 264 15 26 2 0 0.737259 457.467302 \n", "\n", " par Ei \n", - "0 381.129827 \n", - "1 500.169772 \n", - "2 426.499292 \n", - "3 426.380398 \n", - "4 352.902784 \n", - "5 564.289036 \n", - "6 481.904927 \n", - "7 425.299996 \n", - "8 367.760842 \n", - "9 419.563197 \n", - "10 464.602284 \n", - "11 433.035796 \n", - "12 409.565616 \n", - "13 447.740678 \n", - "14 554.841820 \n", - "15 391.886563 \n", - "16 540.238071 \n", - "17 449.534922 \n", - "18 457.744948 \n", - "19 375.881641 \n", - "20 352.712511 \n", - "21 521.058377 \n", - "22 449.944257 \n", - "23 425.889463 \n", - "24 454.958564 \n", - "25 409.734051 \n", - "26 436.560313 \n" + "0 384.142885 \n", + "1 467.827821 \n", + "2 395.337329 \n", + "3 565.312077 \n", + "4 406.869363 \n", + "5 369.538614 \n", + "6 420.184050 \n", + "7 452.247805 \n", + "8 518.077578 \n", + "9 433.256483 \n", + "10 555.192627 \n", + "11 482.291844 \n", + "12 491.591903 \n", + "13 449.992386 \n", + "14 524.948842 \n", + "15 497.095615 \n", + "16 457.069532 \n", + "17 307.594973 \n", + "18 385.415327 \n", + "19 427.406092 \n", + "20 546.337800 \n", + "21 325.962554 \n", + "22 368.227435 \n", + "23 392.303881 \n", + "24 305.182278 \n", + "25 336.903324 \n", + "26 538.196826 \n" ] } ], @@ -285,9 +285,9 @@ "output_type": "stream", "text": [ " Day Hour Organ VegetationType Area par Eabs par Ei\n", - "0 264 15 0 0 3.520159 345.516439 406.489928\n", - "1 264 15 1 0 3.304070 384.875692 452.794932\n", - "2 264 15 2 0 3.971035 385.802957 453.885832\n" + "0 264 15 0 0 6.320221 369.835340 435.100400\n", + "1 264 15 1 0 4.398847 338.526189 398.266104\n", + "2 264 15 2 0 3.328848 348.586203 410.101416\n" ] } ], @@ -332,91 +332,91 @@ "output_type": "stream", "text": [ " Triangle Organ Voxel VegetationType primitive_area Day Hour Nx \\\n", - "0 0 0 1.0 1 0.302826 264.0 15.0 1 \n", - "1 1 0 1.0 1 0.209539 264.0 15.0 1 \n", - "2 2 0 1.0 1 0.197166 264.0 15.0 1 \n", - "3 3 0 1.0 1 0.039327 264.0 15.0 1 \n", - "4 4 0 1.0 1 0.545166 264.0 15.0 1 \n", - "21 5 0 2.0 1 0.135091 264.0 15.0 2 \n", - "5 6 0 1.0 1 0.096901 264.0 15.0 1 \n", - "6 7 0 1.0 1 0.982999 264.0 15.0 1 \n", - "7 8 0 1.0 1 0.922692 264.0 15.0 1 \n", - "22 9 0 2.0 1 0.088453 264.0 15.0 2 \n", - "8 10 1 1.0 1 0.435957 264.0 15.0 1 \n", - "23 11 1 2.0 1 0.407852 264.0 15.0 2 \n", - "9 12 1 1.0 1 0.634457 264.0 15.0 1 \n", - "10 13 1 1.0 1 0.260217 264.0 15.0 1 \n", - "11 14 1 1.0 1 0.214000 264.0 15.0 1 \n", - "24 15 1 2.0 1 0.097946 264.0 15.0 2 \n", - "12 16 1 1.0 1 0.179120 264.0 15.0 1 \n", - "25 17 1 2.0 1 0.633404 264.0 15.0 2 \n", - "13 18 1 1.0 1 0.441117 264.0 15.0 1 \n", - "14 19 2 1.0 1 0.442670 264.0 15.0 1 \n", - "15 20 2 1.0 1 0.330172 264.0 15.0 1 \n", - "26 21 2 2.0 1 1.268324 264.0 15.0 2 \n", - "16 22 2 1.0 1 0.024006 264.0 15.0 1 \n", - "17 23 2 1.0 1 0.317721 264.0 15.0 1 \n", - "18 24 2 1.0 1 1.344187 264.0 15.0 1 \n", - "19 25 2 1.0 1 0.204554 264.0 15.0 1 \n", - "20 26 2 1.0 1 0.039401 264.0 15.0 1 \n", + "0 0 0 1.0 1 1.739104 264.0 15.0 1 \n", + "1 1 0 1.0 1 0.843264 264.0 15.0 1 \n", + "2 2 0 1.0 1 0.081581 264.0 15.0 1 \n", + "3 3 0 1.0 1 0.994149 264.0 15.0 1 \n", + "4 4 0 1.0 1 0.215432 264.0 15.0 1 \n", + "5 5 0 1.0 1 0.971433 264.0 15.0 1 \n", + "6 6 0 1.0 1 0.421683 264.0 15.0 1 \n", + "7 7 0 1.0 1 0.429677 264.0 15.0 1 \n", + "8 8 0 1.0 1 0.054939 264.0 15.0 1 \n", + "9 9 0 1.0 1 0.568959 264.0 15.0 1 \n", + "10 10 1 1.0 1 0.218247 264.0 15.0 1 \n", + "11 11 1 1.0 1 0.721282 264.0 15.0 1 \n", + "12 12 1 1.0 1 0.364244 264.0 15.0 1 \n", + "13 13 1 1.0 1 0.078585 264.0 15.0 1 \n", + "14 14 1 1.0 1 0.166062 264.0 15.0 1 \n", + "15 15 1 1.0 1 0.101792 264.0 15.0 1 \n", + "16 16 1 1.0 1 0.452046 264.0 15.0 1 \n", + "17 17 1 1.0 1 2.069886 264.0 15.0 1 \n", + "18 18 1 1.0 1 0.226702 264.0 15.0 1 \n", + "19 19 2 1.0 1 0.593136 264.0 15.0 1 \n", + "20 20 2 1.0 1 0.036706 264.0 15.0 1 \n", + "21 21 2 1.0 1 0.107289 264.0 15.0 1 \n", + "22 22 2 1.0 1 0.316412 264.0 15.0 1 \n", + "23 23 2 1.0 1 0.788735 264.0 15.0 1 \n", + "24 24 2 1.0 1 0.584531 264.0 15.0 1 \n", + "25 25 2 1.0 1 0.164780 264.0 15.0 1 \n", + "26 26 2 1.0 1 0.737259 264.0 15.0 1 \n", "\n", - " Ny Nz ShadedPAR SunlitPAR ShadedArea SunlitArea Area \\\n", - "0 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "1 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "2 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "3 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "4 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "21 1 1 369.472687 468.106873 0.06519 2.565879 2.631069 \n", - "5 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "6 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "7 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "22 1 1 369.472687 468.106873 0.06519 2.565879 2.631069 \n", - "8 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "23 1 1 369.472687 468.106873 0.06519 2.565879 2.631069 \n", - "9 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "10 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "11 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "24 1 1 369.472687 468.106873 0.06519 2.565879 2.631069 \n", - "12 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "25 1 1 369.472687 468.106873 0.06519 2.565879 2.631069 \n", - "13 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "14 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "15 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "26 1 1 369.472687 468.106873 0.06519 2.565879 2.631069 \n", - "16 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "17 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "18 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "19 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", - "20 1 1 357.368713 456.002899 0.45133 7.712864 8.164194 \n", + " Ny Nz ShadedPAR SunlitPAR ShadedArea SunlitArea Area \\\n", + "0 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "1 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "2 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "3 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "4 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "5 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "6 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "7 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "8 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "9 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "10 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "11 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "12 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "13 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "14 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "15 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "16 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "17 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "18 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "19 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "20 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "21 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "22 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "23 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "24 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "25 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", + "26 1 1 351.143768 455.302063 0.842113 13.205805 14.047917 \n", "\n", " PARa Intercepted Transmitted \n", - "0 450.550232 7.356759 27.887056 \n", - "1 450.550232 7.356759 27.887056 \n", - "2 450.550232 7.356759 27.887056 \n", - "3 450.550232 7.356759 27.887056 \n", - "4 450.550232 7.356759 27.887056 \n", - "21 465.663025 2.450383 29.358543 \n", - "5 450.550232 7.356759 27.887056 \n", - "6 450.550232 7.356759 27.887056 \n", - "7 450.550232 7.356759 27.887056 \n", - "22 465.663025 2.450383 29.358543 \n", - "8 450.550232 7.356759 27.887056 \n", - "23 465.663025 2.450383 29.358543 \n", - "9 450.550232 7.356759 27.887056 \n", - "10 450.550232 7.356759 27.887056 \n", - "11 450.550232 7.356759 27.887056 \n", - "24 465.663025 2.450383 29.358543 \n", - "12 450.550232 7.356759 27.887056 \n", - "25 465.663025 2.450383 29.358543 \n", - "13 450.550232 7.356759 27.887056 \n", - "14 450.550232 7.356759 27.887056 \n", - "15 450.550232 7.356759 27.887056 \n", - "26 465.663025 2.450383 29.358543 \n", - "16 450.550232 7.356759 27.887056 \n", - "17 450.550232 7.356759 27.887056 \n", - "18 450.550232 7.356759 27.887056 \n", - "19 450.550232 7.356759 27.887056 \n", - "20 450.550232 7.356759 27.887056 \n" + "0 449.058228 12.616666 44.709663 \n", + "1 449.058228 12.616666 44.709663 \n", + "2 449.058228 12.616666 44.709663 \n", + "3 449.058228 12.616666 44.709663 \n", + "4 449.058228 12.616666 44.709663 \n", + "5 449.058228 12.616666 44.709663 \n", + "6 449.058228 12.616666 44.709663 \n", + "7 449.058228 12.616666 44.709663 \n", + "8 449.058228 12.616666 44.709663 \n", + "9 449.058228 12.616666 44.709663 \n", + "10 449.058228 12.616666 44.709663 \n", + "11 449.058228 12.616666 44.709663 \n", + "12 449.058228 12.616666 44.709663 \n", + "13 449.058228 12.616666 44.709663 \n", + "14 449.058228 12.616666 44.709663 \n", + "15 449.058228 12.616666 44.709663 \n", + "16 449.058228 12.616666 44.709663 \n", + "17 449.058228 12.616666 44.709663 \n", + "18 449.058228 12.616666 44.709663 \n", + "19 449.058228 12.616666 44.709663 \n", + "20 449.058228 12.616666 44.709663 \n", + "21 449.058228 12.616666 44.709663 \n", + "22 449.058228 12.616666 44.709663 \n", + "23 449.058228 12.616666 44.709663 \n", + "24 449.058228 12.616666 44.709663 \n", + "25 449.058228 12.616666 44.709663 \n", + "26 449.058228 12.616666 44.709663 \n" ] } ], @@ -435,12 +435,10 @@ "output_type": "stream", "text": [ " VegetationType Day Hour Voxel Nx Ny Nz ShadedPAR SunlitPAR \\\n", - "0 1.0 264.0 15.0 1.0 1 1 1 357.368713 456.002899 \n", - "1 1.0 264.0 15.0 2.0 2 1 1 369.472687 468.106873 \n", + "0 1.0 264.0 15.0 1.0 1 1 1 351.143768 455.302063 \n", "\n", - " ShadedArea SunlitArea Area PARa Intercepted Transmitted \n", - "0 0.45133 7.712864 8.164194 450.550232 7.356759 27.887056 \n", - "1 0.06519 2.565879 2.631069 465.663025 2.450383 29.358543 \n" + " ShadedArea SunlitArea Area PARa Intercepted Transmitted \n", + "0 0.842113 13.205805 14.047917 449.058228 12.616666 44.709663 \n" ] } ], @@ -459,14 +457,14 @@ "output_type": "stream", "text": [ " Day Hour Organ VegetationType Area PARa Intercepted \\\n", - "0 264.0 15.0 0 1 3.520159 451.509950 7.045186 \n", - "1 264.0 15.0 1 1 3.304070 455.760934 5.665102 \n", - "2 264.0 15.0 2 1 3.971035 455.377164 5.789693 \n", + "0 264.0 15.0 0 1 6.320221 449.058228 12.616666 \n", + "1 264.0 15.0 1 1 4.398847 449.058228 12.616666 \n", + "2 264.0 15.0 2 1 3.328848 449.058228 12.616666 \n", "\n", " Transmitted SunlitPAR SunlitArea ShadedPAR ShadedArea \n", - "0 7.045186 456.771546 7.386012 358.137361 0.426808 \n", - "1 5.665102 460.176198 5.938248 361.542012 0.318194 \n", - "2 5.789693 459.868833 6.068949 361.234647 0.327999 \n" + "0 12.616666 455.302063 13.205805 351.143768 0.842113 \n", + "1 12.616666 455.302063 13.205805 351.143768 0.842113 \n", + "2 12.616666 455.302063 13.205805 351.143768 0.842113 \n" ] } ], @@ -492,7 +490,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 13, "id": "39bd8bce", "metadata": {}, "outputs": [], @@ -505,7 +503,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 14, "id": "25b65a64", "metadata": {}, "outputs": [], @@ -537,7 +535,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 15, "id": "2eb81590", "metadata": {}, "outputs": [], @@ -558,22 +556,22 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 16, "id": "9e8d468c", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "f650a9774fa542e2bb5e2ba80595e729", + "model_id": "9c6e701c9a124d63a6d8855fe7cbfbd2", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'eVV4F11s33BPVUjNuulHClHso', 'data': b'x\\xda\\x8d}\\x0b\\x94\\xf5Uu\\x…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'Eo1pXjKQFbVhh6Ksf54Ry6k6D', 'data': b'x\\xda\\x8d}\\x0b\\x94\\xadEuf+…" ] }, - "execution_count": 9, + "execution_count": 16, "metadata": {}, "output_type": "execute_result" } @@ -589,7 +587,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 17, "id": "e020532a", "metadata": {}, "outputs": [], @@ -604,7 +602,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 18, "id": "f4281a0d", "metadata": {}, "outputs": [ @@ -632,72 +630,72 @@ " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", + " [1.00000000e-14 4.89933714e-02 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", + " [1.00000000e-14 1.00000000e-14 2.93938100e-01 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.91255584e-01 1.00000000e-14\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 2.57237822e-01\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]]\n", "\n", " [[1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", - " 3.62365872e-01 1.22457137e-03 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.95049897e-01 1.00000000e-14\n", - " 4.01137352e-01 4.10260499e-01 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 2.34853730e-01\n", - " 6.89631641e-01 1.00000000e-14 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 3.80286694e-01 8.93628836e-01\n", + " 6.55927658e-01 1.00000000e-14 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 1.29318118e-01 1.00000000e-14\n", + " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.05850622e-01\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 5.11650145e-01\n", + " 3.74495775e-01 1.00000000e-14 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]]\n", "\n", " [[1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.07698523e-01\n", - " 1.27102673e+00 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 2.34604865e-01 1.00000000e-14\n", - " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 2.00332925e-02 1.00000000e-14 1.00000000e-14\n", - " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 5.34315050e-01 1.00000000e-14\n", + " 4.15218249e-02 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", + " 4.28144723e-01 5.49222976e-02 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", + " 1.00000000e-14 1.00000000e-14 2.89329551e-02]\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]]\n", "\n", " [[1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 6.13946058e-02 5.03006637e-01\n", - " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 3.54082614e-01\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", + " 1.00000000e-14 1.69486284e-01 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.38437843e+00\n", - " 1.74996093e-01 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 9.02987361e-01 1.00000000e-14\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.18964568e-01 1.00000000e-14 1.00000000e-14\n", + " [1.00000000e-14 1.00000000e-14 8.16469371e-01 1.00000000e-14\n", + " 1.00000000e-14 6.63995743e-02 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]]\n", "\n", " [[1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 2.70237744e-01 1.00000000e-14 1.00000000e-14\n", - " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", - " 2.15935960e-01 1.00000000e-14 1.00000000e-14]\n", + " 1.00000000e-14 2.14309216e-01 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", - " 3.86473686e-02 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.36857376e-01\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 2.51297981e-01 1.00000000e-14\n", + " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 6.85566485e-01\n", + " 1.00000000e-14 1.11084175e+00 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", @@ -705,12 +703,12 @@ "\n", " [[1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", + " [1.00000000e-14 1.00000000e-14 1.67224873e-02 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", - " [1.00000000e-14 1.00000000e-14 1.00000000e-14 5.66032231e-02\n", + " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", - " 5.84830046e-01 1.00000000e-14 1.00000000e-14]\n", + " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", " 1.00000000e-14 1.00000000e-14 1.00000000e-14]\n", " [1.00000000e-14 1.00000000e-14 1.00000000e-14 1.00000000e-14\n", @@ -735,95 +733,95 @@ " [1. 1. 1. 1. 1. 1.\n", " 1. ]]\n", "\n", - " [[1. 0.99963057 0.99957138 0.99947673 1. 1.\n", + " [[1. 0.99966007 0.99862611 0.99862772 0.99882162 1.\n", " 1. ]\n", - " [1. 1. 1. 1. 1. 1.\n", + " [0.99937242 0.99652928 0.99643964 0.99913657 0.99951363 0.99987358\n", + " 0.9998582 ]\n", + " [0.99661541 0.9750672 0.97824836 0.99296302 0.99881232 0.99979579\n", + " 0.9996115 ]\n", + " [0.9968856 0.98334223 0.88385904 0.97908282 0.99741894 0.99954569\n", + " 0.99927342]\n", + " [0.99909747 0.99502355 0.98070908 0.97873741 0.99385464 0.99878031\n", " 1. ]\n", - " [1. 1. 1. 1. 1. 1.\n", - " 1. ]\n", - " [1. 1. 0.99926668 1. 1. 1.\n", - " 1. ]\n", - " [0.99970013 0.99676865 0.98825139 0.99629509 0.99986303 1.\n", - " 1. ]\n", - " [0.99902207 0.99121612 0.919734 0.9877432 0.99918234 1.\n", - " 1. ]\n", - " [1. 0.998151 0.99141204 0.99720836 1. 1.\n", - " 1. ]]\n", + " [0.99955082 0.99661982 0.98586112 0.89782482 0.98341918 0.99853724\n", + " 0.99973792]\n", + " [1. 0.99890536 0.99653733 0.98721927 0.99558949 0.99994254\n", + " 0.99992949]]\n", "\n", - " [[0.99686068 0.99802268 0.99410558 0.98673284 0.96794111 0.98563504\n", - " 0.99416107]\n", - " [0.99585605 0.99449784 0.97916114 0.95942354 0.80911517 0.93542254\n", - " 0.98531598]\n", - " [0.99475813 0.98461145 0.90690106 0.92244434 0.73988777 0.78323054\n", - " 0.96694493]\n", - " [0.99632591 0.99120426 0.9665345 0.84882689 0.67848641 0.92360383\n", - " 0.98617125]\n", - " [0.99687183 0.99460918 0.98012727 0.96042752 0.9532088 0.98170686\n", - " 0.99605304]\n", - " [0.99543226 0.99152982 0.97064966 0.94378668 0.98623681 0.99440718\n", - " 0.99580491]\n", - " [0.99548972 0.9954195 0.99088526 0.98755527 0.99215525 0.99616665\n", - " 0.99683207]]\n", + " [[0.99485987 0.98211366 0.94685709 0.90895796 0.92835289 0.9768011\n", + " 0.99335617]\n", + " [0.98958224 0.95989323 0.78321606 0.59019464 0.68427098 0.94649696\n", + " 0.98931742]\n", + " [0.99396461 0.97352087 0.89230376 0.90797049 0.93556297 0.97943383\n", + " 0.99502289]\n", + " [0.99184281 0.98125339 0.94494903 0.93165594 0.95026821 0.98223406\n", + " 0.99335128]\n", + " [0.98969823 0.9849447 0.95014137 0.76321989 0.81169522 0.96606922\n", + " 0.98965567]\n", + " [0.99407554 0.99231446 0.976399 0.93636918 0.95371062 0.98325461\n", + " 0.99324131]\n", + " [0.99734932 0.99393582 0.9833504 0.97493804 0.9806965 0.99197996\n", + " 0.9983626 ]]\n", "\n", - " [[0.99154222 0.98986703 0.97595549 0.93902242 0.87979883 0.94595563\n", - " 0.98320436]\n", - " [0.98788708 0.97815615 0.93926233 0.82371432 0.40502387 0.8600387\n", - " 0.96764725]\n", - " [0.98203403 0.96068132 0.84095889 0.87493688 0.78784174 0.86833286\n", - " 0.95500243]\n", - " [0.98539996 0.96764213 0.94185394 0.91136855 0.86435711 0.92827505\n", - " 0.9719072 ]\n", - " [0.98689526 0.98537415 0.96861196 0.95374638 0.94034904 0.96856815\n", - " 0.98217195]\n", - " [0.98805183 0.9888103 0.96952713 0.96083057 0.96848112 0.97835684\n", - " 0.98321474]\n", - " [0.99521863 0.99247658 0.98359537 0.97790587 0.97665089 0.98280752\n", - " 0.98712826]]\n", + " [[0.98496985 0.96739489 0.9302929 0.89807343 0.9174937 0.95895547\n", + " 0.98020232]\n", + " [0.98125023 0.94733357 0.86565912 0.84225869 0.8774448 0.95282722\n", + " 0.98152596]\n", + " [0.97424239 0.93394589 0.72031593 0.88447887 0.90997893 0.9595657\n", + " 0.9761579 ]\n", + " [0.97994757 0.96309948 0.90736842 0.8934654 0.89512074 0.94767475\n", + " 0.97867441]\n", + " [0.98629206 0.97525859 0.95201224 0.88435513 0.7504518 0.91819239\n", + " 0.98110867]\n", + " [0.98893738 0.98108053 0.96626729 0.94061965 0.93254912 0.95972735\n", + " 0.97235537]\n", + " [0.98517865 0.97681737 0.96344769 0.95575136 0.95711577 0.96942037\n", + " 0.9815892 ]]\n", "\n", - " [[0.97396404 0.97732759 0.95046979 0.90020192 0.8875643 0.93730801\n", - " 0.96813494]\n", - " [0.97440737 0.96788532 0.87619686 0.65420538 0.77308333 0.88455611\n", - " 0.95573801]\n", - " [0.97905767 0.96105552 0.86347568 0.64449 0.798118 0.89461142\n", - " 0.96182084]\n", - " [0.98428118 0.95343912 0.80644536 0.36933419 0.75600612 0.92658126\n", - " 0.97097325]\n", - " [0.98272175 0.92263758 0.59786361 0.84413874 0.93022043 0.96003735\n", - " 0.98030746]\n", - " [0.98167884 0.92343473 0.92852783 0.95988148 0.95882422 0.98353291\n", - " 0.98981279]\n", - " [0.98821801 0.97827053 0.97353882 0.97693914 0.96563995 0.98353904\n", - " 0.98521316]]\n", + " [[0.97933716 0.97092551 0.94165611 0.94100547 0.94331664 0.95525873\n", + " 0.97785884]\n", + " [0.97096044 0.94943368 0.91685653 0.90953714 0.91383499 0.89041752\n", + " 0.96821451]\n", + " [0.9826436 0.95704621 0.91028017 0.92085916 0.93676978 0.95857286\n", + " 0.97805393]\n", + " [0.97259653 0.94509262 0.87017393 0.89592469 0.91131461 0.94362009\n", + " 0.96967971]\n", + " [0.98114228 0.93692589 0.66466349 0.88666028 0.9184655 0.92707497\n", + " 0.97069734]\n", + " [0.97923797 0.97428864 0.9446348 0.95074368 0.95068192 0.96627277\n", + " 0.9782179 ]\n", + " [0.98016465 0.97797263 0.95464146 0.94952333 0.94629568 0.97018468\n", + " 0.980313 ]]\n", "\n", - " [[0.96288335 0.93929774 0.92631412 0.89874583 0.90402168 0.94615626\n", - " 0.95473844]\n", - " [0.95003837 0.84268683 0.86060578 0.81803173 0.82487935 0.90885699\n", - " 0.94603294]\n", - " [0.94327873 0.91743463 0.85111934 0.76143235 0.747778 0.89120042\n", - " 0.94725478]\n", - " [0.97430396 0.92609513 0.82673693 0.73656482 0.78086466 0.90808272\n", - " 0.94624001]\n", - " [0.96516496 0.93356055 0.83229494 0.79863918 0.88125861 0.94769037\n", - " 0.97597754]\n", - " [0.97860146 0.94880772 0.90524018 0.91579521 0.93609023 0.97752261\n", - " 0.98202926]\n", - " [0.9830606 0.96851254 0.94450408 0.93516695 0.93937171 0.95932865\n", - " 0.9740687 ]]\n", + " [[0.95296037 0.95422834 0.94934404 0.93673187 0.93656844 0.93842596\n", + " 0.94804531]\n", + " [0.97229284 0.96320361 0.9393397 0.92389566 0.92137164 0.87234128\n", + " 0.95597047]\n", + " [0.96675485 0.94391161 0.90375632 0.92214018 0.92659348 0.92107111\n", + " 0.96080649]\n", + " [0.95322537 0.92634034 0.80349278 0.84525293 0.90094328 0.86473721\n", + " 0.93806767]\n", + " [0.96127474 0.93329871 0.8198998 0.64854169 0.81475776 0.55683774\n", + " 0.90463072]\n", + " [0.98215431 0.96413124 0.91450155 0.88721132 0.9184497 0.89321476\n", + " 0.96541333]\n", + " [0.98092657 0.96966964 0.9389317 0.95247173 0.94251043 0.95123148\n", + " 0.96945715]]\n", "\n", - " [[0.93367374 0.91789633 0.91964561 0.9338572 0.90871698 0.94616085\n", - " 0.95534593]\n", - " [0.94012743 0.90739971 0.89350057 0.88228625 0.86454254 0.9217149\n", - " 0.94184065]\n", - " [0.92299747 0.89996201 0.8715623 0.81494373 0.83152366 0.87107247\n", - " 0.93528658]\n", - " [0.94811577 0.91303241 0.86293799 0.79458439 0.64303416 0.88547724\n", - " 0.9305917 ]\n", - " [0.94927919 0.92561966 0.88040262 0.87153274 0.84795934 0.9235304\n", - " 0.94650728]\n", - " [0.96347046 0.94701046 0.90630186 0.91416645 0.91751611 0.95114535\n", - " 0.96184111]\n", - " [0.95411432 0.95206857 0.91245848 0.93170208 0.91695338 0.9464457\n", - " 0.95381296]]]\n" + " [[0.94756877 0.95514208 0.94929218 0.94613492 0.92572314 0.9404825\n", + " 0.93554872]\n", + " [0.97161055 0.95421797 0.92918479 0.93547511 0.92323899 0.93136919\n", + " 0.94081557]\n", + " [0.94040775 0.94937837 0.93365628 0.92724371 0.91473806 0.9428041\n", + " 0.93166846]\n", + " [0.94083965 0.92754972 0.9003523 0.89309627 0.89577699 0.90264505\n", + " 0.92660093]\n", + " [0.94083911 0.92529798 0.88156152 0.84460795 0.84956956 0.85377795\n", + " 0.90978062]\n", + " [0.93541592 0.93342227 0.9089222 0.90135753 0.88972384 0.89331508\n", + " 0.92612672]\n", + " [0.96249211 0.96975094 0.94652379 0.9468134 0.93272442 0.94823855\n", + " 0.95390475]]]\n" ] } ], @@ -849,7 +847,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 19, "id": "00448c53", "metadata": {}, "outputs": [], @@ -867,22 +865,22 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 20, "id": "59229231", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "807d4e2d53194fff894c9ed93cf720e8", + "model_id": "13daf3894dda45eca704931509c31fa8", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'MwRlXOaT39UuyymKny87RStKz', 'data': b'x\\xda\\x8d\\x9d\\t\\x98\\x1dE\\x…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'wJZ83l0BmoFl6R5sdBeyGBiUB', 'data': b'x\\xda\\x8d\\x9d\\r\\xbcUE\\xb9\\…" ] }, - "execution_count": 5, + "execution_count": 20, "metadata": {}, "output_type": "execute_result" } @@ -898,7 +896,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 21, "id": "9e714349", "metadata": {}, "outputs": [], @@ -923,7 +921,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 22, "id": "635d93e3", "metadata": {}, "outputs": [ @@ -931,10 +929,115 @@ "name": "stdout", "output_type": "stream", "text": [ + "PARa transmitted\n", + "[[[1. 1. 1. 1. 1. 1.\n", + " 1. ]\n", + " [1. 1. 1. 1. 1. 1.\n", + " 1. ]\n", + " [1. 1. 1. 1. 1. 1.\n", + " 1. ]\n", + " [1. 1. 1. 1. 1. 1.\n", + " 1. ]\n", + " [1. 1. 1. 1. 1. 1.\n", + " 1. ]\n", + " [1. 1. 1. 1. 1. 1.\n", + " 1. ]\n", + " [1. 1. 1. 1. 1. 1.\n", + " 1. ]]\n", + "\n", + " [[0.99283465 0.97547655 0.97996241 0.9866237 0.9583532 0.95865713\n", + " 0.98694664]\n", + " [0.97774844 0.96530949 0.97812413 0.94335656 0.79359731 0.8288275\n", + " 0.97984945]\n", + " [0.95961262 0.96250934 0.97278397 0.91272267 0.7382741 0.79477271\n", + " 0.98515375]\n", + " [0.97219276 0.97383604 0.95889506 0.92757533 0.87868432 0.9093107\n", + " 0.98973258]\n", + " [0.99499098 0.99379047 0.97594497 0.96094415 0.9626287 0.97785097\n", + " 0.9939268 ]\n", + " [0.99696075 0.99603476 0.99520086 0.98950364 0.98841795 0.99438669\n", + " 0.99632086]\n", + " [0.99607408 0.99632587 0.99635674 0.99631713 0.99698258 0.99689147\n", + " 0.99685284]]\n", + "\n", + " [[0.97470511 0.94514069 0.93077744 0.93920035 0.9329825 0.92910817\n", + " 0.9597604 ]\n", + " [0.93902562 0.84260595 0.83278455 0.88433881 0.86394577 0.88136\n", + " 0.94917899]\n", + " [0.92365243 0.80240585 0.77352939 0.81993138 0.7911815 0.84628719\n", + " 0.94733873]\n", + " [0.96214209 0.90668456 0.86337504 0.83267538 0.8023391 0.87666842\n", + " 0.95844153]\n", + " [0.98205481 0.97935428 0.96394767 0.92029812 0.90199128 0.9400237\n", + " 0.97286147]\n", + " [0.98656516 0.98394133 0.96488209 0.9617456 0.97551971 0.97480579\n", + " 0.97693207]\n", + " [0.98860163 0.97982773 0.96375513 0.97078053 0.97175977 0.94172195\n", + " 0.95478506]]\n", + "\n", + " [[0.95701018 0.92543249 0.91452955 0.91529581 0.90796187 0.92735326\n", + " 0.96004947]\n", + " [0.92750482 0.87879103 0.87139533 0.88794122 0.88021506 0.90711292\n", + " 0.94913605]\n", + " [0.91243229 0.85247416 0.84137598 0.83055153 0.82787463 0.8959008\n", + " 0.94203007]\n", + " [0.91033121 0.84517546 0.82532049 0.79060523 0.80545506 0.89567693\n", + " 0.91514608]\n", + " [0.93257741 0.86079298 0.8449184 0.8523624 0.87150218 0.91578729\n", + " 0.9013189 ]\n", + " [0.96779888 0.93102995 0.91071792 0.92115358 0.933688 0.94220112\n", + " 0.93189039]\n", + " [0.97735824 0.96935045 0.93242933 0.91134405 0.94099756 0.959761\n", + " 0.95889625]]\n", + "\n", + " [[0.92296813 0.90516463 0.90284731 0.91447234 0.87371474 0.88073977\n", + " 0.93560093]\n", + " [0.88270877 0.88940347 0.85396849 0.85397283 0.84917024 0.87384279\n", + " 0.91539319]\n", + " [0.87898549 0.8856543 0.83203816 0.82884733 0.86532201 0.89502837\n", + " 0.90832493]\n", + " [0.88237416 0.84629472 0.83386876 0.83964468 0.85864715 0.90311898\n", + " 0.92454761]\n", + " [0.89126296 0.83400359 0.8388134 0.86334547 0.86850161 0.9055682\n", + " 0.93470077]\n", + " [0.92007599 0.8866167 0.88060342 0.90901959 0.91319735 0.91664405\n", + " 0.93776939]\n", + " [0.93967084 0.9347306 0.92625581 0.93690253 0.94524498 0.94220458\n", + " 0.9435016 ]]\n", + "\n", + " [[0.85841022 0.74993594 0.76130349 0.85284938 0.86431234 0.87480163\n", + " 0.90179267]\n", + " [0.86526185 0.74226062 0.75591914 0.85134443 0.83492443 0.83171408\n", + " 0.88010129]\n", + " [0.86923228 0.77258171 0.7676997 0.8318704 0.83804378 0.85347289\n", + " 0.87805225]\n", + " [0.87857998 0.816706 0.79000755 0.82842821 0.8698445 0.89948354\n", + " 0.90035524]\n", + " [0.89811456 0.86396829 0.85201001 0.87253328 0.90782969 0.91597453\n", + " 0.9044806 ]\n", + " [0.92190268 0.89046769 0.8868083 0.91020047 0.92585094 0.88768819\n", + " 0.87828466]\n", + " [0.89487078 0.8693884 0.85757664 0.86653003 0.90359564 0.88007679\n", + " 0.87716112]]\n", + "\n", + " [[0.85301056 0.8414348 0.8673805 0.88293181 0.85568144 0.8688417\n", + " 0.88986585]\n", + " [0.84806958 0.8108317 0.82544714 0.84720828 0.86359825 0.88581908\n", + " 0.90040623]\n", + " [0.85604356 0.81045805 0.8047335 0.83012291 0.86524461 0.89470453\n", + " 0.87592102]\n", + " [0.85554426 0.81356764 0.79736908 0.80259271 0.83525448 0.8843983\n", + " 0.85818303]\n", + " [0.86421433 0.81436691 0.80029539 0.79579841 0.819411 0.86965378\n", + " 0.88410009]\n", + " [0.88160032 0.85434114 0.81889592 0.80924773 0.85369548 0.88390842\n", + " 0.9028424 ]\n", + " [0.89895522 0.86912624 0.83433478 0.82886494 0.87638531 0.8954713\n", + " 0.89080121]]]\n", "\n", "\n", "PARa absorbed per plant\n", - "[{'Hplante': [0.0, 0.0], 'parap': array([230.44407642, 98.6702188 ]), 'parip': array([349.22395645, 98.6702188 ])}]\n" + "[{'Hplante': [0.0, 0.0], 'parap': array([122.57339982, 154.20674688]), 'parip': array([235.25554024, 154.20674688])}]\n" ] } ], @@ -963,7 +1066,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 23, "id": "cc377bd4", "metadata": {}, "outputs": [], @@ -980,7 +1083,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 24, "id": "476690b3", "metadata": {}, "outputs": [], @@ -996,7 +1099,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 25, "id": "2ccd1d03", "metadata": {}, "outputs": [ @@ -1017,7 +1120,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 26, "id": "448e2b39", "metadata": {}, "outputs": [], @@ -1033,7 +1136,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 27, "id": "177fd272", "metadata": {}, "outputs": [ @@ -1051,6 +1154,14 @@ "print(g.property(\"PARa\"))\n", "print(g.property(\"Erel\"))" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "b583311c", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/notebooks/tool_basics.ipynb b/notebooks/tool_basics.ipynb index 36fc30a..fcce0d5 100644 --- a/notebooks/tool_basics.ipynb +++ b/notebooks/tool_basics.ipynb @@ -30,7 +30,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 1, "id": "9a585293", "metadata": {}, "outputs": [], @@ -53,7 +53,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 2, "id": "5ac06352", "metadata": {}, "outputs": [], @@ -79,7 +79,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 3, "id": "87148b50", "metadata": {}, "outputs": [], @@ -98,7 +98,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 4, "id": "2ebe3c2e", "metadata": {}, "outputs": [], @@ -119,22 +119,22 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 6, "id": "28e80db8", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "120f766cdfe1445abf514c99eafecb73", + "model_id": "3000fee899fa42829723b40785fa3eb8", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'vc3yVFvaf9yoybmXm2X7TP8BQ', 'data': b'x\\xdaSLrw\\xf5\\xf7e`Pp\\xe0\\…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'HSnruzcFcKZpWezUKJCRpYqrm', 'data': b'x\\xdaSLrw\\xf5\\xf7e`Pp\\xe0\\…" ] }, - "execution_count": 10, + "execution_count": 6, "metadata": {}, "output_type": "execute_result" } @@ -153,7 +153,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 7, "id": "2a1e7140", "metadata": {}, "outputs": [], @@ -174,7 +174,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 8, "id": "a3871c84", "metadata": {}, "outputs": [ @@ -213,7 +213,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 9, "id": "2f0f6333", "metadata": {}, "outputs": [], @@ -235,22 +235,22 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 11, "id": "234a2715", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "72ea5881f13b4c6a85b9beaf89c72eae", + "model_id": "721619fcc0764904a80477c648a51dd0", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'uajlbqVBofOIFhDuXTLF9qFhF', 'data': b'x\\xdaSLrw\\xf5\\xf7e`Pp\\xe0\\…" + "SceneWidget(axes_helper=True, scenes=[{'id': '7Btw3DEYYw3MHgwE6O2FD7CTm', 'data': b'x\\xdaSLrw\\xf5\\xf7e`Pp\\xe0\\…" ] }, - "execution_count": 14, + "execution_count": 11, "metadata": {}, "output_type": "execute_result" } @@ -266,7 +266,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 12, "id": "068b4b80", "metadata": {}, "outputs": [], @@ -288,7 +288,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 13, "id": "59e6cfc2", "metadata": {}, "outputs": [ @@ -311,7 +311,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 14, "id": "bffa7914", "metadata": {}, "outputs": [ @@ -353,7 +353,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 15, "id": "5fe1fa60", "metadata": {}, "outputs": [], @@ -363,7 +363,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 16, "id": "ea867adf", "metadata": {}, "outputs": [], @@ -386,22 +386,22 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 17, "id": "a4987150", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "3a2f6d31e46149c8ba6fd65ad34057f4", + "model_id": "750b9ea7b1ce4117ab94a2497c9eed4c", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'Sym0YTEGdGGm7GpHUu3Cubc3i', 'data': b'x\\xda\\x8c]\\x07XUG\\xd3&v\\x8…" + "SceneWidget(axes_helper=True, scenes=[{'id': '7owUN0I9yItns8H9hYFZhlpvp', 'data': b'x\\xda\\x8c]\\x05x\\x15\\xc9\\xd…" ] }, - "execution_count": 19, + "execution_count": 17, "metadata": {}, "output_type": "execute_result" } @@ -424,7 +424,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 18, "id": "1b8e873a", "metadata": {}, "outputs": [ @@ -432,31 +432,31 @@ "name": "stdout", "output_type": "stream", "text": [ - " Day Hour Triangle Organ VegetationType Area par Eabs \\\n", - "0 264 15 0 0 0 49.393789 47.050303 \n", - "1 264 15 1 0 0 49.078681 23.093771 \n", - "2 264 15 2 0 0 102.945704 9.974392 \n", - "3 264 15 3 0 0 24.126015 338.869465 \n", - "4 264 15 4 0 0 52.326033 203.833217 \n", - "... ... ... ... ... ... ... ... \n", - "4995 264 15 4995 0 0 72.344270 150.857122 \n", - "4996 264 15 4996 0 0 15.049568 4.357494 \n", - "4997 264 15 4997 0 0 28.560917 262.137311 \n", - "4998 264 15 4998 0 0 28.145749 45.033456 \n", - "4999 264 15 4999 0 0 60.040012 115.592509 \n", + " Day Hour Triangle Organ VegetationType Area par Eabs \\\n", + "0 264 15 0 0 0 6.008933 41.357676 \n", + "1 264 15 1 0 0 64.911050 39.810024 \n", + "2 264 15 2 0 0 48.494517 26.685420 \n", + "3 264 15 3 0 0 5.762879 147.173173 \n", + "4 264 15 4 0 0 21.321846 0.139357 \n", + "... ... ... ... ... ... ... ... \n", + "4995 264 15 4995 0 0 21.090689 5.585042 \n", + "4996 264 15 4996 0 0 32.577000 0.766465 \n", + "4997 264 15 4997 0 0 76.699258 12.026872 \n", + "4998 264 15 4998 0 0 1.464895 1.865408 \n", + "4999 264 15 4999 0 0 51.065793 56.294752 \n", "\n", " par Ei \n", - "0 55.353298 \n", - "1 27.169143 \n", - "2 11.734579 \n", - "3 398.669959 \n", - "4 239.803784 \n", + "0 48.656089 \n", + "1 46.835322 \n", + "2 31.394612 \n", + "3 173.144909 \n", + "4 0.163950 \n", "... ... \n", - "4995 177.478967 \n", - "4996 5.126463 \n", - "4997 308.396836 \n", - "4998 52.980537 \n", - "4999 135.991187 \n", + "4995 6.570637 \n", + "4996 0.901723 \n", + "4997 14.149261 \n", + "4998 2.194598 \n", + "4999 66.229120 \n", "\n", "[5000 rows x 8 columns]\n" ] @@ -475,22 +475,22 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 19, "id": "99b7e8e2", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "7fe06f7b118e472688db4e996f2d7bb6", + "model_id": "a7e3858801d84ebaab27168a6a51733b", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': '1MLbncOivVoacAyV4ClDvVOBd', 'data': b'x\\xda\\x8c]\\x05x\\x15W\\xd3N\\…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'Q9sDyXIhwwV09CaSVW4ZMDBBJ', 'data': b'x\\xda\\x8c}\\x07XUG\\xf3>\\xf6…" ] }, - "execution_count": 21, + "execution_count": 19, "metadata": {}, "output_type": "execute_result" } @@ -515,7 +515,7 @@ }, { "cell_type": "code", - "execution_count": 22, + "execution_count": 20, "id": "e619909c", "metadata": {}, "outputs": [], @@ -533,22 +533,22 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": 21, "id": "0d97938f", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "2da2490444464b6dbcc0326b7945ceea", + "model_id": "f8a7fcc2dfba44e6ac33408295a67f72", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': '2pJ1SCaVVmz6KABMEDZMVuBtf', 'data': b'x\\xda\\x8c}\\x05|\\x16\\xd7\\xf…" + "SceneWidget(axes_helper=True, scenes=[{'id': '1r3vGF43bEixpK6zO4CgqIrAm', 'data': b'x\\xda\\x8c]\\x05xU\\xc7\\xd6\\r…" ] }, - "execution_count": 23, + "execution_count": 21, "metadata": {}, "output_type": "execute_result" } @@ -571,7 +571,7 @@ }, { "cell_type": "code", - "execution_count": 24, + "execution_count": 22, "id": "746a5fa0", "metadata": {}, "outputs": [ @@ -580,45 +580,45 @@ "output_type": "stream", "text": [ " VegetationType Day Hour Voxel Nx Ny Nz ShadedPAR SunlitPAR \\\n", - "0 1.0 264.0 15.0 1.0 2 5 3 54.428970 150.400497 \n", - "1 1.0 264.0 15.0 2.0 5 6 3 50.428650 146.400192 \n", - "2 1.0 264.0 15.0 3.0 2 4 4 25.016081 120.987617 \n", - "3 1.0 264.0 15.0 4.0 3 5 2 137.027084 232.998642 \n", - "4 1.0 264.0 15.0 5.0 1 6 4 94.889290 190.860825 \n", + "0 1.0 264.0 15.0 1.0 5 6 3 48.783260 144.457764 \n", + "1 1.0 264.0 15.0 2.0 4 2 6 50.222652 145.897171 \n", + "2 1.0 264.0 15.0 3.0 3 7 7 76.529640 172.204147 \n", + "3 1.0 264.0 15.0 4.0 1 7 4 162.029709 257.704224 \n", + "4 1.0 264.0 15.0 5.0 3 5 5 36.165016 131.839523 \n", ".. ... ... ... ... .. .. .. ... ... \n", - "210 1.0 264.0 15.0 211.0 4 2 7 81.486168 177.457718 \n", - "211 1.0 264.0 15.0 212.0 1 7 4 171.829315 267.800842 \n", - "212 1.0 264.0 15.0 213.0 1 5 7 66.265411 162.236938 \n", - "213 1.0 264.0 15.0 214.0 6 4 7 81.604439 177.575974 \n", - "214 1.0 264.0 15.0 215.0 3 4 1 377.730652 473.702209 \n", + "211 1.0 264.0 15.0 212.0 6 3 7 88.052910 183.727417 \n", + "212 1.0 264.0 15.0 213.0 4 2 7 66.258171 161.932693 \n", + "213 1.0 264.0 15.0 214.0 1 6 7 91.217499 186.892014 \n", + "214 1.0 264.0 15.0 215.0 1 7 7 124.092262 219.766769 \n", + "215 1.0 264.0 15.0 216.0 6 7 3 218.251526 313.926056 \n", "\n", " ShadedArea SunlitArea Area PARa Intercepted \\\n", - "0 940.238770 300.895721 1241.134521 77.695923 192.862198 \n", - "1 1056.413818 256.752136 1313.166016 69.193146 181.724167 \n", - "2 1486.096924 89.238495 1575.335449 30.452608 95.946152 \n", - "3 1048.442871 282.894226 1331.337158 157.419952 419.158112 \n", - "4 328.778809 248.748779 577.527588 136.225494 157.347977 \n", + "0 1669.359253 307.066376 1976.425659 63.647678 251.589828 \n", + "1 639.340942 467.153961 1106.494873 90.615723 200.531677 \n", + "2 131.880585 49.266487 181.147064 102.550201 37.153339 \n", + "3 114.480240 108.982895 223.463135 208.690125 93.269104 \n", + "4 1061.264648 3.100358 1064.364990 36.443703 77.578804 \n", ".. ... ... ... ... ... \n", - "210 21.034737 22.331879 43.366615 130.907242 11.354008 \n", - "211 30.276852 32.065239 62.342091 221.191635 27.579096 \n", - "212 211.458740 224.413452 435.872192 115.677383 100.841103 \n", - "213 69.074570 45.346554 114.421127 119.639183 27.378498 \n", - "214 0.375681 27.028229 27.403910 472.386536 25.890474 \n", + "211 98.564636 104.777023 203.341660 137.351669 55.858631 \n", + "212 205.380096 160.001099 365.381195 108.154213 79.035034 \n", + "213 58.686462 80.323975 139.010437 146.500809 40.730282 \n", + "214 21.945004 48.383152 70.328156 189.912750 26.712429 \n", + "215 22.048519 15.559612 37.608131 257.834961 19.393379 \n", "\n", " Transmitted \n", - "0 40.667442 \n", - "1 40.337265 \n", - "2 16.455536 \n", - "3 53.644543 \n", - "4 85.096527 \n", + "0 31.452011 \n", + "1 35.146641 \n", + "2 72.656891 \n", + "3 155.314255 \n", + "4 28.307266 \n", ".. ... \n", - "210 86.211784 \n", - "211 176.470810 \n", - "212 63.874039 \n", - "213 80.683655 \n", - "214 390.410797 \n", + "211 90.037453 \n", + "212 68.675034 \n", + "213 93.847260 \n", + "214 116.123764 \n", + "215 217.013687 \n", "\n", - "[215 rows x 15 columns]\n" + "[216 rows x 15 columns]\n" ] } ], @@ -635,7 +635,7 @@ }, { "cell_type": "code", - "execution_count": 25, + "execution_count": 23, "id": "838bbb57", "metadata": {}, "outputs": [ @@ -644,43 +644,43 @@ "output_type": "stream", "text": [ " Triangle Organ Voxel VegetationType primitive_area Day Hour Nx \\\n", - "0 0 0 1.0 1 49.393789 264.0 15.0 2 \n", - "27 1 0 2.0 1 49.078681 264.0 15.0 5 \n", - "69 2 0 3.0 1 102.945704 264.0 15.0 2 \n", - "109 3 0 4.0 1 24.126015 264.0 15.0 3 \n", - "146 4 0 5.0 1 52.326033 264.0 15.0 1 \n", + "0 0 0 1.0 1 6.008933 264.0 15.0 5 \n", + "49 1 0 2.0 1 64.911050 264.0 15.0 4 \n", + "77 2 0 3.0 1 48.494517 264.0 15.0 3 \n", + "84 3 0 4.0 1 5.762879 264.0 15.0 1 \n", + "91 4 0 5.0 1 21.321846 264.0 15.0 3 \n", "... ... ... ... ... ... ... ... .. \n", - "4924 4995 0 199.0 1 72.344270 264.0 15.0 1 \n", - "336 4996 0 10.0 1 15.049568 264.0 15.0 4 \n", - "4785 4997 0 187.0 1 28.560917 264.0 15.0 3 \n", - "1290 4998 0 43.0 1 28.145749 264.0 15.0 5 \n", - "1775 4999 0 59.0 1 60.040012 264.0 15.0 2 \n", + "586 4995 0 21.0 1 21.090689 264.0 15.0 5 \n", + "3641 4996 0 136.0 1 32.577000 264.0 15.0 4 \n", + "1051 4997 0 37.0 1 76.699258 264.0 15.0 6 \n", + "1822 4998 0 63.0 1 1.464895 264.0 15.0 2 \n", + "3443 4999 0 129.0 1 51.065793 264.0 15.0 5 \n", "\n", " Ny Nz ShadedPAR SunlitPAR ShadedArea SunlitArea Area \\\n", - "0 5 3 54.428970 150.400497 940.238770 300.895721 1241.134521 \n", - "27 6 3 50.428650 146.400192 1056.413818 256.752136 1313.166016 \n", - "69 4 4 25.016081 120.987617 1486.096924 89.238495 1575.335449 \n", - "109 5 2 137.027084 232.998642 1048.442871 282.894226 1331.337158 \n", - "146 6 4 94.889290 190.860825 328.778809 248.748779 577.527588 \n", + "0 6 3 48.783260 144.457764 1669.359253 307.066376 1976.425659 \n", + "49 2 6 50.222652 145.897171 639.340942 467.153961 1106.494873 \n", + "77 7 7 76.529640 172.204147 131.880585 49.266487 181.147064 \n", + "84 7 4 162.029709 257.704224 114.480240 108.982895 223.463135 \n", + "91 5 5 36.165016 131.839523 1061.264648 3.100358 1064.364990 \n", "... .. .. ... ... ... ... ... \n", - "4924 6 5 88.287605 184.259140 684.410645 155.426743 839.837402 \n", - "336 6 3 36.994896 132.966446 1456.751465 284.425629 1741.177124 \n", - "4785 3 2 182.791809 278.763367 473.721069 319.463074 793.184143 \n", - "1290 4 2 159.442474 255.414017 770.785034 269.372406 1040.157471 \n", - "1775 7 4 91.605270 187.576828 648.480042 74.454109 722.934143 \n", + "586 4 6 28.958939 124.633453 982.723572 278.425110 1261.148682 \n", + "3641 4 4 20.419191 116.093712 1379.531006 34.760368 1414.291382 \n", + "1051 6 5 68.352638 164.027176 1125.141846 1.110655 1126.252441 \n", + "1822 5 5 39.313770 134.988281 1225.665894 14.276536 1239.942383 \n", + "3443 2 6 60.735207 156.409714 431.796021 383.754333 815.550354 \n", "\n", " PARa Intercepted Transmitted \n", - "0 77.695923 192.862198 40.667442 \n", - "27 69.193146 181.724167 40.337265 \n", - "69 30.452608 95.946152 16.455536 \n", - "109 157.419952 419.158112 53.644543 \n", - "146 136.225494 157.347977 85.096527 \n", + "0 63.647678 251.589828 31.452011 \n", + "49 90.615723 200.531677 35.146641 \n", + "77 102.550201 37.153339 72.656891 \n", + "84 208.690125 93.269104 155.314255 \n", + "91 36.443703 77.578804 28.307266 \n", "... ... ... ... \n", - "4924 106.048828 178.127563 80.731377 \n", - "336 52.672089 183.422882 28.330009 \n", - "4785 221.445343 351.293884 100.292107 \n", - "1290 184.296478 383.394714 73.595093 \n", - "1775 101.489265 146.740112 72.746109 \n", + "586 50.081097 126.319427 21.615057 \n", + "3641 22.770676 64.408737 13.644242 \n", + "1051 68.446991 154.177170 60.248528 \n", + "1822 40.415356 100.225418 28.215555 \n", + "3443 105.754509 172.496262 47.396954 \n", "\n", "[5000 rows x 18 columns]\n" ] @@ -693,22 +693,22 @@ }, { "cell_type": "code", - "execution_count": 26, + "execution_count": 24, "id": "a6786993", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "df4284a48fd44e9d824298c1b13cb2fa", + "model_id": "a165f53325d34f22bf1aeccd6e86e668", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'gky0cmb03EMHc7bv5AesZLLo4', 'data': b'x\\xda\\x8c]\\x05xUG\\xd3N\\x91…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'TAKVsoO1nznHUiHmDmrJ66VkY', 'data': b'x\\xda\\x8c]\\x05|\\x15\\xd7\\xd…" ] }, - "execution_count": 26, + "execution_count": 24, "metadata": {}, "output_type": "execute_result" } @@ -725,22 +725,22 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 25, "id": "e4c43fad", "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "792d163989d14baa89de66f92cb827c7", + "model_id": "e99211ca72ad4fe4b2168078e77a2813", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "SceneWidget(axes_helper=True, scenes=[{'id': 'TXw7QyMuu2rKBBUoxc20FYmoS', 'data': b'x\\xda\\x95]\\xdboo\\xc7U\\xb6\\…" + "SceneWidget(axes_helper=True, scenes=[{'id': 'Z1NblcYxLB60iSeS9Myrk4Izd', 'data': b'x\\xda\\x95]Y\\x90\\xae\\xc5Y\\x…" ] }, - "execution_count": 27, + "execution_count": 25, "metadata": {}, "output_type": "execute_result" } @@ -754,6 +754,14 @@ " size_world = 100, \n", " axes_helper=True)" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "bb2294a8", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/s2v/fort.51 b/s2v/fort.51 index 71ba716..0ebf27e 100644 --- a/s2v/fort.51 +++ b/s2v/fort.51 @@ -1,5 +1,5 @@ -p 1 100001001000 3 1.164514 4.472970 4.515880 1.282508 3.524203 4.883970 -0.106773 3.988203 3.570723 -p 1 100001001000 3 2.487949 0.970069 4.303277 2.807932 2.114717 3.015707 2.727567 1.260793 4.176357 -p 1 100001001000 3 2.228481 3.596791 3.425399 2.230021 3.065646 4.904108 2.570435 2.829843 4.365617 -p 1 100001001000 3 0.866265 0.892767 4.264220 -0.190762 -0.629647 4.599549 0.614165 0.780050 4.502412 -p 1 100001001000 3 4.294620 3.054521 4.607150 5.896218 3.271670 3.932476 5.539221 3.942415 3.412786 +p 1 100001001000 3 2.985657 4.113371 1.842963 2.750814 2.983446 1.871450 3.732794 3.462100 2.480996 +p 1 100001001000 3 3.433085 1.126134 1.322910 3.511158 2.888248 1.501685 1.933951 1.618254 1.795654 +p 1 100001001000 3 1.039979 3.215031 1.956095 0.182558 1.870699 2.746943 0.636121 2.520374 3.280594 +p 1 100001001000 3 2.120032 3.026543 3.191847 0.226976 3.530282 1.788605 2.980323 3.379190 2.619068 +p 1 100001001000 3 4.355116 3.219292 4.362386 4.516341 3.181239 4.363903 4.653955 2.345981 3.852559 diff --git a/s2v/leafarea b/s2v/leafarea index d97b892..652dfd0 100644 --- a/s2v/leafarea +++ b/s2v/leafarea @@ -1,2 +1,4 @@ - 0 1 0.000000 0.000000 0.000000 0.000000 0.663420 0.090495 0.079505 0.166580 0.000000 0 0 2.492611 - 0 2 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 0 0.000000 + 0 1 0.000000 0.000000 0.000000 0.353762 0.000000 0.000000 0.267263 0.000000 0.378975 0 0 0.219015 + 0 2 0.000000 0.000000 0.000000 0.167022 0.000000 0.000000 0.533621 0.000000 0.299357 0 0 2.189191 + 0 3 0.000000 0.823702 0.000000 0.147280 0.000000 0.000000 0.028594 0.000000 0.000425 0 0 1.698650 + 0 4 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 0 0.000000 diff --git a/s2v/out.dang b/s2v/out.dang index e38a03b..2854665 100644 --- a/s2v/out.dang +++ b/s2v/out.dang @@ -1,2 +1,2 @@ -0.059348 -0.000000 0.000000 0.000000 0.000000 0.663420 0.090495 0.079505 0.166580 0.000000 \ No newline at end of file +0.273790 +0.000000 0.340694 0.000000 0.168815 0.000000 0.000000 0.310531 0.000000 0.179961 \ No newline at end of file diff --git a/s2v/s2v.area b/s2v/s2v.area index b221c45..2dd182b 100644 --- a/s2v/s2v.area +++ b/s2v/s2v.area @@ -1,5 +1,5 @@ -100001001000 0 0.848395 -100001001000 0 0.198175 -100001001000 0 0.415219 -100001001000 0 0.225569 -100001001000 0 0.805254 +100001001000 2 0.615819 +100001001000 2 1.39918 +100001001000 2 0.739072 +100001001000 2 1.27531 +100001001000 0 0.0774794 diff --git a/s2v/s2v.can b/s2v/s2v.can index f196be9..0b5256a 100644 --- a/s2v/s2v.can +++ b/s2v/s2v.can @@ -1,5 +1,5 @@ -p 2 100001001000 0 3 1.164514 4.472970 4.515880 1.282508 3.524203 4.883970 -0.106773 3.988203 3.570723 -p 2 100001001000 0 3 2.487949 0.970069 4.303277 2.807932 2.114717 3.015707 2.727567 1.260793 4.176357 -p 2 100001001000 0 3 2.228481 3.596791 3.425399 2.230021 3.065646 4.904108 2.570435 2.829843 4.365617 -p 2 100001001000 0 3 0.866265 0.892767 4.264220 -0.190762 -0.629647 4.599549 0.614165 0.780050 4.502412 -p 2 100001001000 0 3 4.294620 3.054521 4.607150 5.896218 3.271670 3.932476 5.539221 3.942415 3.412786 +p 2 100001001000 2 3 2.985657 4.113371 1.842963 2.750814 2.983446 1.871450 3.732794 3.462100 2.480996 +p 2 100001001000 2 3 3.433085 1.126134 1.322910 3.511158 2.888248 1.501685 1.933951 1.618254 1.795654 +p 2 100001001000 2 3 1.039979 3.215031 1.956095 0.182558 1.870699 2.746943 0.636121 2.520374 3.280594 +p 2 100001001000 2 3 2.120032 3.026543 3.191847 0.226976 3.530282 1.788605 2.980323 3.379190 2.619068 +p 2 100001001000 0 3 4.355116 3.219292 4.362386 4.516341 3.181239 4.363903 4.653955 2.345981 3.852559 diff --git a/s2v/s2v.par b/s2v/s2v.par index 7a308c9..811c737 100644 --- a/s2v/s2v.par +++ b/s2v/s2v.par @@ -1,4 +1,4 @@ -9 9 2 -1.000000 1.000000 -7.000000 7 1.000000 6.000000 6 1.000000 1 --0.190762 -0.629647 -3.015707 +9 9 4 +1.000000 1.000000 1.000000 1.000000 +5.000000 5 1.000000 3.000000 3 1.000000 1 +0.182558 1.126134 -1.322910 diff --git a/s5/fort.51 b/s5/fort.51 index 71ba716..0ebf27e 100644 --- a/s5/fort.51 +++ b/s5/fort.51 @@ -1,5 +1,5 @@ -p 1 100001001000 3 1.164514 4.472970 4.515880 1.282508 3.524203 4.883970 -0.106773 3.988203 3.570723 -p 1 100001001000 3 2.487949 0.970069 4.303277 2.807932 2.114717 3.015707 2.727567 1.260793 4.176357 -p 1 100001001000 3 2.228481 3.596791 3.425399 2.230021 3.065646 4.904108 2.570435 2.829843 4.365617 -p 1 100001001000 3 0.866265 0.892767 4.264220 -0.190762 -0.629647 4.599549 0.614165 0.780050 4.502412 -p 1 100001001000 3 4.294620 3.054521 4.607150 5.896218 3.271670 3.932476 5.539221 3.942415 3.412786 +p 1 100001001000 3 2.985657 4.113371 1.842963 2.750814 2.983446 1.871450 3.732794 3.462100 2.480996 +p 1 100001001000 3 3.433085 1.126134 1.322910 3.511158 2.888248 1.501685 1.933951 1.618254 1.795654 +p 1 100001001000 3 1.039979 3.215031 1.956095 0.182558 1.870699 2.746943 0.636121 2.520374 3.280594 +p 1 100001001000 3 2.120032 3.026543 3.191847 0.226976 3.530282 1.788605 2.980323 3.379190 2.619068 +p 1 100001001000 3 4.355116 3.219292 4.362386 4.516341 3.181239 4.363903 4.653955 2.345981 3.852559 diff --git a/s5/fort.60 b/s5/fort.60 index 5e07717..5174a6d 100644 --- a/s5/fort.60 +++ b/s5/fort.60 @@ -1,66 +1,84 @@ - dimensions de la maquette (x,y): 7.000 6.000 + dimensions de la maquette (x,y): 5.000 3.000 nombre de repetitions du motif: 1.0 STATISTIQUES GLOBALES DE CHAQUE ESPECE - espece: 1 surface foliaire: .249D+01 lai : 0.0593 - distribution en zenith: 0.0000 0.0000 0.0000 0.0000 0.6634 0.0905 0.0795 0.1666 0.0000 - distribution en azimuth: 0.3231 0.1666 0.3404 0.0795 0.0000 0.0000 0.0000 0.0905 0.0000 + espece: 1 surface foliaire: .411D+01 lai : 0.2738 + distribution en zenith: 0.0000 0.3407 0.0000 0.1688 0.0000 0.0000 0.3105 0.0000 0.1800 + distribution en azimuth: 0.0189 0.0000 0.3407 0.0000 0.3105 0.0000 0.0000 0.3299 0.0000 STATISTIQUES PAR CELLULE - 1 1 1 1 0.122 - 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 + 1 1 1 1 0.041 + 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1 1 3 1 0.008 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 + 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 + 1 2 3 1 0.011 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 + 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 + 1 3 1 1 0.014 + 0.0000 0.0000 0.0000 0.1847 0.0000 0.0000 0.0000 0.0000 0.8153 + 0.1847 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.8153 0.0000 + 1 3 2 1 0.180 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 - 1 2 1 1 0.003 - 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 + 2 1 1 1 0.032 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 - 1 5 1 1 0.177 + 2 1 2 1 0.718 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4841 0.0000 0.5159 + 0.0000 0.0000 0.0000 0.0000 0.4841 0.0000 0.0000 0.5159 0.0000 + 2 1 3 1 0.027 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.9534 0.0000 0.0466 + 0.0000 0.0000 0.0000 0.0000 0.9534 0.0000 0.0000 0.0466 0.0000 + 2 2 3 1 0.005 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 - 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 1 6 1 1 0.002 - 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 - 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 - 2 1 1 1 0.011 - 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 + 2 3 1 1 0.039 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 - 2 2 1 1 0.088 - 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 + 2 3 2 1 0.104 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 - 2 5 1 1 0.672 + 3 1 1 1 0.058 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 - 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 3 2 1 1 0.000 + 3 1 2 1 0.696 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 - 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 3 4 1 1 0.389 - 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 + 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 + 3 2 3 1 0.007 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 3 5 1 1 0.010 + 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 3 3 3 1 0.183 + 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 4 1 2 1 0.288 + 0.0000 0.0000 0.0000 0.5694 0.0000 0.0000 0.4306 0.0000 0.0000 + 0.0000 0.0000 0.0000 0.0000 0.4306 0.0000 0.0000 0.5694 0.0000 + 4 1 3 1 0.204 + 0.0000 0.4558 0.0000 0.5442 0.0000 0.0000 0.0000 0.0000 0.0000 + 0.0000 0.0000 0.4558 0.0000 0.0000 0.0000 0.0000 0.5442 0.0000 + 4 2 2 1 0.157 + 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 + 4 2 3 1 0.357 + 0.0000 0.6117 0.0000 0.3883 0.0000 0.0000 0.0000 0.0000 0.0000 + 0.0000 0.0000 0.6117 0.0000 0.0000 0.0000 0.0000 0.3883 0.0000 + 4 3 3 1 0.897 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 4 2 1 1 0.121 - 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 + 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 5 1 1 1 0.034 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 4 3 1 1 0.077 - 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 + 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 5 1 2 1 0.026 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 4 4 1 1 0.017 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 + 5 1 3 1 0.001 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 5 4 1 1 0.017 - 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 - 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 6 4 1 1 0.402 - 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 - 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 6 5 1 1 0.168 - 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 - 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 7 4 1 1 0.122 - 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 - 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 7 5 1 1 0.096 - 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 - 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 5 2 2 1 0.019 + 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 diff --git a/s5/leafarea b/s5/leafarea index acc8f38..dff982d 100644 --- a/s5/leafarea +++ b/s5/leafarea @@ -1,18 +1,24 @@ - 1 1 1 1 0.122 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 - 1 2 1 1 0.003 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 - 1 5 1 1 0.177 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 - 1 6 1 1 0.002 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 - 2 1 1 1 0.011 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 - 2 2 1 1 0.088 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 - 2 5 1 1 0.672 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 - 3 2 1 1 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 - 3 4 1 1 0.389 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 - 3 5 1 1 0.010 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 - 4 2 1 1 0.121 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 - 4 3 1 1 0.077 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 - 4 4 1 1 0.017 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 - 5 4 1 1 0.017 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 - 6 4 1 1 0.402 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 - 6 5 1 1 0.168 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 - 7 4 1 1 0.122 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 - 7 5 1 1 0.096 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 + 1 1 1 1 0.041 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 + 1 1 3 1 0.008 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 + 1 2 3 1 0.011 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 + 1 3 1 1 0.014 0.000 0.000 0.000 0.185 0.000 0.000 0.000 0.000 0.815 0.185 0.000 0.000 0.000 0.000 0.000 0.000 0.815 0.000 + 1 3 2 1 0.180 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 + 2 1 1 1 0.032 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 + 2 1 2 1 0.718 0.000 0.000 0.000 0.000 0.000 0.000 0.484 0.000 0.516 0.000 0.000 0.000 0.000 0.484 0.000 0.000 0.516 0.000 + 2 1 3 1 0.027 0.000 0.000 0.000 0.000 0.000 0.000 0.953 0.000 0.047 0.000 0.000 0.000 0.000 0.953 0.000 0.000 0.047 0.000 + 2 2 3 1 0.005 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 + 2 3 1 1 0.039 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 + 2 3 2 1 0.104 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 + 3 1 1 1 0.058 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 + 3 1 2 1 0.696 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 + 3 2 3 1 0.007 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 + 3 3 3 1 0.183 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 + 4 1 2 1 0.288 0.000 0.000 0.000 0.569 0.000 0.000 0.431 0.000 0.000 0.000 0.000 0.000 0.000 0.431 0.000 0.000 0.569 0.000 + 4 1 3 1 0.204 0.000 0.456 0.000 0.544 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.456 0.000 0.000 0.000 0.000 0.544 0.000 + 4 2 2 1 0.157 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 + 4 2 3 1 0.357 0.000 0.612 0.000 0.388 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.612 0.000 0.000 0.000 0.000 0.388 0.000 + 4 3 3 1 0.897 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 + 5 1 1 1 0.034 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 + 5 1 2 1 0.026 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 + 5 1 3 1 0.001 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 + 5 2 2 1 0.019 0.000 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.000 0.000 diff --git a/s5/s5.par b/s5/s5.par index ee65927..220427d 100644 --- a/s5/s5.par +++ b/s5/s5.par @@ -1,3 +1,3 @@ -1 9 9 2 0 -1.000000 1.000000 -7.000000 7 1.000000 6.000000 6 1.000000 +1 9 9 4 0 +1.000000 1.000000 1.000000 1.000000 +5.000000 5 1.000000 3.000000 3 1.000000