commit 4845435490dd70da80618fb535d3c9c32945ea0e parent 146cb20e3bdf1373d7f204edb820da49b02aa6cc Author: Vincent Forest <vincent.forest@meso-star.com> Date: Thu, 6 Feb 2025 18:15:01 +0100 stardis: add infrared rendering of Ile du Ramier Move images to a subdirectory and add thumbnails to speed up WEB page rendering for low-bandwidth connections. Thumbnails are added only when necessary, i.e. when the thumbnail considerably reduces the size of the original image, for example by a factor of 10. Diffstat:
38 files changed, 103 insertions(+), 54 deletions(-)
diff --git a/stardis/Makefile b/stardis/Makefile @@ -49,34 +49,45 @@ STARDIS_ARCH_FILES=\ $(STARDIS_SOLVER_README)\ $(MAN) +# images/pulse.svg +# images/sin.svg +# images/step.svg OVERVIEW_IMG=\ - foam_path.jpg\ - heatsink_anim.gif\ - heatsink_anim_thumb.gif\ - plot_insensib_MC.jpg\ - pulse.svg\ - sin.svg\ - step.svg + images/foam_path.jpg\ + images/heatsink_anim.gif\ + images/plot_insensib_MC.jpg\ + images/ramier_island.png\ + images/ramier_island_sun.png\ + thumbs/foam_path.jpg\ + thumbs/heatsink_anim.gif\ + thumbs/plot_insensib_MC.jpg\ + thumbs/ramier_island.jpg\ + thumbs/ramier_island_sun.jpg STARTER_PACK_IMG=\ - city.jpg\ - foam.jpg\ - heatsink.jpg\ - heatsinkx50.jpg\ - IR_rendering_1080x720x128.jpg\ - IR_animation_1080x720x32x128.gif\ - IR_animation_1080x720x32x128_thumb.gif\ - IR_city_640x480x1024_273-275.png + images/city.jpg\ + images/foam.jpg\ + images/heatsink.jpg\ + images/heatsinkx50.jpg\ + images/IR_rendering_1080x720x128.jpg\ + images/IR_animation_1080x720x32x128.gif\ + images/IR_city_640x480x1024_273-275.png\ + thumbs/city.jpg\ + thumbs/foam.jpg\ + thumbs/heatsink.jpg\ + thumbs/heatsinkx50.jpg\ + thumbs/IR_rendering_1080x720x128.jpg\ + thumbs/IR_animation_1080x720x32x128.gif\ VALIDATION_IMG=\ - geometry.svg\ - temperature.png\ - TprofX.png\ - TprofY.png + images/geometry.svg\ + images/temperature.png\ + images/TprofX.png\ + images/TprofY.png CONSORTIUM_IMG=\ - airbus_logo.svg\ - edf_logo.svg + images/airbus_logo.svg\ + images/edf_logo.svg HTML=\ consortium-fr.html\ diff --git a/stardis/consortium-en.html.in b/stardis/consortium-en.html.in @@ -88,10 +88,10 @@ functioning of the consortium.</p> <ul style="list-style-type: none;"> <li style="padding-bottom: 1.0em;"><img alt="Airbus logo" - src="airbus_logo.svg" style="vertical-align: middle; padding-right: + src="images/airbus_logo.svg" style="vertical-align: middle; padding-right: 1em; width: 4em;"/>Airbus SAS</li> <li style="padding-bottom: 1.0em;"><img alt="EDF logo" - src="edf_logo.svg" style="vertical-align: middle; padding-right: 1em; + src="images/edf_logo.svg" style="vertical-align: middle; padding-right: 1em; width: 4em;" />Électricité de France Research & Dévelopment</li> </ul> diff --git a/stardis/consortium-fr.html.in b/stardis/consortium-fr.html.in @@ -88,9 +88,9 @@ fonctionnement du consortium.</p> <ul style="list-style-type: none;"> <li style="padding-bottom: 1.0em;"><img alt="Airbus logo" - src="airbus_logo.svg" style="vertical-align: middle; padding-right: + src="images/airbus_logo.svg" style="vertical-align: middle; padding-right: 1em; width: 4em;"/>Airbus SAS</li> - <li style="padding-bottom: 1.0em"><img alt="EDF logo" src="edf_logo.svg" - style="vertical-align: middle; padding-right: 1em; width: 4em;" + <li style="padding-bottom: 1.0em"><img alt="EDF logo" + src="images/edf_logo.svg" style="vertical-align: middle; padding-right: 1em; width: 4em;" />Électricité de France Recherche & Développement</li> </ul> diff --git a/stardis/IR_animation_1080x720x32x128.gif b/stardis/images/IR_animation_1080x720x32x128.gif diff --git a/stardis/IR_city_640x480x1024_273-275.png b/stardis/images/IR_city_640x480x1024_273-275.png diff --git a/stardis/IR_rendering_1080x720x128.jpg b/stardis/images/IR_rendering_1080x720x128.jpg diff --git a/stardis/TprofX.png b/stardis/images/TprofX.png diff --git a/stardis/TprofY.png b/stardis/images/TprofY.png diff --git a/stardis/airbus_logo.svg b/stardis/images/airbus_logo.svg diff --git a/stardis/city.jpg b/stardis/images/city.jpg diff --git a/stardis/edf_logo.svg b/stardis/images/edf_logo.svg diff --git a/stardis/foam.jpg b/stardis/images/foam.jpg diff --git a/stardis/foam_path.jpg b/stardis/images/foam_path.jpg diff --git a/stardis/geometry.svg b/stardis/images/geometry.svg diff --git a/stardis/heatsink.jpg b/stardis/images/heatsink.jpg diff --git a/stardis/heatsink_anim.gif b/stardis/images/heatsink_anim.gif diff --git a/stardis/heatsinkx50.jpg b/stardis/images/heatsinkx50.jpg diff --git a/stardis/plot_insensib_MC.jpg b/stardis/images/plot_insensib_MC.jpg diff --git a/stardis/pulse.svg b/stardis/images/pulse.svg diff --git a/stardis/images/ramier_island.png b/stardis/images/ramier_island.png @@ -0,0 +1 @@ +#$# git-wad 305ed0afe73f242e7b1d8cc24808b27e7ca279a809bd1eb3162e8108520a943b 2922757 +\ No newline at end of file diff --git a/stardis/images/ramier_island_sun.png b/stardis/images/ramier_island_sun.png @@ -0,0 +1 @@ +#$# git-wad cd952d5306fb9a2be0cf3a6b55f4f29464fa92b35f2c525bbd95f9045914dc49 3132106 +\ No newline at end of file diff --git a/stardis/sin.svg b/stardis/images/sin.svg diff --git a/stardis/step.svg b/stardis/images/step.svg diff --git a/stardis/temperature.png b/stardis/images/temperature.png diff --git a/stardis/stardis.html.in b/stardis/stardis.html.in @@ -118,7 +118,9 @@ purposes:</p> </p></li> <li> <div class="img" style="width: 18em"> - <a href="foam_path.jpg"><img src="foam_path.jpg" alt="foam_path"></a> + <a href="images/foam_path.jpg"> + <img src="thumbs/foam_path.jpg" alt="foam_path"> + </a> <div class="caption"> Example of conductive path sampled by Stardis in a foam geometry: it starts from the probe position (green point) and after several diffusive steps @@ -162,7 +164,9 @@ post-processing. See below for more information on each of these components.</p> <h2 id="solver">Stardis-Solver</h2> <div class="img" style="width: 18em;"> - <a href="heatsink_anim.gif"><img src="heatsink_anim_thumb.gif" alt="heatsink"></a> + <a href="images/heatsink_anim.gif"> + <img src="thumbs/heatsink_anim.gif" alt="heatsink"> + </a> <div class="caption"> Infrared timelapse animation of a chip and its heatsink covering a 14-second period of time. Computed using the stardis infrared rendering feature, one @@ -252,7 +256,9 @@ the following hypothesis: </ul> <div class="img" style="width: 18em"> - <a href="plot_insensib_MC.jpg"><img src="plot_insensib_MC.jpg" alt="plot_insensib_MC"></a> + <a href="images/plot_insensib_MC.jpg"> + <img src="thumbs/plot_insensib_MC.jpg" alt="plot_insensib_MC"> + </a> <div class="caption"> Stardis computation time as function of geometrical refinement. Both the standard Monte Carlo computation and the Green function construction and @@ -265,15 +271,25 @@ the following hypothesis: <p>The main functionalities provided by Stardis-Solver upon the aforementioned hypothesis are as follows:</p> -<div class="img" style="width: 18em;"> - <a href="step.svg"><img src="step.svg" alt="step"></a> - <a href="sin.svg"><img src="sin.svg" alt="sin"></a> - <a href="pulse.svg"><img src="pulse.svg" alt="pulse"></a> +<div class="img" style="width: 18em"> + <a href="images/ramier_island.png"> + <img src="thumbs/ramier_island.jpg" alt="Ramier island"> + </a> + <a href="images/ramier_island_sun.png"> + <img src="thumbs/ramier_island_sun.jpg" alt="Ramier island with sun"> + </a> <div class="caption"> - Temporal dynamics analysis of a solid cube which has temperatures imposed on - its left and right sides, and has adiabatic boundaries elsewhere. The - center temperature is the result of a simple postprocess of a <b>single - Monte Carlo computation</b>. + Infrared rendering by Stardis of a city district generated by + <a href="https://gitlab.com/meso-star/city_generator2"> + City_Generator2 + </a> + from the cadastral map of Ile du Ramier in Toulouse, France. + Temperature are given in Kelvin. + In both images, the coupled exchanges of convection, conduction and + radiation are evaluated within and between all buildings, i.e. in each + room, through every pane of glass and wall with insulation, via the + floor, etc. + The lower image also includes solar flux as a new boundary condition. </div> </div> diff --git a/stardis/stardis_build.sh b/stardis/stardis_build.sh @@ -135,10 +135,10 @@ starter_pack() echo "<h2>Content</h2>" echo "<div class=\"img\" style=\"padding-top:3em; width: 17em\">" - echo " <a href=\"heatsink.jpg\"><img src=\"heatsink.jpg\" alt=\"heatsink\"></a>" - echo " <a href=\"heatsinkx50.jpg\"><img src=\"heatsinkx50.jpg\" alt=\"heatsinkx50\"></a>" - echo " <a href=\"foam.jpg\"><img src=\"foam.jpg\" alt=\"foam\"></a>" - echo " <a href=\"city.jpg\"><img src=\"city.jpg\" alt=\"city\"></a>" + echo " <a href=\"images/heatsink.jpg\"><img src=\"thumbs/heatsink.jpg\" alt=\"heatsink\"></a>" + echo " <a href=\"images/heatsinkx50.jpg\"><img src=\"thumbs/heatsinkx50.jpg\" alt=\"heatsinkx50\"></a>" + echo " <a href=\"images/foam.jpg\"><img src=\"thumbs/foam.jpg\" alt=\"foam\"></a>" + echo " <a href=\"images/city.jpg\"><img src=\"thumbs/city.jpg\" alt=\"city\"></a>" echo " <div class=\"caption\">" echo " Geometries of the heatsink, the multiple heatsinks, the foam, and the city" echo " provided by the Starter Pack and used in its examples." @@ -148,11 +148,11 @@ starter_pack() echo "${content1}" echo "<div class=\"img\" style=\"padding-top:3em; width: 16em\">" - echo " <a href=\"IR_rendering_1080x720x128.jpg\">" - echo " <img src=\"IR_rendering_1080x720x128.jpg\" alt=\"foam_ir\">" + echo " <a href=\"images/IR_rendering_1080x720x128.jpg\">" + echo " <img src=\"thumbs/IR_rendering_1080x720x128.jpg\" alt=\"foam_ir\">" echo " </a>" - echo " <a href=\"IR_animation_1080x720x32x128.gif\">" - echo " <img src=\"IR_animation_1080x720x32x128_thumb.gif\" alt=\"foam_anim\">" + echo " <a href=\"images/IR_animation_1080x720x32x128.gif\">" + echo " <img src=\"thumbs/IR_animation_1080x720x32x128.gif\" alt=\"foam_anim\">" echo " </a>" echo " <div class=\"caption\">" echo " Illustration of the infrared rendering of the porous example. The" @@ -165,8 +165,8 @@ starter_pack() echo "</div>" echo "<div class=\"img\" style=\"padding-top:3em; width: 16em\">" - echo " <a href=\"IR_city_640x480x1024_273-275.png\">" - echo " <img src=\"IR_city_640x480x1024_273-275.png\" alt=\"city_ir\">" + echo " <a href=\"images/IR_city_640x480x1024_273-275.png\">" + echo " <img src=\"images/IR_city_640x480x1024_273-275.png\" alt=\"city_ir\">" echo " </a>" echo " <div class=\"caption\">" echo " The infrared rendering of the city example. The color map displays the" diff --git a/stardis/IR_animation_1080x720x32x128_thumb.gif b/stardis/thumbs/IR_animation_1080x720x32x128.gif diff --git a/stardis/thumbs/IR_rendering_1080x720x128.jpg b/stardis/thumbs/IR_rendering_1080x720x128.jpg @@ -0,0 +1 @@ +#$# git-wad b92b3fdbfc75530e8caabe241ee669968aa326a3c9826e4cc12daf854b1a067a 21697 +\ No newline at end of file diff --git a/stardis/thumbs/city.jpg b/stardis/thumbs/city.jpg @@ -0,0 +1 @@ +#$# git-wad f56043a54d0a5997e69264cf7fda4b11899844dfe3d08641041fa520e2f1583d 27541 +\ No newline at end of file diff --git a/stardis/thumbs/foam.jpg b/stardis/thumbs/foam.jpg @@ -0,0 +1 @@ +#$# git-wad 98f450c62b80cf4f61f120f15b9ab3dc841025939c7e3fcaaedd02b108e486f9 20517 +\ No newline at end of file diff --git a/stardis/thumbs/foam_path.jpg b/stardis/thumbs/foam_path.jpg @@ -0,0 +1 @@ +#$# git-wad 154cb2e726e65235b0f09d66a94d379b7722b123d2bb4ea6ac26e097e6bfead1 23029 +\ No newline at end of file diff --git a/stardis/thumbs/heatsink.jpg b/stardis/thumbs/heatsink.jpg @@ -0,0 +1 @@ +#$# git-wad b34fe33d1f449be15ae63a5674c567f6502b0220fc50d533afd75cbcaad56bd7 17241 +\ No newline at end of file diff --git a/stardis/heatsink_anim_thumb.gif b/stardis/thumbs/heatsink_anim.gif diff --git a/stardis/thumbs/heatsinkx50.jpg b/stardis/thumbs/heatsinkx50.jpg @@ -0,0 +1 @@ +#$# git-wad 9140844c63a7ce65619cb7508064df5e4b193738bf8dca75f415342644c7a542 31699 +\ No newline at end of file diff --git a/stardis/thumbs/plot_insensib_MC.jpg b/stardis/thumbs/plot_insensib_MC.jpg @@ -0,0 +1 @@ +#$# git-wad 834dcd23513597cfb59458f74e2eec6f62baef65fadb0ecef20be46c3139234a 70715 +\ No newline at end of file diff --git a/stardis/thumbs/ramier_island.jpg b/stardis/thumbs/ramier_island.jpg @@ -0,0 +1 @@ +#$# git-wad 898eca0fe89cda0f5a34c61116a21a703b97fe5e89afe9d25c7d05e97e1a87b5 41655 +\ No newline at end of file diff --git a/stardis/thumbs/ramier_island_sun.jpg b/stardis/thumbs/ramier_island_sun.jpg @@ -0,0 +1 @@ +#$# git-wad 98cc023dbf7a291075fbdf0959291d21c57153ee3ea9371d0647ded22facb049 54194 +\ No newline at end of file diff --git a/stardis/validation.html.in b/stardis/validation.html.in @@ -123,9 +123,9 @@ Carlo (using Stardis) resolutions are compared to the theoretical temperature (figure 2).</p> <div class="img" style="text-align: center"> - <img src="geometry.svg" alt="geometry" style="width: 45%"> - <a href="temperature.png"> - <img src="temperature.png" alt="temperature" style="width: 40%"> + <img src="images/geometry.svg" alt="geometry" style="width: 45%"> + <a href="images/temperature.png"> + <img src="images/temperature.png" alt="temperature" style="width: 40%"> </a> <div class="caption"> <b>Figure 1:</b> The left figure describes the configuration of the test @@ -138,11 +138,11 @@ Carlo (using Stardis) resolutions are compared to the theoretical temperature </div> <div class="img" style="text-align: center"> - <a href="TprofY.png"> - <img src="TprofY.png" alt="ProfY" style="width: 45%"> + <a href="images/TprofY.png"> + <img src="images/TprofY.png" alt="ProfY" style="width: 45%"> </a> - <a href="TprofX.png"> - <img src="TprofX.png" alt="ProfY" style="width: 45%"> + <a href="images/TprofX.png"> + <img src="images/TprofX.png" alt="ProfY" style="width: 45%"> </a> <div class="caption"> <b>Figure 2:</b> Validation of the Finite element solver and the Monte Carlo
