Skip to content

GitLab

Commit 4de53c84 authored by RemiM's avatar RemiM Committed by Ronan Trepos
Browse files

Add missing ports and change views names

parent 02ae45b8
Hide whitespace changes
Inline Side-by-side
sunflo/exp/sunflo_web_modified_TT.vpz
View file @ 4de53c84
......@@ -87,7 +87,7 @@
<port name="ISH3"/>&#xd;
</out>&#xd;
</model>&#xd;
<model observables="phenologie" conditions="itk,cBegin,CONFIG_SimuInit,CONFIG_Variete,phenologie,EXPERT_Plante,CONFIG_Plante,EXPERT_SimuInit" width="100" dynamics="Phenologie" height="105" x="252" y="22" name="phenologie" type="atomic">&#xd;
<model observables="phenologie" conditions="cBegin,CONFIG_Variete,EXPERT_SimuInit,CONFIG_SimuInit,itk,CONFIG_Plante,EXPERT_Plante,phenologie" width="100" dynamics="Phenologie" height="105" x="252" y="22" name="phenologie" type="atomic">&#xd;
<in>&#xd;
<port name="ActionRecolte"/>&#xd;
<port name="ActionSemis"/>&#xd;
......@@ -1444,32 +1444,7 @@
</set>&#xd;
</port>&#xd;
</condition>&#xd;
<condition name="itk">&#xd;
<port name="fertilization_1">&#xd;
<string>date=2006-04-10$dose=0</string>&#xd;
</port>&#xd;
<port name="irrigation_1">&#xd;
<double>0</double>&#xd;
</port>&#xd;
<port name="densite">&#xd;
<double>7.000000000000000</double>&#xd;
</port>&#xd;
<port name="jrecolte">&#xd;
<string>2006-10-01</string>&#xd;
</port>&#xd;
<port name="jsemis">&#xd;
<string>2006-04-16</string>&#xd;
</port>&#xd;
<port name="zSemis">&#xd;
<double>30.000000000000000</double>&#xd;
</port>&#xd;
<port name="fertilization_2">&#xd;
<double>0</double>&#xd;
</port>&#xd;
<port name="irrigation_2">&#xd;
<double>0</double>&#xd;
</port>&#xd;
</condition>&#xd;
&#xd;
<condition name="phenologie">&#xd;
&#xd;
&#xd;
......@@ -1520,6 +1495,54 @@
<string>2006-04-08</string>&#xd;
</port>&#xd;
</condition>&#xd;
<condition name="itk">
<port name="fertilization_1">
<string>date=2006-04-10$dose=0</string>
</port>
<port name="irrigation_1">
<double>0</double>
</port>
<port name="densite">
<double>7.000000000000000</double>
</port>
<port name="jrecolte">
<string>2006-10-01</string>
</port>
<port name="jsemis">
<string>2006-04-16</string>
</port>
<port name="zSemis">
<double>30.000000000000000</double>
</port>
<port name="irrigation_2">
<double>0</double>
</port>
<port name="fertilization_2">
<string>0</string>
</port>
<port name="irrigation_3">
<double>0</double>
</port>
<port name="irrigation_4">
<double>0</double>
</port>
<port name="irrigation_5">
<double>0</double>
</port>
<port name="irrigation_6">
<double>0</double>
</port>
<port name="irrigation_7">
<double>0</double>
</port>
<port name="irrigation_8">
<double>0</double>
</port>
<port name="irrigation_9">
<double>0</double>
</port>
</condition>
</conditions>&#xd;
<views>&#xd;
<outputs>&#xd;
......
sunflo/exp/sunflo_web_modified_TT_new_model.vpz
View file @ 4de53c84
......@@ -1209,7 +1209,10 @@
<double>20.000000000000000</double>&#xd;
</port>&#xd;
&#xd;
</condition>&#xd;
<port name="date_levee">
<double>-1</double>
</port>
</condition>&#xd;
<condition name="CONFIG_Sol">&#xd;
<port name="Fpf">&#xd;
<double>0.200000000000000</double>&#xd;
......@@ -1565,6 +1568,27 @@
<port name="irrigation_2">&#xd;
<double>0</double>&#xd;
</port>&#xd;
<port name="irrigation_3">
<double>0</double>
</port>
<port name="irrigation_4">
<double>0</double>
</port>
<port name="irrigation_5">
<double>0</double>
</port>
<port name="irrigation_6">
<double>0</double>
</port>
<port name="irrigation_7">
<double>0</double>
</port>
<port name="irrigation_8">
<double>0</double>
</port>
<port name="irrigation_9">
<double>0</double>
</port>
</condition>&#xd;
<condition name="phenologie">&#xd;
&#xd;
......@@ -1621,7 +1645,7 @@
<outputs>&#xd;
&#xd;
&#xd;
<output format="local" plugin="console" package="vle.output" location="" name="fixed">&#xd;
<output format="local" plugin="console" package="vle.output" location="" name="viewStatic">&#xd;
<map>&#xd;
<key name="inc_columns">&#xd;
<integer>10</integer>&#xd;
......@@ -1641,7 +1665,7 @@
</map>&#xd;
</output>&#xd;
&#xd;
<output format="local" plugin="storage" package="vle.output" name="timed" location="">&#xd;
<output format="local" plugin="storage" package="vle.output" name="viewDbg" location="">&#xd;
<map>
<key name="columns">
<integer>15</integer>
......@@ -1674,14 +1698,14 @@
<port name="Ea"/>&#xd;
&#xd;
<port name="FNIRUE">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="FNLE"/>&#xd;
&#xd;
<port name="INN">&#xd;
&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="INNI"/>&#xd;
......@@ -1695,7 +1719,7 @@
</port>&#xd;
&#xd;
<port name="Nabs">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="vAA"/>&#xd;
......@@ -1713,6 +1737,9 @@
<port name="N2">&#xd;
&#xd;
</port>&#xd;
<port name="TNp">
<attachedview name="viewDbg"/>
</port>
</observable>&#xd;
&#xd;
<observable name="contrainte_eau">&#xd;
......@@ -1721,22 +1748,22 @@
</port>&#xd;
&#xd;
<port name="ETRETM">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="FHLE"/>&#xd;
&#xd;
<port name="FHRUE">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="FHTR">&#xd;
&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="FTSW">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="STOCKC1"/>&#xd;
......@@ -1766,7 +1793,7 @@
<observable name="contrainte_temperature">&#xd;
<port name="FT">&#xd;
&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="FTHN">&#xd;
......@@ -1783,25 +1810,25 @@
<port name="DBP"/>&#xd;
&#xd;
<port name="Eb">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="Ebp"/>&#xd;
&#xd;
<port name="Ei">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="LAI">&#xd;
&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="SFp"/>&#xd;
&#xd;
<port name="TDM">&#xd;
&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
</observable>&#xd;
......@@ -1812,8 +1839,8 @@
<port name="TH"/>&#xd;
&#xd;
<port name="photo_TH_aFinMATURATION">&#xd;
<attachedview name="fixed"/>&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewStatic"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
</observable>&#xd;
......@@ -1830,8 +1857,8 @@
<port name="photo_IRs_aFinMATURATION"/>&#xd;
&#xd;
<port name="photo_RDT_aFinMATURATION">&#xd;
<attachedview name="fixed"/>&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewStatic"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="RDT">&#xd;
......@@ -1842,25 +1869,25 @@
&#xd;
<observable name="lecture_climat">&#xd;
<port name="Pluie">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="Tmax">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="current_date">&#xd;
&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
<port name="ETP">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
<port name="RAD">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
<port name="Tmin">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
</observable>&#xd;
......@@ -1870,7 +1897,7 @@
&#xd;
<port name="PhasePhenoPlante">&#xd;
&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
<port name="TT_F1">&#xd;
......@@ -1879,7 +1906,7 @@
&#xd;
<port name="TT_A2">&#xd;
&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
&#xd;
</observable>&#xd;
......@@ -1889,48 +1916,48 @@
&#xd;
<observable name="diagnostic">
<port name="D_MH">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="D_SE">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="SET_MH">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="MET_MH">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="D_EF">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="SET_EF">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="MET_EF">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="NHT28_EF">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="NHT28">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
<port name="SGR_FM">
<attachedview name="timed"/>
<attachedview name="viewDbg"/>
</port>
</observable>&#xd;
<observable name="temperature_efficace"/>&#xd;
<observable name="temperature_moyenne">&#xd;
<port name="Mean">&#xd;
<attachedview name="timed"/>&#xd;
<attachedview name="viewDbg"/>&#xd;
</port>&#xd;
</observable>&#xd;
</observables>&#xd;
&#xd;
&#xd;
<view enable="true" name="fixed" output="fixed" type="finish"/>&#xd;
<view enable="true" name="viewStatic" output="viewStatic" type="finish"/>&#xd;
&#xd;
<view timestep="1" name="timed" output="timed" type="timed"/>&#xd;
<view timestep="1" name="viewDbg" output="viewDbg" type="timed"/>&#xd;
</views>&#xd;
</experiment>&#xd;
</vle_project>
sunflo/metadata/exp/sunflo_web_modified_TT_new_model.vpm
View file @ 4de53c84
......@@ -3,13 +3,19 @@
<vle_project_metadata version="1.x" author="me">
<condPlugins/>
<outputGUIplugins>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="timed" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="View" GUIplugin="gvle.output/file"/>
<outputGUIplugin view="viewDbg" GUIplugin="gvle.output/storage"/>
<outputGUIplugin view="viewDbg" GUIplugin="gvle.output/storage"/>
</outputGUIplugins>
</vle_project_metadata>
sunflo/src/Diagnostic.cpp
View file @ 4de53c84
......@@ -174,8 +174,8 @@ public :
}
// calcul de MET_MH
MET_MH = SET_MH() / D_MH();
//MET_MH = SET_MH() / D_MH();
MET_MH = 1.0;
{
if ( (PhasePhenoPlante() < PHASEPHENOPLANTE_JUVENILE)
|| (PhasePhenoPlante() > PHASEPHENOPLANTE_CROISSANCEACTIVE) ){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment