Skip to content

Commit 4cb2473

Browse files
committed
updated the doc's format and content
1 parent ab80f9d commit 4cb2473

15 files changed

+27
-54
lines changed

AUTHORS.rst

+1-9
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,8 @@ Credits
44
Development Lead
55
----------------
66

7-
.. {# pkglts, doc
8-
97
* Rami Albasha, <[email protected]>
10-
* Christian Fournier, <christian.fournier@inra.fr>
8+
* Christian Fournier, <christian.fournier@inrae.fr>
119
* Christophe Pradal, <[email protected]>
1210
* Eric Lebon
1311

14-
.. #}
15-
16-
Contributors
17-
------------
18-
19-
None yet. Why not be the first?

HISTORY.rst

+10-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
History
44
=======
55

6-
creation (TODAY)
7-
------------------------
6+
creation
7+
--------
88

9-
* First release on PyPI.
9+
HydroShoot was created by Rami ALBASHA during his postdoctoral research (July 2015 to December 2016)
10+
under the supervision of Eric LEBON†, in close collaboration with Christian FOURNIER and Christophe PRADAL.
11+
12+
The model is partly based on prior developments led by Gaëtan LOUARN and Jorge PRIETO who developed the FSPM TOPVINE
13+
(`Louarn et al., 2008 <https://academic.oup.com/aob/article/101/8/1167/159779>`_,
14+
`Prieto et al., 2012 <https://onlinelibrary.wiley.com/doi/10.1111/j.1365-3040.2012.02491.x>`_).
15+
The main difference between TOPVINE and HydroShoot is that the latter simulates explicitly the hydraulic network of the
16+
shoot, which is coupled to both energy and gas exchange processes.

doc/conf.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919

2020
# -- Project information -----------------------------------------------------
21+
import sphinx_rtd_theme
2122

2223
project = u'HydroShoot'
2324
copyright = u'2019, Rami Albasha'
@@ -45,6 +46,7 @@
4546
'sphinx.ext.ifconfig',
4647
'sphinx.ext.viewcode',
4748
'sphinx.ext.githubpages',
49+
'sphinx_rtd_theme'
4850
]
4951

5052
# Add any paths that contain templates here, relative to this directory.
@@ -82,7 +84,7 @@
8284
# The theme to use for HTML and HTML Help pages. See the documentation for
8385
# a list of builtin themes.
8486
#
85-
html_theme = 'alabaster'
87+
html_theme = "sphinx_rtd_theme"
8688

8789
# Theme options are theme-specific and customize the look and feel of a theme
8890
# further. For a list of options available for each theme, see the

doc/ecophysio_solver.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Processes interactions
44

55
Interactions among the physiological processes occur.
66

7-
.. figure:: figs/ecophysio_solver.svg
7+
.. figure:: figs/ecophysio_solver_1.svg
88
:align: center
99

1010
Solving the interactions between leaf's water potential, transpiration rate and temperature !
@@ -36,7 +36,7 @@ the hydraulic, energy and gas-exchange processes is handled in HydroShoot.
3636

3737
.. _fig_2:
3838

39-
.. figure:: figs/fig_2_ecophysio_solver.png
39+
.. figure:: figs/ecophysio_solver_2.png
4040

4141
Schematic representation of the numerical resolution of HydroShoot. Meteorological inputs that are common
4242
to all leaves are air temperature (:math:`T_{air}, \ K`), air relative humidity (:math:`RH, \ -`), air

doc/energy.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ This refers to the method used to calculate the lumped sky and soil form factors
8080

8181
In order to reduce calculation costs, :math:`k_{sky}` and :math:`k_{soil}`) are obtained by flip flopping the canopy:
8282

83-
.. figure:: figs/energy_pirouete_cacahute.png
83+
.. figure:: figs/energy_3.png
8484
:align: center
8585

8686
At first, the canopy is turned downwards. A unit irradiance is emitted from each sky sector and irradiance that is
File renamed without changes.
File renamed without changes.
File renamed without changes.

doc/figs/fig_1_ecophysio_solver.jpeg

-36.5 KB
Binary file not shown.

doc/figs/fig_1_energy.png

-18.2 KB
Binary file not shown.

doc/figs/fig_1_exchange.png

-10.2 KB
Binary file not shown.

doc/figs/fig_1_hydraulic.png

-197 KB
Binary file not shown.

doc/index.rst

+7-5
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ Welcome to HydroShoot's documentation!
1717

1818

1919

20-
Indices and tables
21-
==================
20+
Further reading
21+
===============
2222

23-
* :ref:`genindex`
24-
* :ref:`modindex`
25-
* :ref:`search`
23+
.. toctree::
24+
25+
authors
26+
history
27+
contributing

doc/model_description.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
Model description
33
=================
44

5-
All information in this section are taken from HydroShoot's paper **(`Albasha et al., 2019 <https://doi.org/10.1093/insilicoplants/diz007>`_)**. Please refer to the this
6-
paper for a thorough description of model's formulae and evaluation.
5+
All information in this section are taken from HydroShoot's paper
6+
(`Albasha et al., 2019 <https://doi.org/10.1093/insilicoplants/diz007>`_).
7+
Please refer to the this paper for a detailed description of model's formulae and evaluation.
78

89

910
.. toctree::

doc/readme.rst

-31
This file was deleted.

0 commit comments

Comments
 (0)