commit 804741a2698cad27952793a058add57870733004
parent 20e6dda16d9b6825548a02e60a61fe3033e8e9eb
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 10 Feb 2023 16:06:29 +0100
htrdr: add planeto Starter Pack page
Diffstat:
6 files changed, 127 insertions(+), 13 deletions(-)
diff --git a/htrdr/.gitignore b/htrdr/.gitignore
@@ -3,5 +3,6 @@ htrdr-docs.html
htrdr-mods.html
htrdr-atmosphere-spk.html
htrdr-combustion-spk.html
+htrdr-planeto-spk.html
htrdr-*-GNU-Linux64/
htrdr-*-Starter-Pack-*/
diff --git a/htrdr/Makefile b/htrdr/Makefile
@@ -42,10 +42,18 @@ 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.1.0.tar.gz
+ downloads/htrdr-Combustion-Starter-Pack-0.1.0.tar.gz\
+ downloads/htrdr-Combustion-Starter-Pack-0.0.0.tar.gz
COMSPK_SIG=$(COMSPK_PKG:=.sig)
+PLANETOSPK_VERSION=0.0.0
+PLANETOSPK_DIR=htrdr-Planeto-Starter-Pack-$(PLANETOSPK_VERSION)
+PLANETOSPK_ARCH=downloads/$(PLANETOSPK_DIR).tar.gz
+PLANETOSPK_README=$(PLANETOSPK_DIR)/README.md.in
+PLANETOSPK_PKG=\
+ downloads/htrdr-Planeto-Starter-Pack-0.0.0.tar.gz
+PLANETOSPK_SIG=$(PLANETOSPK_PKG:=.sig)
+
MAN=\
$(HTRDR_DIR)/share/man/man1/htpp.1\
$(HTRDR_DIR)/share/man/man1/htrdr.1\
@@ -97,16 +105,21 @@ COMSPK_IMG=\
dummy_medium_clipped.jpg\
gulder_lateral.jpg
+PLANETOSPK_IMG=\
+ random01_visible.jpg\
+ random01_LW_10-12um.jpg
+
MODS_IMG=\
mods/Rendering_icif_district_spp200.jpg\
mods/Ebudget_Streetcanyon_Broadband.svg\
mods/MRT_map_icif_district_day.svg
-IMG=$(OVERVIEW_IMG) $(ATMSPK_IMG) $(COMSPK_IMG) $(MODS_IMG)
+IMG=$(OVERVIEW_IMG) $(ATMSPK_IMG) $(COMSPK_IMG) $(PLANETOSPK_IMG) $(MODS_IMG)
HTML=\
htrdr.html\
htrdr-atmosphere-spk.html\
htrdr-combustion-spk.html\
+ htrdr-planeto-spk.html\
htrdr-docs.html\
htrdr-mods.html
@@ -122,15 +135,16 @@ clean:
distclean: clean
@echo "Cleaning PGP signatures and extracted files"
- @rm -f \
- $(ATMSPK_SIG) \
- $(ATMSPK_README) \
- $(COMSPK_SIG) \
- $(COMSPK_README) \
- $(HTRDR_README) \
+ @rm -f\
+ $(ATMSPK_SIG)\
+ $(ATMSPK_README)\
+ $(COMSPK_SIG)\
+ $(COMSPK_README)\
+ $(PLANETOSPK_SIG)\
+ $(PLANETOSPK_README)\
+ $(HTRDR_README)\
$(MAN)
-
install: build
@rsync -avzrR --delete-after --progress\
downloads/gas_opt_prop_en.pdf\
@@ -141,6 +155,8 @@ install: build
$(ATMSPK_SIG)\
$(COMSPK_PKG)\
$(COMSPK_SIG)\
+ $(PLANETOSPK_PKG)\
+ $(PLANETOSPK_SIG)\
$(PREFIX)/htrdr/
htrdr_build.sh: ../meso-menu.sh
@@ -165,7 +181,7 @@ $(HTRDR_README) $(MAN):
################################################################################
# Reference documentations
################################################################################
-htrdr-docs.html: htrdr-docs.html.in
+htrdr-docs.html: htrdr-docs.html.in htrdr_build.sh
@echo "Building $@"
@$(SHELL) htrdr_build.sh documentations > $@
@@ -200,6 +216,21 @@ $(COMSPK_README):
@tar -xz -f $(COMSPK_ARCH) $(COMSPK_README)
################################################################################
+# Planeto Starter-Pack
+################################################################################
+htrdr-planeto-spk.html: \
+ $(PLANETOSPK_IMG) \
+ $(PLANETOSPK_SIG) \
+ $(PLANETOSPK_README) \
+ htrdr_build.sh
+ @echo "Building $@"
+ @$(SHELL) htrdr_build.sh planetospk $(PLANETOSPK_README) $(PLANETOSPK_VERSION) > $@
+
+$(PLANETOSPK_README):
+ @echo "Extracting data from $(PLANETOSPK_ARCH)"
+ @tar -xz -f $(PLANETOSPK_ARCH) $(PLANETOSPK_README)
+
+################################################################################
# Mods
################################################################################
htrdr-mods.html: mods/htrdr-urban.html.in htrdr_build.sh $(MODS_IMG)
@@ -222,7 +253,8 @@ lint_shells:
################################################################################
.sig: Makefile ../configure_targets.sh
@echo "Setup .sig"
- @$(SHELL) ../configure_targets.sh sig $(ATMSPK_PKG) $(COMSPK_PKG) > .sig
+ @$(SHELL) ../configure_targets.sh sig \
+ $(ATMSPK_PKG) $(COMSPK_PKG) $(PLANETOSPK_PKG) > .sig
.lint: Makefile ../configure_targets.sh
@echo "Setup .lint"
@@ -231,4 +263,3 @@ lint_shells:
.man: Makefile ../configure_targets.sh
@echo "Setup .man"
@$(SHELL) ../configure_targets.sh man htrdr $(HTRDR_VERSION) $(MAN) > .man
-
diff --git a/htrdr/downloads/htrdr-Planeto-Starter-Pack-0.0.0.tar.gz b/htrdr/downloads/htrdr-Planeto-Starter-Pack-0.0.0.tar.gz
@@ -0,0 +1 @@
+#$# git-wad 8eaa0eeca2a55d63e7745bbd893c73e0f2d3d0b51655080ceb643a2af2bc2323 142011948
+\ No newline at end of file
diff --git a/htrdr/htrdr_build.sh b/htrdr/htrdr_build.sh
@@ -288,4 +288,80 @@ comspk()
print_footer
}
+planetospk()
+{
+ if [ $# -lt 2 ]; then
+ printf "Usage: %s planetospk <readme> <version>\n" "$0" >&2
+ exit 1
+ fi
+
+ 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>Content<\/h2>/q' \
+ | sed -e '1d' -e '$d' \
+ | sed '0,/<code>htrdr-planeto<\/code>/s//<a href=man\/man1\/htrdr-planeto.1.html>htrdr-planeto<\/a>/')
+ titan=$(echo "${readme}"\
+ | sed -n '/^<h3>Titan<\/h3>/,/^<h3>Random01<\/h3>/p'\
+ | sed -e '1d' -e '$d')
+ random01=$(echo "${readme}"\
+ | sed -n '/^<h3>Random01<\/h3>/,/^<h3><code>sun_intensity_lite.bin<\/code><\/h3>/p'\
+ | sed -e '1d' -e '$d')
+ sun_intensity_lite=$(echo "${readme}"\
+ | sed -n '/^<h3><code>sun_intensity_lite.bin<\/code><\/h3>/,/<h2>Copyright notice<\/h2>/p'\
+ | sed -e '1d' -e '$d')
+ copying=$(echo "${readme}" | sed -n '/^<h2>Copyright notice<\/h2>/,$p')
+
+ print_header -s htrdr -n Planeto-Starter-Pack -r ../
+
+ echo "<header>"
+ echo " <h1>Planeto Starter Pack</h1>"
+ echo "</header>"
+ echo "<div class=\"news\">"
+ echo " <p><b>Planeto Starter Pack $2</b></p>"
+ echo " <ul>"
+ echo " <li><a href=\"downloads/htrdr-Planeto-Starter-Pack-$2.tar.gz\">tarball</a> /"
+ echo " <a href=\"downloads/htrdr-Planeto-Starter-Pack-$2.tar.gz.sig\">pgp</a></li>"
+ echo " </ul>"
+ echo "</div>"
+
+ echo "${intro}"
+
+ echo "<h2>Content</h2>"
+
+ echo "<h3>Titan</h3>"
+ echo "${titan}"
+
+ echo "<h3>Random01</h3>"
+ echo "<div class=\"img\" style=\"width: 17em\">"
+ echo " <a href=\"random01_visible.jpg\">"
+ echo " <img src=\"random01_visible.jpg\" alt=\"random01_visible\">"
+ echo " </a>"
+ echo " <a href=\"random01_LW_10-12um.jpg\">"
+ echo " <img src=\"random01_LW_10-12um.jpg\" alt=\"random01_LW_10-12um\">"
+ echo " </a>"
+ echo " <div class=\"caption\">"
+ echo " Images rendered by <a"
+ echo " href=\"man/man1/htrdr-planeto.1.html\">htrdr-planeto</a> from the random01"
+ echo " dataset. These renderings make possible to test the capabilities of"
+ echo " htrdr-planeto in terms of CPU computation time (both for the pre-processing"
+ echo " phase and the actual radiative transfer computation) and memory management."
+ echo " The infrared image is a map of brightness temperature, in Kelvins. Cold"
+ echo " zones (in altitude) or highly reflective (= weakly emitting) zones are made"
+ echo " visible because of their lower specific intensity."
+ echo " </div>"
+ echo "</div>"
+
+ echo "${random01}"
+
+ echo "<h3><code style=\"color: black\">sun_intensity_lite.bin</code></h3>"
+ echo "${sun_intensity_lite}"
+
+ echo "${copying}"
+
+ print_footer
+}
+
"$@"
diff --git a/htrdr/random01_LW_10-12um.jpg b/htrdr/random01_LW_10-12um.jpg
@@ -0,0 +1 @@
+#$# git-wad 81c90ea5d47ce53b46044199a999b74c6a5ba67e0014c2a73f0298ffb6581e7c 674615
+\ No newline at end of file
diff --git a/htrdr/random01_visible.jpg b/htrdr/random01_visible.jpg
@@ -0,0 +1 @@
+#$# git-wad 76636671f850b9b5504c8eecb48c95529bdd032c7b55012c2483426207bd6f19 556671
+\ No newline at end of file
