Modifying NHT period and correct MET_MH

sunflo/exp/sunflo_web_modified_TT_new_model.vpz

@@ -158,7 +158,7 @@
         <port name="TH"/>
        </out>&#xd;
 <submodels>&#xd;
-<model observables="elaboration_qualite" conditions="CONFIG_Variete,elaboration_qualite,itk" width="100" dynamics="elaboration_qualite" height="165" x="360" y="245" name="elaboration_qualite" type="atomic">&#xd;
+<model observables="elaboration_qualite" conditions="CONFIG_Variete,elaboration_qualite,itk" width="100" dynamics="elaboration_qualite" height="165" x="377" y="321" name="elaboration_qualite" type="atomic">&#xd;
 <in>
           <port name="ChgtPhasePhenoPlante"/>
           <port name="PhasePhenoPlante"/>

sunflo/src/Diagnostic.cpp

@@ -201,8 +201,8 @@ public :
             }
 
             // calcul de MET_MH
-            //MET_MH = SET_MH() / D_MH();
-		MET_MH = 1.0;
+            MET_MH = SET_MH() / D_MH();
+		//MET_MH = 1.0;
             {
                 if ( (PhasePhenoPlante() < PHASEPHENOPLANTE_JUVENILE) 
 			|| (PhasePhenoPlante() > PHASEPHENOPLANTE_CROISSANCEACTIVE) ){
@@ -218,7 +218,7 @@ public :
 
             // calcul de NHT28_EF
             {	
-                if ( Tmoy() < 28.0 ){
+                if ( Tmoy() <= 28.0 ){
                     NHT28_EF = NHT28_EF(-1);
                 } else if ( (PhasePhenoPlante() < PHASEPHENOPLANTE_JUVENILE) 
 			|| (PhasePhenoPlante() > PHASEPHENOPLANTE_CROISSANCEACTIVE) ){
@@ -231,9 +231,12 @@ public :
 
             // calcul de NHT28
             {
-                if ( Tmoy() < 28.0 ){
+                if ( Tmoy() <= 28.0 ){
                     NHT28 = NHT28(-1);
-                } else {
+                } else if (PhasePhenoPlante() >= PHASEPHENOPLANTE_RECOLTEE) {
+		    NHT28 = NHT28(-1);
+		}
+		 else {
                     NHT28 = NHT28(-1) + 1;
 		    //std::cout << "temp haute NHT28 \n";
                 }

sunflo/src/ElaborationRendement.cpp

@@ -121,13 +121,13 @@ public :
     {
         if (first_compute) {
             first_compute = false;
-            JSE = 0.0; //codeMMpourMemo Initial Value = 0.0
+            /*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;
+            photo_IRs_aFinMATURATION = 0.0;*/
             {
                 double RDT_tmp = 0.0;
                 if ( ( PhasePhenoPlante() >= PHASEPHENOPLANTE_DESSICATION )
@@ -139,7 +139,7 @@ public :
                 }
                 RDT = RDT_tmp;
             }
-            photo_RDT_aFinMATURATION = 0.0;
+            photo_RDT_aFinMATURATION = 0.0; 
         } else {
            /* {
                 double ddt = 0.0;