commit 3e1af7b88bb9fc96df338ac766fcafad3d3cee8e
parent 442169d553a6c4da484b44c049d1c7bf2053de41
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 27 Oct 2017 17:12:05 +0200
Little adjustments
Diffstat:
7 files changed, 61 insertions(+), 221 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+schiff.html
+index.html
about.html
pgp_signatures.html
release_notes.html.in
diff --git a/about.html.in b/about.html.in
@@ -1,42 +0,0 @@
-<header>
- <!--h1>About</h1-->
-</header>
-
-<div style=
- "float: left;
- font-variant: small-caps;
- padding: 1.5em 2.5em 1.5em 1.5em;
- margin: 0;
- text-align: center;
- color: #777"
->
- <h1 style="color: #000; padding-top: 0.5em; margin: 0">|Méso|Star></h1>
- Understanding complex systems
-</div>
-
-<p>|Méso|Star> develops softwares that simulate <b>complex systems</b>, i.e.
-systems dealing with complex data sets and high phenomenological complexity
-(infinite dimension, non linearities, coupled phenomenons, <i>etc.</i>).</p>
-
-<p>The proposed solvers are developed with the <b>physical laboratories</b>
-behind the theorical tools that they implement. Both physicians and computer
-scientists worked on and with the developped codes. They are also the ones
-doing the technical and scientific support and documentation. When you need
-help, you talk to the right person.</p>
-
-<p>Following the "do one things, and do it well" paradigm, each solver is
-<b>custom-made</b> for its specific purpose only: they expose a straight
-interface to their core functionnalities, perform the computation to which they
-were designed and that's all. They presume nothing about the creation of the
-input data or the treatment of the provided results. This makes the softwares
-not only simple and powerful but also well suited to be <b>extended</b> and
-<b>integrated</b> into any particular workflow.</p>
-
-<p>Our softwares are <b>free softwares</b> released under copyleft
-licences. You are welcome to study, modify extend or redistrubute them under
-certain conditions. Refer to their associated licence for details.</p>
-
-<p>This site lists some of our projets. You can find all about them onto their
-associated web pages and since they are publically available you can download
-and try them easily. If you have questions or want more support, please contact
-us.</p>
diff --git a/home.html.in b/home.html.in
@@ -0,0 +1,45 @@
+<header>
+ <!--h1>Home</h1-->
+</header>
+
+<div style=
+ "float: left;
+ font-variant: small-caps;
+ padding: 1.5em 2.5em 1.5em 1.5em;
+ margin: 0;
+ text-align: center;
+ color: #777"
+>
+ <h1 style="color: #000; padding-top: 0.5em; margin: 0">|Méso|Star></h1>
+ Understanding complex systems
+</div>
+
+<p>At <a href=https://www.meso-star.com/>|Méso|Star></a> we develop
+softwares that simulate <b>complex systems</b>, i.e. systems dealing with
+complex data sets and high phenomenological complexity (infinite dimension, non
+linearities, coupled phenomenons, <i>etc.</i>).</p>
+
+<p>The proposed solvers are developed with the <b>physical laboratories</b>
+behind the theorical tools that they implement. Both physicians and computer
+scientists worked on and with the developped codes. They are also the ones
+doing the technical and scientific support and documentation. When you need
+help, you talk to the right person.</p>
+
+<p>Following the "do one things, and do it well" paradigm, each solver is
+<b>custom-made</b> for its specific purpose only: they expose a straight
+interface to their core functionnalities, perform the computation to which they
+were designed and that's all. They presume nothing about the creation of the
+input data or the treatment of the provided results. This makes the softwares
+not only simple and powerful but also well suited to be <b>extended</b> and
+<b>integrated</b> into any particular workflow.</p>
+
+<p>Our softwares are <b>free softwares</b> released under <a
+href=https://en.wikipedia.org/wiki/Copyleft>copyleft</a> licences. You can freely
+study, modify or extend them. You are also welcome to redistrubute them under
+certain conditions. Refer to their associated licence for details.</p>
+
+<p>This site lists some of our projets. You can find all about them onto their
+associated web pages and since they are <b>publically available</b> you can
+download and try them easily. If you have questions or want more support,
+please <a href="mailto:contact@meso-star.com">contact us</a>.</p>
+
diff --git a/meso-menu.sh b/meso-menu.sh
@@ -119,6 +119,7 @@ print_header() {
local section=$1
local name=${2#man-}
local root=$([[ "$2" != "$name" ]] && echo "../../" || echo "")
+ local title=$3
echo '<!DOCTYPE html>'
echo ''
@@ -126,16 +127,16 @@ print_header() {
echo '<head>'
echo ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
echo ' <meta name="viewport" content="width=device-width, initial-scale=1">'
- echo ' <title>Solstice</title>'
+ echo " <title>|M|S> $section</title>"
echo " <link rel=\"stylesheet\" title=\"default\" href=\"${root}meso.css\">"
echo '</head>'
echo ''
echo '<body>'
echo '<div id="menu">'
- if [ "$section" == "About" ]; then
- echo ' <h2 id=cur>About</h2>'
+ if [ "$section" == "Home" ]; then
+ echo ' <h2 id=cur>Home</h2>'
else
- echo " <h2><a href=${root}about.html>About</a></h2>"
+ echo " <h2><a href=${root}index.html>Home</a></h2>"
fi
if [ "$section" == "Schiff" ]; then
echo ' <h2 id=cur>Schiff</h2>'
diff --git a/meso.css b/meso.css
@@ -55,6 +55,11 @@ pre.code a {
margin: 0;
}
+hr {
+ border: 0;
+ border-bottom: 1px solid #aaaaaa;
+}
+
/*******************************************************************************
* Navigation bar
******************************************************************************/
diff --git a/misc.sh b/misc.sh
@@ -20,12 +20,12 @@ set -e
source ./meso-menu.sh
tput bold; echo ">>> Miscellaneous web pages"; tput sgr0
-echo "Write about.html"
+echo "Write index.html"
{
- print_header About dummy
- cat about.html.in
+ print_header Home dummy
+ cat home.html.in
print_footer
-} > about.html
+} > index.html
echo "Write pgp_signatures.html"
{
diff --git a/schiff.html b/schiff.html
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-
-<html lang=en>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Solstice</title>
- <link rel="stylesheet" title="default" href="meso.css">
-</head>
-
-<body>
-<div id="menu">
- <h2><a href=about.html>About</a></h2>
- <h2 id=cur>Schiff</h2>
- <div id=sub-menu>
- <ul>
- <li id=cur>Overview</li>
- <li>Reference documentation</li>
- </ul>
- <ul id=lvl2>
- <li><a href="man/man1/schiff.1.html">schiff</a></li>
- <li><a href="man/man5/schiff-geometry.5.html">schiff-geometry</a></li>
- <li><a href="man/man5/schiff-output.5.html">schiff-output</a></li>
- </ul>
- <ul>
- <li><a href=https://gitlab.com/meso-star/schiff>Source code repository</a></li>
- </ul>
- <div id="info">
- <p>Schiff is developped by <a
- href="https://www.meso-star.com">|Méso|Star></a> for the
- National Center for Scientific Research. It is copyright ©
- <a href="http://www.cnrs.fr/index.php">CNRS</a> 2016-2017.</p>
- </div>
- </div>
- <h2><a href=solstice.html>Solstice</a></h2>
- <h2><a href=pgp_signatures.html>PGP signatures</a></h2>
-</div>
-<div id=content>
-<header>
- <h1>Schiff - Radiative properties of soft particles</h1>
-</header>
-
-<div id="news">
- <p><b>Download Schiff 0.3.0</b></p>
- <ul>
- <li>GNU/Linux:
- <a href="downloads/Schiff-0.3.0-GNU-Linux64.tar.gz">tarball</a> /
- <a href="downloads/Schiff-0.3.0-GNU-Linux64.tar.gz.sig">pgp</a></li>
- <li>Sources:
- <a href="downloads/Schiff-0.3.0-Source.tar.gz">tarball</a> /
- <a href="downloads/Schiff-0.3.0-Source.tar.gz.sig">pgp</a></li>
- </ul>
-</div>
-
-<p>The Schiff program computes the <b>radiative properties</b> of soft
-particles. It uses the <b>Monte-Carlo</b> method to solve Maxwell's equations
-within the <a
-href="https://journals.aps.org/pr/abstract/10.1103/PhysRev.104.1481">L Schiff's
-approximation</a> as presented in <a
-href="http://www.sciencedirect.com/science/article/pii/S0022407315003283">Charon
-et al. 2015</a>.The main advantages of using Monte-Carlo are: the possibility
-to address <b>any shape</b> of particle, and the results are provided with a
-<b>numerical accuracy</b>.</p>
-
-<p>For a mixture of soft particles, Schiff estimates the total
-<b>cross-sections</b> (absorption, scattering and extinction cross-sections) in
-addition of the <b>phase function</b>, its cumulative and its inverse
-cumulative.</p>
-
-<p>The set of particles to simulate is defined by its <b>refractive index</b> -
-provided at various wavelengths - and a <b>geometry distribution</b> that
-controls how the particles look like into the mixture. More precisely, this
-distribution describes the main shapes of the particles (sphere, cylinder,
-helical pipe, <i>etc.</i>) and their statistical variation according to the
-distribution of their parameters (gaussian, lognormal, <i>etc.</i>).</p>
-
-<p>Schiff is available on GNU/Linux 64-bits. It is a free software release
-under the GPLv3+ license. You are welcome to redistribute it under certain
-conditions; refer to the <a
-href="https://www.gnu.org/licenses/gpl.html">license</a> for details.</p>
-
-<h2>A straight interface</h2>
-
-<div id="img" style="width: 16em">
- <a href="particles.png">
- <img src="particles.png" style="float: relative" alt="Particles">
- </a>
- <div id="caption">
- Examples of particle shapes handled by Schiff.
- </div>
-</div>
-
-<p>The Schiff program is a <b>command-line tool</b> that processes input data,
-performs computations, write results and that's all. It makes no assumptions on
-how the input data are created excepted that it has to follow the expected file
-formats. The simulation results are also provided as is, in a raw ASCII
-format.</p>
-
-<p>This thin interface is particularly
-well suited to be <b>extended</b> and <b>integrated into any toolchain</b>.
-According to the user needs, the optical properties of the particles can be
-entered manually or generated by an external program. In the same way, the
-output data can either directly interpreted or post-processed by any script
-with respect to the targeted toolchain.</p>
-
-<h2>Quick start</h2>
-
-<p>Download the desired archive of Schiff and verify its integrity against its
-<a href=pgp_signatures.html>PGP signature</a>. Then extract it. Finally source the
-provided <code>schiff.profile</code> file to register the Schiff installation
-for the current shell priorly to the invocation of the <code>schiff</code>
-program.</p>
-
-<pre class="code">
-$ source ~/Schiff-0.3.0-GNU-Linux64/etc/schiff.profile
-$ solstice -h
-</pre>
-
-<p>The Solstice <b>reference documentation</b> is provided trough man pages.
-Use the <code>man</code> command-line to consult it.</p>
-
-<pre class="code">
-$ man schiff
-$ man schiff-geometry
-$ man schiff-output
-</pre>
-
-<h2>Post-Process</h2>
-
-<p>The following Bash script illustrates how to post-process the Schiff
-results. It is an example, provided as is, without additional support.
-According to your needs, you can study, modify, extend or redistribute it
-freely.</p>
-
-<table>
- <tr><th>Pretty results</th></tr>
- <tr><td>[<a href='downloads/schiff_pretty_results.sh'>Bash script</a>]</td></tr>
-</table>
-
-<p>This script reads an output file generated by the <code>schiff</code>
-command line and split its raw ASCII results in several human readable text
-files in order to simplify their analysis.</p>
-
-<pre class="code">
-$ schiff -i geom-distrib.yaml -l 2.3 -w0.5:0.6 -o output properties
-$ bash ./schiff_pretty_results.sh output
-Write xsections.txt
-Write descs.txt
-Write func_0.5.txt
-Write func_0.6.txt
-Write cumul_0.5.txt
-Write cumul_0.6.txt
-Write invcumul_0.5.txt
-Write invcumul_0.6.txt
-</pre>
-
-The first generated files, named
-<code>xsections.txt</code>, lists for each wavelength submitted with the
-<code>-w</code> option, its associated absorption, extinction and scattering
-cross sections. The second file, <code>descs.txt</code>, gives overall
-informations for each simulated wavelengths, like the limit scattering angles
-from which its phase function was analytically computed. Then for each
-wavelengths, the script generates 3 files named
-<code>func_<WLEN>.txt</code>,
-<code>cumul_<WLEN>.txt</code>, and
-<code>invcumul_<WLEN>.txt</code> that store for the wavelength
-<code><WLEN></code>, the value of its associated phase function as
-well as its cumulative and its inverse cumulative, respectively.</p>
-
-</div>
-</body>
