Skip to content

GitLab

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

Comment computation part of first_compute closure

parent ea6f7eb3
Hide whitespace changes
Inline Side-by-side
sunflo/exp/sunflo_web_modified_TT_new_model.vpz
View file @ 94ab993b
......@@ -84,21 +84,18 @@
<port name="Tmoy"/>
<port name="RG"/>
</in>&#xd;
<out>&#xd;
<port name="ISH1"/>&#xd;
<port name="ISH2"/>&#xd;
<port name="ISH3"/>&#xd;
<port name="Foo"/>
<port name="D_MH"/>
<port name="D_SE"/>
<port name="SET_MH"/>
<out>
<port name="Foo"/>
<port name="D_MH"/>
<port name="D_SE"/>
<port name="SET_MH"/>
<port name="MET_MH"/>
<port name="D_EF"/>
<port name="SET_EF"/>
<port name="D_EF"/>
<port name="SET_EF"/>
<port name="MET_EF"/>
<port name="NHT28_EF"/>
<port name="NHT28"/>
<port name="SGR_FM"/>
<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;
......
sunflo/src/Diagnostic.cpp
View file @ 94ab993b
......@@ -40,25 +40,6 @@ public :
/*Sync*/ Var PhasePhenoPlante;
/*Sync*/ Var Tmoy;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
/// # Jours de stress jusqu'a la floraison (estimationTTentreSemisEtLevee_casPhaseSemisLeveeSimulee - F1)
/// # (pas utilisé dans le modèle, sortie de Diagnostic)
Var ISH1;
/// # Jours de stress Autour de la floraison (F1 + 350°Cd)
/// # (pas utilisé dans le modèle, sortie de Diagnostic)
Var ISH2;
/// # Jours de stress après la floraison (F1+350 °Cd – M3)
/// # (pas utilisé dans le modèle, sortie de Diagnostic)
Var ISH3;
////////////////////////////////////////////////////////////////////////
/////////////////////////////REMI ADDS//////////////////////////////////
////////////////////////////////////////////////////////////////////////
/// # Variable test.
Var Foo;
......@@ -105,9 +86,6 @@ public :
TT_A2.init(this, "TT_A2", events);
ETRETM.init(this, "ETRETM", events);
ISH1.init(this, "ISH1" , events);
ISH2.init(this, "ISH2" , events);
ISH3.init(this, "ISH3" , events);
////////////////////////////////////////////////////////////////////////
/////////////////////////////REMI ADDS//////////////////////////////////
......@@ -143,12 +121,9 @@ public :
{
if (first_compute) {
first_compute = false;
ISH1 = 0.0; //codeMMpourMemo Initial Value = 0.0
ISH2 = 0.0; //codeMMpourMemo Initial Value = 0.0
ISH3 = 0.0; //codeMMpourMemo Initial Value = 0.0
/////////////////////////////REMI ADDS//////////////////////////////////
{
/* {
if ( ( PhasePhenoPlante() != PHASEPHENOPLANTE_MATURATION )
// traduit condition TT_A2 < date_TT_M0
// || ( PhasePhenoPlante() < PHASEPHENOPLANTE_JUVENILE )
......@@ -185,55 +160,11 @@ public :
NHT28 = 0.0;
NHT28_EF = 0.0;
SGR_FM = 0.0;
Foo = 5.0;
Foo = 5.0; */
////////////////////////////////////////////////////////////////////////
} else {
{
double ddt = 0.0;
if ( ETRETM() > pr.SeuilETRETM ){
ddt = 0.0;
} else if ( TT_A2() > pv.date_TT_F1 ){
ddt = 0.0;
} else if ( TT_A2() <= 0.0 ){
// traduit condition TT_A2 <= 0
ddt = 0.0;
} else {
ddt = 1.0;
}
ISH1 = ISH1(-1) + ddt;
}
{
double ddt = 0.0;
if ( ETRETM() > pr.SeuilETRETM ){
ddt = 0.0;
} else if ( TT_A2() > (pv.date_TT_F1 + pp.date_TT_F1M0) ){
ddt = 0.0;
} else if ( TT_A2() < pv.date_TT_F1 ){
ddt = 0.0;
} else {
ddt = 1.0;
}
ISH2 = ISH2(-1) + ddt;
}
{
double ddt = 0.0;
if ( ETRETM() > pr.SeuilETRETM ){
ddt = 0.0;
} else if ( TT_A2() > pv.date_TT_M3 ){
ddt = 0.0;
} else if ( TT_A2() < (pv.date_TT_F1 + pp.date_TT_F1M0) ){
ddt = 0.0;
} else {
ddt = 1.0;
}
ISH3 = ISH3(-1) + ddt;
}
} else {
////////////////////////////////////////////////////////////////////////
/////////////////////////////REMI ADDS//////////////////////////////////
......
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