commit 8f9b6a268eb2a5b99ffc037c7371223b99482d2d
parent bef50033e80e3e4c13236cfe376b26ba03f00233
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 10 Feb 2023 11:22:32 +0100
htrdr: publis the combustion Starter-Pack 0.1.0
Diffstat:
5 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/htrdr/Makefile b/htrdr/Makefile
@@ -36,12 +36,13 @@ ATMSPK_PKG=\
downloads/High-Tune-Starter-Pack-0.1.1.tar.gz
ATMSPK_SIG=$(ATMSPK_PKG:=.sig)
-COMSPK_VERSION=0.0.0
+COMSPK_VERSION=0.1.0
COMSPK_DIR=htrdr-Combustion-Starter-Pack-$(COMSPK_VERSION)
COMSPK_ARCH=downloads/$(COMSPK_DIR).tar.gz
COMSPK_README=$(COMSPK_DIR)/README.md.in
COMSPK_PKG=\
- downloads/htrdr-Combustion-Starter-Pack-0.0.0.tar.gz
+ downloads/htrdr-Combustion-Starter-Pack-0.0.0.tar.gz\
+ downloads/htrdr-Combustion-Starter-Pack-0.1.0.tar.gz
COMSPK_SIG=$(COMSPK_PKG:=.sig)
MAN=\
@@ -90,7 +91,8 @@ ATMSPK_IMG=\
COMSPK_IMG=\
dummy_medium.jpg\
- dummy_medium_clipped.jpg
+ dummy_medium_clipped.jpg\
+ gulder_lateral.jpg
MODS_IMG=\
mods/Rendering_icif_district_spp200.jpg\
diff --git a/htrdr/downloads/htrdr-Combustion-Starter-Pack-0.1.0.tar.gz b/htrdr/downloads/htrdr-Combustion-Starter-Pack-0.1.0.tar.gz
@@ -0,0 +1 @@
+#$# git-wad dd78d4668021e9bb17a40e5f92076cbf446915fc34185d798575e3105117e28d 218312050
+\ No newline at end of file
diff --git a/htrdr/gulder_lateral.jpg b/htrdr/gulder_lateral.jpg
@@ -0,0 +1 @@
+#$# git-wad 4bec18a2d8272b830606629a3c837d711fbd418aa339e199d644259ff4da3645 73188
+\ No newline at end of file
diff --git a/htrdr/htrdr.html.in b/htrdr/htrdr.html.in
@@ -253,12 +253,12 @@ href="https://imagemagick.org/script/display.php">display</a>.
<div class="caption">
Images rendered with <a
href="man/man1/htrdr-combustion.1.html">htrdr-combustion</a> of a flame
- illuminated by a vertical laser sheet that runs through the central axis of
- the flame; the camera is looking at the centre of the flame, but its normal
- is oriented respectively at an angle of 30, 60 and 90 degrees relative to the
- main direction of the laser sheet. One can see the trapping of
- radiation by the medium and the decrease of scattering intensity
- decreases with the angle of observation, otherwise known as the scattering
+ illuminated by an horizontal laser sheet that runs through the central axis
+ of the flame; the camera is looking at the centre of the flame, but its
+ normal is oriented respectively at an angle of 30, 60 and 90 degrees relative
+ to the main direction of the laser sheet. One can see the trapping of
+ radiation by the medium and the decrease of scattering intensity decreases
+ with the angle of observation, otherwise known as the scattering
angle.
</div>
</div>
diff --git a/htrdr/htrdr_build.sh b/htrdr/htrdr_build.sh
@@ -216,16 +216,30 @@ comspk()
exit 1
fi
- readme=$(VERSION=$2 envsubst < "$1" | ${markdown})
- intro=$(echo "${readme}" | sed '/^<h2>Content<\/h2>/q' \
+ readme=$(VERSION=$2 envsubst < "$1"\
+ | "${markdown}"\
+ | sed 's/<pre><code>/<pre class="code">/g'\
+ | sed 's/<\/code><\/pre>/<\/pre>/g')
+ intro=$(echo "${readme}" | sed '/^<h2>Gulder<\/h2>/q' \
| sed -e '1d' -e '$d' \
| sed '0,/<code>htrdr<\/code>/s//<a href=man\/man1\/htrdr.1.html>htrdr<\/a>/' \
| sed '0,/<code>htrdr-combustion<\/code>/s//<a href=man\/man1\/htrdr-combustion.1.html>htrdr-combustion<\/a>/')
- content=$(echo "${readme}" \
- | sed -n '/^<h2>Content<\/h2>/,/^<h2>Copyright notice<\/h2>/p' \
- | sed -e '1d' -e '$d' -e 's/PPM image than/PPM image that/' \
+ gulder=$(echo "${readme}" \
+ | sed -n '/^<h2>Gulder<\/h2>/,/^<h2>Dummy medium<\/h2>/p' \
+ | sed -e '1d' -e '$d' \
+ | sed '0,/<code>htrdr<\/code>/s//<a href=man\/man1\/htrdr.1.html>htrdr<\/a>/' \
+ | sed '0,/<code>htrdr-combustion<\/code>/s//<a href=man\/man1\/htrdr-combustion.1.html>htrdr-combustion<\/a>/')
+ dummy=$(echo "${readme}" \
+ | sed -n '/^<h2>Dummy medium<\/h2>/,/^<h2>Validation program<\/h2>/p' \
+ | sed -e '1d' -e '$d' \
+ | sed '0,/<code>htrdr<\/code>/s//<a href=man\/man1\/htrdr.1.html>htrdr<\/a>/' \
+ | sed '0,/<code>htrdr-combustion<\/code>/s//<a href=man\/man1\/htrdr-combustion.1.html>htrdr-combustion<\/a>/')
+ validation=$(echo "${readme}" \
+ | sed -n '/^<h2>Validation program<\/h2>/,/^<h2>Copyright notice<\/h2>/p' \
+ | sed -e '$d' \
| sed '0,/<code>htrdr<\/code>/s//<a href=man\/man1\/htrdr.1.html>htrdr<\/a>/' \
| sed '0,/<code>htrdr-combustion<\/code>/s//<a href=man\/man1\/htrdr-combustion.1.html>htrdr-combustion<\/a>/')
+
copying=$(echo "${readme}" | sed -n '/^<h2>Copyright notice<\/h2>/,$p')
print_header -s htrdr -n Combustion-Starter-Pack -r ../
@@ -243,7 +257,23 @@ comspk()
echo "${intro}"
- echo "<h2>Content</h2>"
+ echo "<h2>Gülder</h2>"
+ echo "<div class=\"img\" style=\"width: 17em\">"
+ echo " <a href=\"gulder_lateral.jpg\">"
+ echo " <img src=\"gulder_lateral.jpg\" alt=\"gulder_lateral\">"
+ echo " </a>"
+ echo " <div class=\"caption\">"
+ echo " Rendering of the Gülder flame calculated by <a"
+ echo " href=\"man/man1/htrdr-combustion.1.html\">htrdr-combustion</a>. The flame is"
+ echo " illuminated by a vertical laser sheet that crosses the central axis of the"
+ echo " flame, from left to right.The image displays the radiation emitted by the"
+ echo " laser, scattered and transmitted by the combustion medium for "
+ echo " wavelength (here 532 nm)."
+ echo " </div>"
+ echo " </div>"
+ echo "${gulder}"
+
+ echo "<h2>Dummy medium</h2>"
echo "<div class=\"img\" style=\"width: 20em\">"
echo " <div style=\"width: 49.5%; float: left; padding-right: 1%\">"
echo " <a href=\"dummy_medium.jpg\">"
@@ -256,14 +286,15 @@ comspk()
echo " </a>"
echo " </div>"
echo ""
- echo " <div class=\"caption\">Illustration of the combustion medium provided in the"
+ echo " <div class=\"caption\">Illustration of the dummy medium provided in the"
echo " Starter Pack. This medium is illuminated by a laser sheet whose surface of"
echo " emission is here represented in red. The image on the left shows the"
echo " entire medium. In the image on the right, the medium is clipped along the y axis"
echo " to emphasize the axisymmetric profile of its soot volume fraction.</div>"
echo "</div>"
- echo "${content}"
+ echo "${dummy}"
+ echo "${validation}"
echo "${copying}"
print_footer
