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

Compute all indicators for OC

parent 910ef76d
......@@ -49,7 +49,7 @@
<port name="Nabs"/>&#xd;
</out>&#xd;
<submodels>&#xd;
<model observables="croissance_plante" conditions="CONFIG_Plante,CONFIG_Variete,croissance_plante,simulation_engine,EXPERT_Plante" width="100" dynamics="croissance_plante" height="225" x="777" y="209" name="croissance_plante" type="atomic">&#xd;
<model observables="croissance_plante" conditions="CONFIG_Plante,CONFIG_Variete,croissance_plante,simulation_engine,EXPERT_Plante" width="100" dynamics="croissance_plante" height="225" x="801" y="206" name="croissance_plante" type="atomic">&#xd;
<in>&#xd;
<port name="ActionSemis"/>&#xd;
<port name="ChgtPhasePhenoPlante"/>&#xd;
......@@ -75,13 +75,14 @@
<port name="Eb"/>&#xd;
</out>&#xd;
</model>&#xd;
<model observables="diagnostic" conditions="CONFIG_Plante,CONFIG_SimuInit,CONFIG_Variete,diagnostic,EXPERT_Plante,EXPERT_SimuInit" width="100" dynamics="diagnostic" height="75" x="446" y="12" name="diagnostic" type="atomic">&#xd;
<in>&#xd;
<port name="ChgtPhasePhenoPlante"/>&#xd;
<port name="ETRETM"/>&#xd;
<port name="TT_A2"/>&#xd;
<port name="PhasePhenoPlante"/>
<port name="Tx"/>
<model observables="diagnostic" conditions="CONFIG_Plante,CONFIG_SimuInit,CONFIG_Variete,diagnostic,EXPERT_Plante,EXPERT_SimuInit" width="100" dynamics="diagnostic" height="75" x="562" y="14" name="diagnostic" type="atomic">&#xd;
<in>
<port name="ChgtPhasePhenoPlante"/>
<port name="ETRETM"/>
<port name="TT_A2"/>
<port name="PhasePhenoPlante"/>
<port name="Tmoy"/>
<port name="RG"/>
</in>&#xd;
<out>&#xd;
<port name="ISH1"/>&#xd;
......@@ -97,6 +98,7 @@
<port name="MET_EF"/>
<port name="NHT28_EF"/>
<port name="NHT28"/>
<port name="SGR_FM"/>
</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;
......@@ -898,13 +900,17 @@
<origin model="diagnostic" port="Foo"/>
<destination model="performances" port="Foo"/>
</connection>
<connection type="internal">
<connection type="internal">
<origin model="phenologie" port="PhasePhenoPlante"/>
<destination model="diagnostic" port="PhasePhenoPlante"/>
</connection>
<connection type="input">
<origin model="sunflo_bio" port="Tmoy"/>
<destination model="diagnostic" port="Tmoy"/>
</connection>
<connection type="input">
<origin model="sunflo_bio" port="Tx"/>
<destination model="diagnostic" port="Tx"/>
<origin model="sunflo_bio" port="RG"/>
<destination model="diagnostic" port="RG"/>
</connection>
</connections>&#xd;
</model>&#xd;
......@@ -1427,7 +1433,8 @@
<string>ChgtPhasePhenoPlante</string>
<string>TT_A2</string>
<string>PhasePḧenoPlante</string>
<string>Tx</string>
<string>Tmoy</string>
<string>RG</string>
</set>&#xd;
</port>&#xd;
</condition>&#xd;
......@@ -1855,6 +1862,9 @@
<port name="NHT28">
<attachedview name="timed"/>
</port>
<port name="SGR_FM">
<attachedview name="timed"/>
</port>
</observable>&#xd;
<observable name="temperature_efficace"/>&#xd;
<observable name="temperature_moyenne">&#xd;
......
......@@ -9,5 +9,7 @@
<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"/>
</outputGUIplugins>
</vle_project_metadata>
......@@ -39,7 +39,7 @@ public :
////////////////////////////////////////////////////////////////////////
/*Sync*/ Var PhasePhenoPlante;
/*Sync*/ Var Tx;
/*Sync*/ Var Tmoy;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
......@@ -87,11 +87,11 @@ public :
// Thermal stress during whole season
Var NHT28;
/*
// Radiations
Var RG;
// Sum of radiations during flowering
Var SGR_FM;*/
Var SGR_FM;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
......@@ -123,14 +123,14 @@ public :
SET_EF.init(this, "SET_EF" , events);
MET_EF.init(this, "MET_EF" , events);
NHT28_EF.init(this, "NHT28_EF.init", events);
NHT28.init(this, "NHT28.init", events);
/*
SGR_FM.init(this, "SGR_FM", events);
RG.init(this, "RG", events);*/
NHT28_EF.init(this, "NHT28_EF", events);
NHT28.init(this, "NHT28", events);
SGR_FM.init(this, "SGR_FM", events);
RG.init(this, "RG", events);
PhasePhenoPlante.init(this, "PhasePhenoPlante", events);
Tx.init(this, "Tx", events);
Tmoy.init(this, "Tmoy", events);
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
......@@ -190,7 +190,7 @@ public :
MET_EF = 0.0;
NHT28 = 0.0;
NHT28_EF = 0.0;
/* SGR_FM = 0.0;*/
SGR_FM = 0.0;
Foo = 5.0;
////////////////////////////////////////////////////////////////////////
......@@ -322,12 +322,10 @@ std::cout << "Dans EF \n";
// calcul de NHT28_EF
{
double ddt = 0.0;
if ( Tx() < 0 ){
if ( Tmoy() < 28.0 ){
ddt = 0.0;
std::cout << "Temperature faible \n";
} else if ( (PhasePhenoPlante() < PHASEPHENOPLANTE_JUVENILE)
|| (PhasePhenoPlante() > PHASEPHENOPLANTE_CROISSANCEACTIVE) ){
std::cout << "Pas dans EF \n";
ddt = 0.0;
} else {
ddt = 1.0;
......@@ -339,15 +337,16 @@ std::cout << "Dans EF \n";
// calcul de NHT28
{
double ddt = 0.0;
if ( Tx() < 5.0 ){
ddt = 0.0;
if ( Tmoy() < 28.0 ){
ddt = 0.0;
} else {
ddt = 1.0;
//std::cout << "temp haute NHT28 \n";
}
NHT28 = NHT28(-1) + ddt;
}
/*
// calcul de SGR_FM
{
double ddt = 0.0;
......@@ -360,7 +359,7 @@ std::cout << "Dans EF \n";
SGR_FM = SGR_FM(-1) + ddt;
}
*/
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
......
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