remove percent in the model….

git-svn-id: svn+ssh://svn.in2p3.fr/class@364 0e7d625b-0364-4367-a6be-d5be4a48d228

source/branches/CLASSV3/Model/Equivalence/EQM_QUAD_PWR_MOX.cxx

@@ -107,9 +107,9 @@ double EQM_QUAD_PWR_MOX::GetFissileMolarFraction(IsotopicVector Fissile,Isotopic
 
 
 	for(int i = 0; i< 5; i++)
-		PuCompo.push_back( Fissile.GetZAIIsotopicQuantity(ZAIList[i])/Sum *100 );
+		PuCompo.push_back( Fissile.GetZAIIsotopicQuantity(ZAIList[i])/Sum);
 
-	PuCompo[2] += Fissile.GetZAIIsotopicQuantity(ZAIList[5])/Sum *100;
+	PuCompo[2] += Fissile.GetZAIIsotopicQuantity(ZAIList[5])/Sum;
 	double A = 0;
 
 	if(PuCompo[0] <= PuCompo[2] && PuCompo[0] <= PuCompo[4] && PuCompo[1] + PuCompo[3] >= 40 && PuCompo[1] >0 )
@@ -117,16 +117,16 @@ double EQM_QUAD_PWR_MOX::GetFissileMolarFraction(IsotopicVector Fissile,Isotopic
 		int par = 0;
 		for(int j = 0 ; j < 5 ; j++)
 		{
-			A += fFuelParameter[par]   * PuCompo[j]/100 ;
+			A += fFuelParameter[par]   * PuCompo[j] ;
 			par++;
 			for(int i = j ; i < 5 ; i++)
 			{
-				A += fFuelParameter[par] *PuCompo[i]/100 *PuCompo[j]/100;
+				A += fFuelParameter[par] *PuCompo[i] *PuCompo[j];
 				par++;
 			}
 		}
 		A += fFuelParameter[par];
 	}
-	return A/100;
+	return A;
 }
 

source/branches/CLASSV3/Model/XS/XSM_CLOSEST.hxx

@@ -79,7 +79,7 @@ class XSM_CLOSEST : public XSModel
 
 
 	void SetWeightedDistanceCalculation(bool val = true) { fWeightedDistance = val;}		///< Set weighted Distance calculation
-	void SetEvolutionDataInterpolation(bool val = true) { fEvolutionDataInterpolation = val;}		///< Set weighted Distance calculation
+	void SetInventoryEvolutionInterpolation(bool val = true) { fEvolutionDataInterpolation = val;}		///< Set weighted Distance calculation
 	void SetDistanceParameter(IsotopicVector DistanceParameter);		///< Define mannually the weight for each ZAI in the distance calculation