commit 230c75dc404a6a0e3184c75027c34c486ca32fef
parent 789532c8db1390a810b8770ffa6b259108c0dc2d
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 19 May 2022 15:32:04 +0200
Merge branch 'feature_htrdr_urban'
Diffstat:
10 files changed, 96 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,6 @@
.chk
.man
.sig
+.lint
tags
man
diff --git a/README.md b/README.md
@@ -49,10 +49,10 @@ Meso-Web :
## Vérifier la conformité des fichiers _HTML_ et des scripts _shell_
-La fichiers _Makefile_ proposent la cible _check_ pour vérifier la conformité
+La fichiers _Makefile_ proposent la cible _lint_ pour vérifier la conformité
des fichiers _HTML_ générés. Son objet est de s'assurer que les pages ainsi
construites s'afficheront correctement sur n'importe quel navigateur respectant
-la norme _HTML_. En plus de vérifier les pages web, la cible _check_ vérifie
+la norme _HTML_. En plus de vérifier les pages web, la cible _lint_ vérifie
également les sources des scripts _shell_ utilisés pour générer ces pages :
~/meso-web $ make check
diff --git a/htrdr/.gitignore b/htrdr/.gitignore
@@ -1,5 +1,6 @@
htrdr.html
htrdr-docs.html
+htrdr-mods.html
htrdr-atmosphere-spk.html
htrdr-combustion-spk.html
htrdr-*-GNU-Linux64/
diff --git a/htrdr/Makefile b/htrdr/Makefile
@@ -90,7 +90,7 @@ HTML=\
htrdr-atmosphere-spk.html\
htrdr-combustion-spk.html\
htrdr-docs.html\
- mods/htrdr-urban.html
+ htrdr-mods.html
build: .sig .man
@$(MAKE) -fMakefile -f .sig -f .man build_all
@@ -184,7 +184,7 @@ $(COMSPK_README):
################################################################################
# Mods
################################################################################
-mods/htrdr-urban.html: mods/htrdr-urban.html.in htrdr_build.sh
+htrdr-mods.html: mods/htrdr-urban.html.in htrdr_build.sh
@echo "Building $@"
@$(SHELL) htrdr_build.sh mods > $@
diff --git a/htrdr/htrdr_build.sh b/htrdr/htrdr_build.sh
@@ -53,7 +53,17 @@ documentations()
mods()
{
- print_header -s htrdr -n Mods -r ../../
+ print_header -s htrdr -n Mods -r ../
+
+ echo "<header>"
+ echo " <h1>Modifications</h1>"
+ echo "</header>"
+
+ echo "<code>htrdr</code> is free software. Far from a simple <i>credo</i>,"
+ echo "the user is invited to study, modify and redistribute it"
+ echo "according to his own needs. This page lists some of these forks"
+ echo "developed by the <code>htrdr</code> community."
+
cat mods/htrdr-urban.html.in
print_footer
}
diff --git a/htrdr/mods/Ebudget_Streetcanyon_Broadband.svg b/htrdr/mods/Ebudget_Streetcanyon_Broadband.svg
@@ -0,0 +1 @@
+#$# git-wad 4f01c41f195f3c486c58e5617b4d55e609ad8d9e7961e36dab7d74e1c8e3b8d7 112397
+\ No newline at end of file
diff --git a/htrdr/mods/MRT_map_icif_district_day.svg b/htrdr/mods/MRT_map_icif_district_day.svg
@@ -0,0 +1 @@
+#$# git-wad 0d784883573ec9f6807004c2eee253d09959c61cd61e5dc8d256717503de163c 210511
+\ No newline at end of file
diff --git a/htrdr/mods/Rendering_icif_district_spp200.jpg b/htrdr/mods/Rendering_icif_district_spp200.jpg
@@ -0,0 +1 @@
+#$# git-wad cdd28e25ccb72a10dad1f34eed834f254f80b615d546ab67d2d18745ebb58eb2 342698
+\ No newline at end of file
diff --git a/htrdr/mods/htrdr-urban.html.in b/htrdr/mods/htrdr-urban.html.in
@@ -0,0 +1,68 @@
+<h2 id="urban"><code style="color: #000000">htrdr</code> Urban</h2>
+
+<div class="img" style="width: 20em">
+ <a href="mods/Rendering_icif_district_spp200.jpg">
+ <img src="mods/Rendering_icif_district_spp200.jpg" alt="icif_district">
+ </a>
+ <div class="caption">
+ Fig. 1 - Rendering in the visible part of the solar spectrum of a
+ procedurally generated dense mid-rise city. The number of pixels is 1500x800,
+ the vertical field of view 70°, and the number of samples per pixel 200.
+ </div>
+</div>
+
+<p>The <code>htrdr</code> Urban program is a fork of <code>htrdr</code> 0.6.1
+that simulates radiative transfer in scenes composed of an atmospheric gas
+mixture, clouds, and a ground with buildings and vegetation. In addition of
+<b>visible or infrared rendering</b> of virtual scenes and calculation of
+<b>solar or ifrared irradiation</b>, <code>htrdr</code> Urban adds the
+calculation of <b>radiative flux density</b> incident on or absorbed by a group
+of triangles belonging to the ground geometry (e.g. building, walls, windows,
+roofs, <i>etc.</i>). Visit the <a
+href="https://gitlab.com/edstar/htrdr/-/tree/main_urban">project repository</a>
+for more informations about this modification (features, installation process,
+use case, <i>etc</i>).
+
+<p>The following figures illustrate some of the results obtained with
+<code>htrdr</code> Urban.</p>
+
+<div style="display: inline-block;">
+ <div style="float: left; width: 22em; margin-right: 1em;">
+ <a href="mods/Ebudget_Streetcanyon_Broadband.svg">
+ <img src="mods/Ebudget_Streetcanyon_Broadband.svg" alt="ebudget">
+ </a>
+ <div class="caption">
+ Fig. 2 - Solar radiation budget of infinitely-long street canyon
+ geometries with different aspect ratios (building height divided by street
+ width) simulated with htrdr-urban (MC) and the Town Energy Balance (TEB),
+ which calculates radiative exchange with the radiosity method. The
+ radiation budget consists of the reflected radiation (UP) and the radiation
+ absorbed by the roof (ABS_ROOF), walls (ABS_WALL), and road (ABS_ROAD). All
+ terms have been normalized with the downwelling solar radiation. The plane
+ area building density is 0.5. All surfaces have a Lambertian broadband
+ albedo of 0.5. (left) The downwelling solar radiation consists of only
+ direct radiation. (right) The downwelling solar radiation consists of
+ isotropic diffusive radiation.
+ </div>
+ </div>
+
+ <div style="float: left; width: 26em;">
+ <a href="mods/MRT_map_icif_district_day.svg">
+ <img src="mods/MRT_map_icif_district_day.svg" alt="MRT_day">
+ </a>
+ <div class="caption">
+ Fig. 3 - (left) Spatial distribution (1 m resolution) of the
+ Mean Radiant Temperature (MRT) in a compact mid-rise urban district of
+ 800 m x 800 m horizontal extent during the daytime. A
+ rendering of the district is shown in Fig. 1. The solar elevation angle
+ is 50° and the sky is clear. The sun is located in the west of the
+ district (it shines from left to right) leading to low MRT due to shading on
+ the right of the buildings and high MRT due to reflected solar radiation on
+ the left of the buildings. The temperature of all surfaces is 295 K. The
+ white colour depicts the built areas for which the outdoor MRT is not
+ defined. (right) Standard deviation of the MRT displayed in (left) calculated
+ by the Monte-Carlo method.
+ </div>
+ </div>
+</div>
+
diff --git a/meso-menu.sh b/meso-menu.sh
@@ -137,6 +137,11 @@ print_htrdr_sub_menu() {
echo " <li><a href=\"${root}htrdr/htrdr-combustion-spk.html\">Combustion</a></li>"
fi
echo " </ul></li>"
+ if [ "${name}" = "Mods" ]; then
+ echo " <li id=\"cur\">Modifications</li>"
+ else
+ echo " <li><a href=\"${root}htrdr/htrdr-mods.html\">Modifications</a></li>"
+ fi
echo " <li><a href=\"https://gitlab.com/meso-star/htrdr\">Git repository</a></li>"
echo " </ul>"
echo " <div id=\"info\">"
