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
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ Full documentation of each submodule is available at https://cnwgrass.readthedoc
## Prerequisites
*CNW-Grass* has the following dependencies, which are automatically installed (see [Installing](#installing)):

* [openalea.MTG](https://github.com/openalea/mtg)
* [openalea.Plantgl](https://github.com/openalea/plantgl)
* [openalea.Lpy](https://github.com/openalea/lpy)
* [openalea.Caribu](https://github.com/openalea/caribu)
* [openalea.Adel](https://github.com/openalea/adel)
* [openalea.Astk](https://github.com/openalea/astk)
* [openalea.MTG](https://github.com/openalea/mtg)
* [openalea.Plantgl](https://github.com/openalea/plantgl)
* [openalea.Lpy](https://github.com/openalea/lpy)
* [openalea.Caribu](https://github.com/openalea/caribu)
* [openalea.Adel](https://github.com/openalea/adel)
* [openalea.Astk](https://github.com/openalea/astk)

## Installing
For general information about OpenAlea installation, see https://openalea.readthedocs.io/en/latest/install.html
Expand Down
2 changes: 2 additions & 0 deletions example/NEMA/NEMA_H0/inputs/cnmetabolism/SAM_inputs.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
plant,axis,status,nb_leaves,GA,height,SAM_temperature,delta_teq,delta_teq_roots,teq_since_primordium,sum_TT,cohort,mstruct
1,MS,reproductive,12,True,120,20,3600,3600,0,0,1,2.074
502 changes: 0 additions & 502 deletions example/NEMA/NEMA_H0/main.py

This file was deleted.

2 changes: 2 additions & 0 deletions example/NEMA/NEMA_H15/inputs/cnmetabolism/SAM_inputs.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
plant,axis,status,nb_leaves,GA,height,SAM_temperature,delta_teq,delta_teq_roots,teq_since_primordium,sum_TT,cohort,mstruct
1,MS,reproductive,12,True,120,20,3600,3600,0,0,1,2.074
503 changes: 0 additions & 503 deletions example/NEMA/NEMA_H15/main.py

This file was deleted.

2 changes: 2 additions & 0 deletions example/NEMA/NEMA_H3/inputs/cnmetabolism/SAM_inputs.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
plant,axis,status,nb_leaves,GA,height,SAM_temperature,delta_teq,delta_teq_roots,teq_since_primordium,sum_TT,cohort,mstruct
1,MS,reproductive,12,True,120,20,3600,3600,0,0,1,2.074
500 changes: 0 additions & 500 deletions example/NEMA/NEMA_H3/main.py

This file was deleted.

4 changes: 3 additions & 1 deletion src/openalea/cnwgrass/integration/build_outputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,13 @@ def _read_outputs_on_MTG(self):
# Axis scale
for mtg_axis_vid in self._shared_mtg.components_iter(mtg_plant_vid):
mtg_axis_label = self._shared_mtg.label(mtg_axis_vid)
if isinstance(mtg_axis_label, bytes):
mtg_axis_label = mtg_axis_label.decode('utf-8')
mtg_axis_properties = self._shared_mtg.get_vertex_property(mtg_axis_vid)
axis_id = (mtg_plant_index, mtg_axis_label)
axis_dict = {}

if mtg_axis_properties.get('nb_leaves') is None:
if '.' in mtg_axis_label: # todo: temporary, used to filter secondary tillers
continue
for axis_run_variable in AXES_VARIABLES:
if axis_run_variable in mtg_axis_properties:
Expand Down
Loading