Skip to content

Commit

Permalink
Merge pull request #4 from openalea-incubator/paper_JXBot_2020
Browse files Browse the repository at this point in the history
Tag for paper JXB
  • Loading branch information
rbarillot authored Apr 21, 2020
2 parents 0051735 + 9066e5c commit ff7dcbc
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cn-wheat
Submodule cn-wheat updated 99 files
+1 −0 cnwheat/__init__.py
+7 −5 cnwheat/converter.py
+444 −543 cnwheat/model.py
+14 −22 cnwheat/parameters.py
+91 −84 cnwheat/postprocessing.py
+256 −260 cnwheat/simulation.py
+12 −14 cnwheat/tools.py
+65 −62 doc/conf.py
+ doc/image/architecture.png
+ doc/image/botanical_description.jpeg
+ doc/image/dependencies.png
+ doc/image/example.png
+ doc/image/population.png
+ doc/image/run.png
+2 −0 doc/readme_link.rst
+0 −678 doc/user.rst
+0 −0 example/graphs/.gitignore
+0 −0 example/inputs/elements_inputs.csv
+0 −0 example/inputs/hiddenzones_inputs.csv
+0 −4,718 example/inputs/meteo_Ljutovac2002.csv
+0 −3 example/inputs/organs_initial_state.csv
+3 −0 example/inputs/organs_inputs.csv
+0 −0 example/inputs/photosynthesis_elements_data.csv
+0 −0 example/inputs/senescence_elements_data.csv
+0 −0 example/inputs/senescence_roots_data.csv
+0 −0 example/inputs/soils_inputs.csv
+8 −8 example/logging.json
+0 −0 example/logs/.gitignore
+191 −240 example/main.py
+0 −0 example/postprocessing/.gitignore
+2 −3 setup.py
+0 −4 test/graphs_generation/postprocessing/axes_postprocessing.csv
+0 −22 test/graphs_generation/postprocessing/elements_postprocessing.csv
+0 −10 test/graphs_generation/postprocessing/hiddenzones_postprocessing.csv
+0 −10 test/graphs_generation/postprocessing/organs_postprocessing.csv
+0 −4 test/graphs_generation/postprocessing/soils_postprocessing.csv
+8 −8 test/inputs/elements_inputs.csv
+0 −0 test/inputs/hiddenzones_inputs.csv
+4 −0 test/inputs/organs_inputs.csv
+0 −0 test/inputs/photosynthesis_elements_data.csv
+0 −0 test/inputs/senescence_elements_data.csv
+0 −0 test/inputs/senescence_roots_data.csv
+0 −0 test/inputs/soils_inputs.csv
+50 −0 test/outputs/desired_axes_outputs.csv
+344 −0 test/outputs/desired_elements_outputs.csv
+148 −0 test/outputs/desired_hiddenzones_outputs.csv
+148 −0 test/outputs/desired_organs_outputs.csv
+50 −0 test/outputs/desired_soils_outputs.csv
+0 −50 test/postprocessing/outputs/axes_outputs.csv
+0 −344 test/postprocessing/outputs/elements_outputs.csv
+0 −148 test/postprocessing/outputs/hiddenzones_outputs.csv
+0 −148 test/postprocessing/outputs/organs_outputs.csv
+0 −50 test/postprocessing/outputs/soils_outputs.csv
+0 −4 test/postprocessing/postprocessing/desired_axes_postprocessing.csv
+0 −22 test/postprocessing/postprocessing/desired_elements_postprocessing.csv
+0 −10 test/postprocessing/postprocessing/desired_hiddenzones_postprocessing.csv
+0 −10 test/postprocessing/postprocessing/desired_organs_postprocessing.csv
+0 −4 test/postprocessing/postprocessing/desired_soils_postprocessing.csv
+0 −8 test/simulation_logging/inputs/elements_initial_state.csv
+0 −344 test/simulation_logging/inputs/elements_photosynthesis_forcings.csv
+0 −344 test/simulation_logging/inputs/elements_senescence_forcings.csv
+0 −4 test/simulation_logging/inputs/hiddenzones_initial_state.csv
+0 −4 test/simulation_logging/inputs/organs_initial_state.csv
+0 −50 test/simulation_logging/inputs/roots_senescence_forcings.csv
+0 −2 test/simulation_logging/inputs/soils_initial_state.csv
+0 −254 test/simulation_logging/logging.json
+0 −3,059 test/simulation_logging/logs/desired_axes_compartments.csv
+0 −3,059 test/simulation_logging/logs/desired_axes_derivatives.csv
+0 −21,407 test/simulation_logging/logs/desired_elements_compartments.csv
+0 −21,407 test/simulation_logging/logs/desired_elements_derivatives.csv
+0 −9,175 test/simulation_logging/logs/desired_hiddenzones_compartments.csv
+0 −9,175 test/simulation_logging/logs/desired_hiddenzones_derivatives.csv
+0 −9,175 test/simulation_logging/logs/desired_organs_compartments.csv
+0 −9,175 test/simulation_logging/logs/desired_organs_derivatives.csv
+0 −4,483 test/simulation_logging/logs/desired_phytomers_compartments.csv
+0 −4,483 test/simulation_logging/logs/desired_phytomers_derivatives.csv
+0 −748 test/simulation_logging/logs/desired_plants_compartments.csv
+0 −748 test/simulation_logging/logs/desired_plants_derivatives.csv
+0 −3,059 test/simulation_logging/logs/desired_soils_compartments.csv
+0 −3,059 test/simulation_logging/logs/desired_soils_derivatives.csv
+0 −4 test/simulation_run/inputs/organs_initial_state.csv
+0 −50 test/simulation_run/outputs/desired_axes_outputs.csv
+0 −344 test/simulation_run/outputs/desired_elements_outputs.csv
+0 −148 test/simulation_run/outputs/desired_hiddenzones_outputs.csv
+0 −148 test/simulation_run/outputs/desired_organs_outputs.csv
+0 −50 test/simulation_run/outputs/desired_soils_outputs.csv
+0 −8 test/simulation_run_with_interpolation/inputs/elements_initial_state.csv
+0 −344 test/simulation_run_with_interpolation/inputs/elements_photosynthesis_forcings.csv
+0 −344 test/simulation_run_with_interpolation/inputs/elements_senescence_forcings.csv
+0 −4 test/simulation_run_with_interpolation/inputs/hiddenzones_initial_state.csv
+0 −4 test/simulation_run_with_interpolation/inputs/organs_initial_state.csv
+0 −50 test/simulation_run_with_interpolation/inputs/roots_senescence_forcings.csv
+0 −2 test/simulation_run_with_interpolation/inputs/soils_initial_state.csv
+0 −7 test/simulation_run_with_interpolation/outputs/desired_axes_outputs.csv
+0 −43 test/simulation_run_with_interpolation/outputs/desired_elements_outputs.csv
+0 −19 test/simulation_run_with_interpolation/outputs/desired_hiddenzones_outputs.csv
+0 −19 test/simulation_run_with_interpolation/outputs/desired_organs_outputs.csv
+0 −7 test/simulation_run_with_interpolation/outputs/desired_soils_outputs.csv
+91 −538 test/test_cnwheat.py
2 changes: 1 addition & 1 deletion fspm-wheat
Submodule fspm-wheat updated 152 files
2 changes: 1 addition & 1 deletion respi-wheat

0 comments on commit ff7dcbc

Please sign in to comment.