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

Finish computations of indicators

parent 9b75dd11
......@@ -80,8 +80,13 @@ public :
// Thermal stress entre germinatioan et initiation florale.
Var NHT28_EF;
// Thermal stress during whole season
// Thermal stress during whole season
Var NHT28;
// Radiations
Var RG;
// Sum of radiations during flowering
Var SGR_FM;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
......@@ -111,6 +116,11 @@ public :
MET_EF.init(this, "MET_MH" , events);
NHT28_EF.init(this, "NHT28_EF.init", events);
SGR_FM.init(this, "SGR_FM", events);
RG.init(this, "RG", events);
PhasePhenoPlante.init(this, "PhasePhenoPlante", events);
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
......@@ -137,6 +147,7 @@ public :
MET_EF = 0.0;
NHT_28 = 0.0;
NHT28_MH = 0.0;
SGR_FM = 0.0;
////////////////////////////////////////////////////////////////////////
} else {
{
......@@ -283,6 +294,21 @@ public :
NHT28 = NHT28(-1) + ddt;
}
// calcul de SGR_FM
{
double ddt = 0.0;
if ( PhasePhenoPlante() != PHASEPHENOPLANTE_FLORAISON){
ddt = 0.0;
} else {
ddt = RG();
}
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