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

Correct { pb in ElaborationQualite.cpp

parent f17d609d
...@@ -72,6 +72,7 @@ public : ...@@ -72,6 +72,7 @@ public :
TH.init(this, "TH" , events); TH.init(this, "TH" , events);
photo_TH_aFinMATURATION.init(this, "photo_TH_aFinMATURATION" , events); photo_TH_aFinMATURATION.init(this, "photo_TH_aFinMATURATION" , events);
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
...@@ -91,11 +92,13 @@ public : ...@@ -91,11 +92,13 @@ public :
virtual void compute(const vle::devs::Time& /*time*/) virtual void compute(const vle::devs::Time& /*time*/)
{ {
{
double TH_tmp = 0.0; double TH_tmp = 0.0;
if ( ( PhasePhenoPlante() < PHASEPHENOPLANTE_FLORAISON ) if ( ( PhasePhenoPlante() < PHASEPHENOPLANTE_FLORAISON )
|| ( PhasePhenoPlante() >= PHASEPHENOPLANTE_RECOLTEE) ){ || ( PhasePhenoPlante() >= PHASEPHENOPLANTE_RECOLTEE) ){
TH_tmp = 0.0; TH_tmp = 0.0;
} else { } else {
// Add LLH
TH_tmp = 9.43 - 0.130*D_SE() + 0.131*D_MH() - TH_tmp = 9.43 - 0.130*D_SE() + 0.131*D_MH() -
0.00911*SGR_FM() -12.8*MET_EF() + 2.54*MET_MH() - 0.00911*SGR_FM() -12.8*MET_EF() + 2.54*MET_MH() -
0.209*NHT28() - 0.882*NHT28_EF() + 1.02*pv.thp - 0.201*pv.bSF; 0.209*NHT28() - 0.882*NHT28_EF() + 1.02*pv.thp - 0.201*pv.bSF;
...@@ -112,7 +115,6 @@ public : ...@@ -112,7 +115,6 @@ public :
photo_TH_aFinMATURATION = photo_TH_aFinMATURATION(-1); photo_TH_aFinMATURATION = photo_TH_aFinMATURATION(-1);
} }
} }
//}
} }
}; };
} // namespace sunflo } // namespace sunflo
......
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