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

Suppress commentsElaborationRendement.cpp and simplified vpz

parent 8ee01325
......@@ -127,14 +127,10 @@
<model width="100" height="195" x="889" y="624" name="performances" type="coupled">&#xd;
<in>
<port name="ChgtPhasePhenoPlante"/>
<port name="ETRETM"/>
<port name="INN"/>
<port name="LAI"/>
<port name="vNabs"/>
<port name="PhasePhenoPlante"/>
<port name="TDM"/>
<port name="TRPF"/>
<port name="TT_F1"/>
<port name="iPAR"/>
<port name="Tx"/>
<port name="Eb"/>
......@@ -146,16 +142,13 @@
<port name="MET_MH"/>
<port name="NHT28"/>
<port name="NHT28_EF"/>
<port name="NET_EF"/>
<port name="NET_EF"/>
<port name="NET_FM"/>
<port name="NET_MH"/>
<port name="TT_MH"/>
<port name="TT_MH"/>
</in>&#xd;
<out>
<port name="IRs"/>
<port name="JSE"/>
<port name="JSF"/>
<port name="JSM"/>
<port name="RDT"/>
<port name="TH"/>
</out>&#xd;
......@@ -179,22 +172,16 @@
<model observables="elaboration_rendement" conditions="CONFIG_Variete,EXPERT_SimuInit,elaboration_rendement,EXPERT_Plante" width="100" dynamics="elaboration_rendement" height="135" x="320" y="33" name="elaboration_rendement" type="atomic">&#xd;
<in>
<port name="ChgtPhasePhenoPlante"/>
<port name="ETRETM"/>
<port name="INN"/>
<port name="PhasePhenoPlante"/>
<port name="TDM"/>
<port name="TRPF"/>
<port name="TT_F1"/>
<port name="NET_EF"/>
<port name="NET_EF"/>
<port name="NET_FM"/>
<port name="NET_MH"/>
<port name="TT_MH"/>
<port name="TT_MH"/>
</in>&#xd;
<out>
<port name="IRs"/>
<port name="JSE"/>
<port name="JSF"/>
<port name="JSM"/>
<port name="RDT"/>
<port name="NET_EF"/>
<port name="NET_FM"/>
......@@ -212,14 +199,6 @@
<origin model="performances" port="ChgtPhasePhenoPlante"/>
<destination model="elaboration_rendement" port="ChgtPhasePhenoPlante"/>
</connection>
<connection type="input">
<origin model="performances" port="ETRETM"/>
<destination model="elaboration_rendement" port="ETRETM"/>
</connection>
<connection type="input">
<origin model="performances" port="INN"/>
<destination model="elaboration_rendement" port="INN"/>
</connection>
<connection type="input">
<origin model="performances" port="PhasePhenoPlante"/>
<destination model="elaboration_qualite" port="PhasePhenoPlante"/>
......@@ -232,14 +211,6 @@
<origin model="performances" port="TDM"/>
<destination model="elaboration_rendement" port="TDM"/>
</connection>
<connection type="input">
<origin model="performances" port="TRPF"/>
<destination model="elaboration_rendement" port="TRPF"/>
</connection>
<connection type="input">
<origin model="performances" port="TT_F1"/>
<destination model="elaboration_rendement" port="TT_F1"/>
</connection>
<connection type="input">
<origin model="performances" port="D_SE"/>
<destination model="elaboration_qualite" port="D_SE"/>
......@@ -268,7 +239,7 @@
<origin model="performances" port="NHT28_EF"/>
<destination model="elaboration_qualite" port="NHT28_EF"/>
</connection>
<connection type="input">
<connection type="input">
<origin model="performances" port="NET_EF"/>
<destination model="elaboration_rendement" port="NET_EF"/>
</connection>
......@@ -280,7 +251,7 @@
<origin model="performances" port="NET_MH"/>
<destination model="elaboration_rendement" port="NET_MH"/>
</connection>
<connection type="input">
<connection type="input">
<origin model="performances" port="TT_MH"/>
<destination model="elaboration_rendement" port="TT_MH"/>
</connection>
......@@ -779,10 +750,6 @@
<origin model="contraintes" port="ETRETM"/>
<destination model="diagnostic" port="ETRETM"/>
</connection>
<connection type="internal">
<origin model="contraintes" port="ETRETM"/>
<destination model="performances" port="ETRETM"/>
</connection>
<connection type="internal">
<origin model="contraintes" port="FHLE"/>
<destination model="croissance_plante" port="FHLE"/>
......@@ -811,18 +778,10 @@
<origin model="contraintes" port="FT"/>
<destination model="croissance_plante" port="FT"/>
</connection>
<connection type="internal">
<origin model="contraintes" port="INN"/>
<destination model="performances" port="INN"/>
</connection>
<connection type="internal">
<origin model="contraintes" port="PARi"/>
<destination model="performances" port="iPAR"/>
</connection>
<connection type="internal">
<origin model="contraintes" port="TRPF"/>
<destination model="performances" port="TRPF"/>
</connection>
<connection type="internal">
<origin model="croissance_plante" port="Ebp"/>
<destination model="contraintes" port="Ebp"/>
......@@ -887,10 +846,6 @@
<origin model="phenologie" port="TT_A2"/>
<destination model="contraintes" port="TT_A2"/>
</connection>
<connection type="internal">
<origin model="phenologie" port="TT_F1"/>
<destination model="performances" port="TT_F1"/>
</connection>
<connection type="internal">
<origin model="temperature_efficace" port="Teff"/>
<destination model="phenologie" port="Teff"/>
......@@ -959,7 +914,7 @@
<origin model="diagnostic" port="NHT28"/>
<destination model="performances" port="NHT28"/>
</connection>
<connection type="internal">
<connection type="internal">
<origin model="diagnostic" port="NET_EF"/>
<destination model="performances" port="NET_EF"/>
</connection>
......@@ -971,7 +926,7 @@
<origin model="diagnostic" port="NET_MH"/>
<destination model="performances" port="NET_MH"/>
</connection>
<connection type="internal">
<connection type="internal">
<origin model="diagnostic" port="TT_MH"/>
<destination model="performances" port="TT_MH"/>
</connection>
......@@ -1854,11 +1809,11 @@
</observable>&#xd;
&#xd;
<observable name="elaboration_rendement">&#xd;
<port name="JSE"/>&#xd;
&#xd;
<port name="JSF"/>&#xd;
&#xd;
<port name="JSM"/>&#xd;
&#xd;
&#xd;
&#xd;
&#xd;
<port name="photo_INN_CROISSANCEACTIVE_A_FLORAISON"/>&#xd;
&#xd;
......
......@@ -31,24 +31,13 @@ public :
bool first_compute;
/*Sync*/ Var PhasePhenoPlante;
/*Sync*/ Var TT_F1;
/*Sync*/ Var TDM;
/*Sync*/ Var ETRETM;
/*Sync*/ Var TRPF;
/*Sync*/ Var INN;
// /*Sync*/ Var INN;
/// # Rendement (0% humidité, 0% impuretés)
Var RDT;
/// # Jours de stress végétatifs (E1 - F1) (covariables statistiques)
Var JSE;
/// # Jours de stress à la floraison (F1 - M0) (covariables statistiques)
Var JSF;
/// # Jours de stress après la floraison (M0 - M3) (covariables statistiques)
Var JSM;
/// # Modèle linéaire expliquant l’indice de récolte
Var IRs;
/// Capture de INN a un instant donne (ex INNF1)
Var photo_INN_CROISSANCEACTIVE_A_FLORAISON;
/// Capture de TDM a un instant donne (ex TDMF1)
Var photo_TDM_CROISSANCEACTIVE_A_FLORAISON;
/// Capture de IRs a un instant donne (ex IR)
......@@ -81,17 +70,9 @@ public :
PhasePhenoPlante.init(this, "PhasePhenoPlante", events);
TT_F1.init(this, "TT_F1", events);
TDM.init(this, "TDM", events);
ETRETM.init(this, "ETRETM", events);
TRPF.init(this, "TRPF", events);
INN.init(this, "INN", events);
RDT.init(this, "RDT" , events);
JSE.init(this, "JSE" , events);
JSF.init(this, "JSF" , events);
JSM.init(this, "JSM" , events);
IRs.init(this, "IRs" , events);
photo_INN_CROISSANCEACTIVE_A_FLORAISON.init(this, "photo_INN_CROISSANCEACTIVE_A_FLORAISON" , events);
photo_TDM_CROISSANCEACTIVE_A_FLORAISON.init(this, "photo_TDM_CROISSANCEACTIVE_A_FLORAISON" , events);
photo_IRs_aFinMATURATION.init(this, "photo_IRs_aFinMATURATION" , events);
photo_RDT_aFinMATURATION.init(this, "photo_RDT_aFinMATURATION" , events);
......@@ -123,13 +104,6 @@ public :
{
if (first_compute) {
first_compute = false;
/*JSE = 0.0; //codeMMpourMemo Initial Value = 0.0
JSF = 0.0; //codeMMpourMemo Initial Value = 0.0
JSM = 0.0; //codeMMpourMemo Initial Value = 0.0
photo_TDM_CROISSANCEACTIVE_A_FLORAISON = 0.0; //codeMMpourMemo TDMF1 = 0
photo_INN_CROISSANCEACTIVE_A_FLORAISON = 0.0; //codeMMpourMemo INNF1 = 0
IRs = 0.0;
photo_IRs_aFinMATURATION = 0.0;*/
{
double RDT_tmp = 0.0;
if ( ( PhasePhenoPlante() >= PHASEPHENOPLANTE_DESSICATION )
......@@ -143,93 +117,18 @@ public :
}
photo_RDT_aFinMATURATION = 0.0;
} else {
/* {
double ddt = 0.0;
if ( ETRETM() > pr.SeuilETRETM ){
ddt = 0.0;
} else if ( ( PhasePhenoPlante() >= PHASEPHENOPLANTE_FLORAISON)
&& ( PhasePhenoPlante() < PHASEPHENOPLANTE_RECOLTEE) ){
// traduit condition TT_A2 > date_TT_F1
ddt = 0.0;
} else if ( ( PhasePhenoPlante() < PHASEPHENOPLANTE_CROISSANCEACTIVE)
|| ( PhasePhenoPlante() >= PHASEPHENOPLANTE_RECOLTEE) ){
// traduit condition TT_A2 < date_TT_E1
ddt = 0.0;
} else {
ddt = 1.0;
}
JSE = JSE(-1) + ddt;
} */
/* {
double ddt = 0.0;
if ( ETRETM() > pr.SeuilETRETM ){
ddt = 0.0;
} else if ( ( PhasePhenoPlante() >= PHASEPHENOPLANTE_MATURATION)
&& ( PhasePhenoPlante() < PHASEPHENOPLANTE_RECOLTEE) ){
// traduit condition TT_A2 > date_TT_M0
ddt = 0.0;
} else if ( ( PhasePhenoPlante() < PHASEPHENOPLANTE_FLORAISON)
|| ( PhasePhenoPlante() >= PHASEPHENOPLANTE_RECOLTEE) ){
// traduit condition TT_A2 < date_TT_F1
ddt = 0.0;
} else {
ddt = 1.0;
}
JSF = JSF(-1) + ddt;
}
{
double ddt = 0.0;
if ( ETRETM() > pr.SeuilETRETM ){
ddt = 0.0;
} else if ( ( PhasePhenoPlante() >= PHASEPHENOPLANTE_DESSICATION)
&& ( PhasePhenoPlante() < PHASEPHENOPLANTE_RECOLTEE) ){
// traduit condition TT_A2 > date_TT_M3
ddt = 0.0;
} else if ( ( PhasePhenoPlante() < PHASEPHENOPLANTE_MATURATION)
|| ( PhasePhenoPlante() >= PHASEPHENOPLANTE_RECOLTEE) ){
// traduit condition TT_A2 < date_TT_M0
ddt = 0.0;
} else {
ddt = 1.0;
}
JSM = JSM(-1) + ddt;
} */
if ((PhasePhenoPlante(-1) == PHASEPHENOPLANTE_CROISSANCEACTIVE) and
(PhasePhenoPlante() == PHASEPHENOPLANTE_FLORAISON)){
//photo_TDM_CROISSANCEACTIVE_A_FLORAISON = TDM(-1); // derniere valeur en CROISSANCEACTIVE
photo_TDM_CROISSANCEACTIVE_A_FLORAISON = TDM(); // première valeur en floraison
photo_INN_CROISSANCEACTIVE_A_FLORAISON = INN(-1); // derniere valeur en CROISSANCEACTIVE
} else if ( PhasePhenoPlante() >= PHASEPHENOPLANTE_FLORAISON ){
photo_TDM_CROISSANCEACTIVE_A_FLORAISON = photo_TDM_CROISSANCEACTIVE_A_FLORAISON(-1);
photo_INN_CROISSANCEACTIVE_A_FLORAISON = photo_INN_CROISSANCEACTIVE_A_FLORAISON(-1);
} else {
photo_TDM_CROISSANCEACTIVE_A_FLORAISON = photo_TDM_CROISSANCEACTIVE_A_FLORAISON(-1);
photo_INN_CROISSANCEACTIVE_A_FLORAISON = photo_INN_CROISSANCEACTIVE_A_FLORAISON(-1);
}
/* {
double IRs_tmp = 0.0;
if ( ( PhasePhenoPlante() < PHASEPHENOPLANTE_FLORAISON)
|| ( PhasePhenoPlante() >= PHASEPHENOPLANTE_RECOLTEE) ){
// traduit condition TT_A2 < date_TT_F1
IRs_tmp = 0.0;
} else {
IRs_tmp = 9.370e-02 + (-1.552e-04) * photo_TDM_CROISSANCEACTIVE_A_FLORAISON()
+ (-2.828e-03) * JSE() + (-2.557e-03) * JSF()
+ (-1.940e-03) * JSM() + (-3.907e-04) * TRPF()
+ 1.274e-04 * TT_F1() + 8.189e-01 * pv.IRg;
}
IRs = IRs_tmp;
}*/
{
double IRs_tmp = 0.0;
......@@ -281,12 +180,10 @@ public :
(PhasePhenoPlante() == PHASEPHENOPLANTE_DESSICATION)){
photo_RDT_aFinMATURATION = RDT(-1); // derniere valeur en MATURATION et non pas 1ere en DESSICATION
//photo_RDT_aFinMATURATION = RDT(); // derniere valeur en MATURATION et non pas 1ere en DESSICATION
} else if ((PhasePhenoPlante(-1) == PHASEPHENOPLANTE_MATURATION) and
(PhasePhenoPlante() == PHASEPHENOPLANTE_RECOLTEE)){
photo_RDT_aFinMATURATION = RDT(-1); // derniere valeur en MATURATION et non pas 1ere en RECOLTEE
//photo_RDT_aFinMATURATION = RDT(); // derniere valeur en MATURATION et non pas 1ere en RECOLTEE
} else {
photo_RDT_aFinMATURATION = photo_RDT_aFinMATURATION(-1);
}
......
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