Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 2

build:
os: "ubuntu-lts-latest"
os: "ubuntu-24.04"
tools:
python: "miniconda3-3.12-24.9"

conda:
environment: doc/environment.yml
environment: conda/environment.yml

sphinx:
# Path to your Sphinx configuration file.
Expand Down
8 changes: 7 additions & 1 deletion conda/environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: hydroroot_dev
name: hydroshoot
channels:
- openalea3/label/dev
- openalea3/label/rc
Expand All @@ -9,6 +9,12 @@ dependencies:
- openalea.plantgl
- openalea.caribu
- openalea.astk
- numpy
- scipy
- sympy
- pandas
- jsonschema
- pvlib-python
- pip
- pip:
- -e .."[test,doc]"
10 changes: 7 additions & 3 deletions doc/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,10 @@ Let's build the mock-up using the digitalization data provided in "grapevine_pot
from openalea.mtg import traversal
from openalea.plantgl.all import Scene
from openalea.hydroshoot import architecture, display, model
from pathlib import Path

# Path for plant digitalization data.
g = architecture.vine_mtg('grapevine_pot.csv')
grapevine_mtg = architecture.vine_mtg('grapevine_pot.csv')

for v in traversal.iter_mtg2(grapevine_mtg, grapevine_mtg.root):
architecture.vine_phyto_modular(grapevine_mtg, v)
Expand All @@ -118,7 +119,7 @@ Display now the scene using **display** module, you should be having something l

.. code-block:: python

scene = display.visu(g, def_elmnt_color_dict=True, scene=Scene(),
scene = display.visu(grapevine_mtg, def_elmnt_color_dict=True, scene=Scene(),
view_result=True)


Expand All @@ -134,9 +135,12 @@ potential to a fixed value of -0.5 :math:`MPa`. Ensure first that the model will
start and end dates of the simulation in the "params.json" file ("sdate": "2012-08-01 11:00:00",
"edate": "2012-08-01 11:00:00").

Create a folder named 'output' and run the model.

.. code-block:: python

model.run(g, str(getcwd()) + '/', scene, psi_soil=-0.2, gdd_since_budbreak=100.)
model.run(grapevine_mtg, Path(str(getcwd()) + '/'), Path(str(getcwd()) + '/meteo.input'),
Scene = scene, psi_soil=-0.2, gdd_since_budbreak=100.)

You should now have created the '/output/' folder where output files ("time_series.ouput", "mtg20120801110000.pckl")
are stored. "time_series.ouput" file should contain close values to those below:
Expand Down
Loading