commit b23f92eaa125976d4c238995bcc0165093989838
parent 23ae64531a056875641f4ad7a24ade1dee80f1c5
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 6 Nov 2024 14:11:52 +0100
htrdr: release version 0.11
Release of starter pack 0.1.0 for htrdr-planets, which manages the
renaming of the planeto subcommand to planets. Update Page content to
reflect this name change: planeto is too "Frenchy" and has therefore
been translated into "planetroy science".
Diffstat:
6 files changed, 60 insertions(+), 55 deletions(-)
diff --git a/htrdr/.gitignore b/htrdr/.gitignore
@@ -5,4 +5,5 @@ htrdr-atmosphere-spk.html
htrdr-combustion-spk.html
htrdr-planeto-spk.html
htrdr-*-GNU-Linux64/
+htrdr_*_doc/
htrdr-*-Starter-Pack-*/
diff --git a/htrdr/Makefile b/htrdr/Makefile
@@ -16,8 +16,8 @@
include ../config.mk
-HTRDR_VERSION=0.10
-HTRDR_DIR=htrdr-$(HTRDR_VERSION)-GNU-Linux64
+HTRDR_VERSION=0.11
+HTRDR_DIR=htrdr_$(HTRDR_VERSION)_doc
HTRDR_ARCH=downloads/$(HTRDR_DIR).tar.gz
HTRDR_README=$(HTRDR_DIR)/share/doc/htrdr/README.md
@@ -46,27 +46,27 @@ COMSPK_PKG=\
downloads/htrdr-Combustion-Starter-Pack-0.0.0.tar.gz
COMSPK_SIG=$(COMSPK_PKG:=.sig)
-PLANETOSPK_VERSION=0.0.1
-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)
+PLANETSSPK_VERSION=0.1.0
+PLANETSSPK_DIR=htrdr-Planets-Starter-Pack-$(PLANETSSPK_VERSION)
+PLANETSSPK_ARCH=downloads/$(PLANETSSPK_DIR).tar.gz
+PLANETSSPK_README=$(PLANETSSPK_DIR)/README.md.in
+#PLANETSSPK_PKG=\
+# downloads/htrdr-Planets-Starter-Pack-0.0.0.tar.gz
+#PLANETSSPK_SIG=$(PLANETSSPK_PKG:=.sig)
-# Make the planeto starter-pack private. The prefix is actually the sha256
+# Make the planets starter-pack private. The prefix is actually the sha256
# digest of the public archive
-PLANETOSPK_PRIV_PREFIX=98190c985935c7677a43f15724e3212d100eb58da4afaa5efc87a0ffdfe2127a
-PLANETOSPK_PRIV_HTML=$(PLANETOSPK_PRIV_PREFIX).html
-PLANETOSPK_PRIV_ARCH=downloads/$(PLANETOSPK_PRIV_PREFIX).tar.gz
-PLANETOSPK_PRIV_SIG=$(PLANETOSPK_PRIV_ARCH:=.sig)
+PLANETSSPK_PRIV_PREFIX=98190c985935c7677a43f15724e3212d100eb58da4afaa5efc87a0ffdfe2127a
+PLANETSSPK_PRIV_HTML=$(PLANETSSPK_PRIV_PREFIX).html
+PLANETSSPK_PRIV_ARCH=downloads/$(PLANETSSPK_PRIV_PREFIX).tar.gz
+PLANETSSPK_PRIV_SIG=$(PLANETSSPK_PRIV_ARCH:=.sig)
MAN=\
$(HTRDR_DIR)/share/man/man1/htpp.1\
$(HTRDR_DIR)/share/man/man1/htrdr.1\
$(HTRDR_DIR)/share/man/man1/htrdr-atmosphere.1\
$(HTRDR_DIR)/share/man/man1/htrdr-combustion.1\
- $(HTRDR_DIR)/share/man/man1/htrdr-planeto.1\
+ $(HTRDR_DIR)/share/man/man1/htrdr-planets.1\
$(HTRDR_DIR)/share/man/man1/les2htcp.1\
$(HTRDR_DIR)/share/man/man5/atrri.5\
$(HTRDR_DIR)/share/man/man5/atrtp.5\
@@ -113,7 +113,7 @@ COMSPK_IMG=\
dummy_medium_clipped.jpg\
gulder_lateral.jpg
-PLANETOSPK_IMG=\
+PLANETSSPK_IMG=\
random01_visible.jpg\
random01_LW_10-12um.jpg
@@ -122,12 +122,12 @@ MODS_IMG=\
mods/Ebudget_Streetcanyon_Broadband.svg\
mods/MRT_map_icif_district_day.svg
-IMG=$(OVERVIEW_IMG) $(ATMSPK_IMG) $(COMSPK_IMG) $(PLANETOSPK_IMG) $(MODS_IMG)
+IMG=$(OVERVIEW_IMG) $(ATMSPK_IMG) $(COMSPK_IMG) $(PLANETSSPK_IMG) $(MODS_IMG)
HTML=\
htrdr.html\
htrdr-atmosphere-spk.html\
htrdr-combustion-spk.html\
- $(PLANETOSPK_PRIV_HTML)\
+ $(PLANETSSPK_PRIV_HTML)\
htrdr-docs.html\
htrdr-mods.html
@@ -148,10 +148,10 @@ distclean: clean
$(ATMSPK_README)\
$(COMSPK_SIG)\
$(COMSPK_README)\
- $(PLANETOSPK_SIG)\
- $(PLANETOSPK_README)\
- $(PLANETOSPK_PRIV_ARCH)\
- $(PLANETOSPK_PRIV_SIG)\
+ $(PLANETSSPK_SIG)\
+ $(PLANETSSPK_README)\
+ $(PLANETSSPK_PRIV_ARCH)\
+ $(PLANETSSPK_PRIV_SIG)\
$(HTRDR_README)\
$(MAN)
@@ -165,8 +165,8 @@ install: build
$(ATMSPK_SIG)\
$(COMSPK_PKG)\
$(COMSPK_SIG)\
- $(PLANETOSPK_PRIV_ARCH)\
- $(PLANETOSPK_PRIV_SIG)\
+ $(PLANETSSPK_PRIV_ARCH)\
+ $(PLANETSSPK_PRIV_SIG)\
$(PREFIX)/htrdr/
htrdr_build.sh: ../meso-menu.sh
@@ -226,24 +226,24 @@ $(COMSPK_README):
@tar -xz -f $(COMSPK_ARCH) $(COMSPK_README)
################################################################################
-# Planeto Starter-Pack
+# Planets Starter-Pack
################################################################################
-$(PLANETOSPK_PRIV_HTML):\
- $(PLANETOSPK_IMG) \
- $(PLANETOSPK_PRIV_SIG) \
- $(PLANETOSPK_README) \
+$(PLANETSSPK_PRIV_HTML):\
+ $(PLANETSSPK_IMG) \
+ $(PLANETSSPK_PRIV_SIG) \
+ $(PLANETSSPK_README) \
htrdr_build.sh
@echo "Building $@"
- @$(SHELL) htrdr_build.sh planetospk $(PLANETOSPK_README) $(PLANETOSPK_VERSION) \
- $(PLANETOSPK_PRIV_ARCH) > $@
+ @$(SHELL) htrdr_build.sh planetsspk $(PLANETSSPK_README) $(PLANETSSPK_VERSION) \
+ $(PLANETSSPK_PRIV_ARCH) > $@
-$(PLANETOSPK_PRIV_ARCH): $(PLANETOSPK_ARCH)
- @echo "Make $(PLANETOSPK_ARCH) private (copy to $(PLANETOSPK_PRIV_ARCH))"
- @cp $(PLANETOSPK_ARCH) $(PLANETOSPK_PRIV_ARCH)
+$(PLANETSSPK_PRIV_ARCH): $(PLANETSSPK_ARCH)
+ @echo "Make $(PLANETSSPK_ARCH) private (copy to $(PLANETSSPK_PRIV_ARCH))"
+ @cp $(PLANETSSPK_ARCH) $(PLANETSSPK_PRIV_ARCH)
-$(PLANETOSPK_README):
- @echo "Extracting data from $(PLANETOSPK_ARCH)"
- @tar -xz -f $(PLANETOSPK_ARCH) $(PLANETOSPK_README)
+$(PLANETSSPK_README):
+ @echo "Extracting data from $(PLANETSSPK_ARCH)"
+ @tar -xz -f $(PLANETSSPK_ARCH) $(PLANETSSPK_README)
################################################################################
# Mods
@@ -269,7 +269,7 @@ lint_shells:
.sig: Makefile ../configure_targets.sh
@echo "Setup .sig"
@$(SHELL) ../configure_targets.sh sig \
- $(ATMSPK_PKG) $(COMSPK_PKG) $(PLANETOSPK_PRIV_ARCH) > .sig
+ $(ATMSPK_PKG) $(COMSPK_PKG) $(PLANETSSPK_PRIV_ARCH) > .sig
.lint: Makefile ../configure_targets.sh
@echo "Setup .lint"
diff --git a/htrdr/downloads/htrdr-Planets-Starter-Pack-0.1.0.tar.gz b/htrdr/downloads/htrdr-Planets-Starter-Pack-0.1.0.tar.gz
@@ -0,0 +1 @@
+#$# git-wad 8322e0f1e8a0b93aa8236faf08c3ce05d6c06b17aeba375a79ab85b7b715cac5 142012323
+\ No newline at end of file
diff --git a/htrdr/downloads/htrdr_0.11_doc.tar.gz b/htrdr/downloads/htrdr_0.11_doc.tar.gz
@@ -0,0 +1 @@
+#$# git-wad 93d3bd64ab12c7296a345be325519279be0f5456977a1959d36e39f4edcff7c9 46522
+\ No newline at end of file
diff --git a/htrdr/htrdr.html.in b/htrdr/htrdr.html.in
@@ -78,13 +78,13 @@ interest, in their most common formats, in each scientific community.
</a>
<div class="caption">
Images of Titan rendered with <a
- href="man/man1/htrdr-planeto.1.html">htrdr-planeto</a>. Its 3D atmosphere
+ href="man/man1/htrdr-planets.1.html">htrdr-planets</a>. Its 3D atmosphere
is composed of a gas mixture and two aerosol modes for haze and clouds. In
the bottom image, the source is positioned behind Titan to simulate a
transit situation, i.e. a solar eclipse by Titan.
</div>
</div>
- <p><a href="man/man1/htrdr-planeto.1.html">Planetology</a>: takes into
+ <p><a href="man/man1/htrdr-planets.1.html">Planetary science</a>: takes into
account the geometry of a "ground" of arbitrary shape, described by a
triangular mesh, with the possibility of using an arbitrary number of
materials. The radiative properties of a gas mixture must be provided on a
@@ -108,7 +108,7 @@ radiance are used for computing various quantities:</p>
<li>
<p><b>Images</b> on a camera sensor, in a given field of view. For combustion
applications, only monochromatic images are supported. In atmospheres and in
- planetology, spectral integration is also possible, both for solar and thermal
+ planetary science, spectral integration is also possible, both for solar and thermal
images: CIE colorimetry is used for solar images, while thermal images are in
fact brightness temperature maps, obtained from the incoming radiative flux
over a specified spectral interval.</p>
@@ -213,15 +213,15 @@ research projects:</p>
was thus designed in order to ensure numerical convergence.</li>
<li>In project <a href="https://anr.fr/Projet-ANR-21-CE49-0020">Rad-Net</a>,
- <code>htrdr</code> was adapted for applications in <b>planetology</b> and
- <b>astrophysics</b>. The application is now a scene composed of an
+ <code>htrdr</code> was adapted for applications in <b>planetary science</b>
+ and <b>astrophysics</b>. The application is now a scene composed of an
<b>arbitrary number of solid surfaces</b> (a planet, satellites) represented
by triangular meshes and materials which describe their <b>spectral
- reflectivity/emissivity</b> properties. The <b>3D atmopshere</b> is defined
- by a number of participating semi-transparent media (a gas mixture and an
+ reflectivity/emissivity</b> properties. The <b>3D atmopshere</b> is defined by
+ a number of participating semi-transparent media (a gas mixture and an
arbitrary number of aerosol modes) whose radiative properties are provided at
the nodes of a <b>unstructured tetrahedral volumetric grid</b>, independant
- for each medium.</li>
+ for ach medium.</li>
</ul>
<h2>A straight interface</h2>
@@ -348,7 +348,7 @@ script to be run.</p>
<p>By default, the whole <code>htrdr</code> project is built but you may
prefer to deploy <code>htrdr</code> only for a specific application,
i.e. only for atmospheric radiative transfer, combustion processes or
-planetology. For example, to install only the atmospheric part of
+planetary science. For example, to install only the atmospheric part of
<code>htrdr</code>:</p>
<pre class="code">
@@ -357,7 +357,7 @@ planetology. For example, to install only the atmospheric part of
BUILD=src/htrdr_${VERSION}.sh \
ATMOSPHERE=ENABLE \
COMBUSTION=DISABLE \
- PLANETO=DISABLE
+ PLANETS=DISABLE
</pre>
<div class="img" style="width: 20em">
diff --git a/htrdr/htrdr_build.sh b/htrdr/htrdr_build.sh
@@ -312,10 +312,10 @@ comspk()
print_footer
}
-planetospk()
+planetsspk()
{
if [ $# -lt 3 ]; then
- printf "Usage: %s planetospk <readme> <version> <private-archive>\n" "$0" >&2
+ printf "Usage: %s planetsspk <readme> <version> <private-archive>\n" "$0" >&2
exit 1
fi
@@ -326,7 +326,7 @@ planetospk()
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>/')
+ | sed '0,/<code>htrdr-planets<\/code>/s//<a href=man\/man1\/htrdr-planets.1.html>htrdr-planets<\/a>/')
titan=$(echo "${readme}"\
| sed -n '/^<h3>Titan<\/h3>/,/^<h3>Random01<\/h3>/p'\
| sed -e '1d' -e '$d')
@@ -338,13 +338,13 @@ planetospk()
| sed -e '1d' -e '$d')
copying=$(echo "${readme}" | sed -n '/^<h2>Copyright notice<\/h2>/,$p')
- print_header -s htrdr -n Planeto-Starter-Pack -r ../
+ print_header -s htrdr -n Planets-Starter-Pack -r ../
echo "<header>"
- echo " <h1>Planeto Starter Pack</h1>"
+ echo " <h1>Planets Starter Pack</h1>"
echo "</header>"
echo "<div class=\"news\">"
- echo " <p><b>Planeto Starter Pack $2</b></p>"
+ echo " <p><b>Planets Starter Pack $2</b></p>"
echo " <ul>"
echo " <li><a href=\"$3\">tarball</a> /"
echo " <a href=\"$3.sig\">pgp</a></li>"
@@ -368,7 +368,7 @@ planetospk()
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 " href=\"man/man1/htrdr-planets.1.html\">htrdr-planets</a> from the random01"
echo " dataset. The infrared image (bottom) is a map of brightness temperature, in"
echo " Kelvins. Cold zones (in altitude) or highly reflective (i.e. weakly emitting)"
echo " zones are made visible because of their lower specific intensity."
