Change the default values of reactivity weights. This set of values is much...

Change the default values of reactivity weights. This set of values is much more suitable to predict correct Pu content than the other.  
Add a warning if user gives a Burnup in GetFissileMolarFraction

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

source/trunk/Model/Equivalence/EQM_BakerRoss_FBR_MOX.cxx

@@ -98,6 +98,11 @@ EQM_BakerRoss_FBR_MOX::EQM_BakerRoss_FBR_MOX(CLASSLogger* log, double Weight_U_2
 //________________________________________________________________________
 double EQM_BakerRoss_FBR_MOX::GetFissileMolarFraction(IsotopicVector Fissile,IsotopicVector Fertile,double BurnUp)
 {
+
+	if(BurnUp != 0 )
+		WARNING<<"Burn up (third argument) has no effect "<<endl;
+	
+
 	double FissileContent	 = 0.;               
 
 	IsotopicVector FissileListPlusDecay;

source/trunk/Model/Equivalence/EQM_BakerRoss_FBR_MOX.hxx

@@ -61,7 +61,7 @@ class EQM_BakerRoss_FBR_MOX : public EquivalenceModel
 	 \param Weight_Am_241 : reactivity weight @f$W_{^{241}Pu} = \frac{\alpha_{{^{241}Am}} - \alpha_{^{238}U} }{\alpha_{^{239}Pu}-\alpha_{^{238}U}}@f$
 	 \param EquivalentFissile : reference fresh fuel @f$^{239}Pu@f$ content neeed in a @f$^{238}U@f$ + @f$^{239}Pu@f$ fuel to satisfy criticality at t=0
 	 */
-	EQM_BakerRoss_FBR_MOX(CLASSLogger* log, double Weight_U_235 =0.793671, double Weight_Pu_238=0.6836, double Weight_Pu_240=0.13558, double Weight_Pu_241=1.5503, double Weight_Pu_242=0.0803952, double Weight_Am_241=-0.342553, double EquivalentFissile = 0.106);
+	EQM_BakerRoss_FBR_MOX(CLASSLogger* log, double Weight_U_235 = 0.791135, double Weight_Pu_238 = 0.686385, double Weight_Pu_240 = 0.13553, double Weight_Pu_241 = 1.54572 , double Weight_Pu_242 = 0.0829001, double Weight_Am_241 = -0.336945, double EquivalentFissile = 0.103213);
 	//}
 	
 	//{
@@ -77,11 +77,11 @@ class EQM_BakerRoss_FBR_MOX : public EquivalenceModel
 	 \param Weight_Am_241 : reactivity weight @f$W_{^{241}Pu} = \frac{\alpha_{{^{241}Am}} - \alpha_{^{238}U} }{\alpha_{^{239}Pu}-\alpha_{^{238}U}}@f$
 	 \param EquivalentFissile : reference fresh fuel @f$^{239}Pu@f$ content neeed in a @f$^{238}U@f$ + @f$^{239}Pu@f$ fuel to satisfy criticality at t=0
 	 */
-	EQM_BakerRoss_FBR_MOX(double Weight_U_235 =0.793671, double Weight_Pu_238=0.6836, double Weight_Pu_240=0.13558, double Weight_Pu_241=1.5503, double Weight_Pu_242=0.0803952, double Weight_Am_241=-0.342553, double EquivalentFissile = 0.106);
+	EQM_BakerRoss_FBR_MOX(double Weight_U_235 = 0.791135, double Weight_Pu_238 = 0.686385, double Weight_Pu_240 = 0.13553, double Weight_Pu_241 = 1.54572 , double Weight_Pu_242 = 0.0829001, double Weight_Am_241 = -0.336945, double EquivalentFissile = 0.103213);
 	//}
 	//@}
 	
-	virtual double GetFissileMolarFraction(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp);
+	virtual double GetFissileMolarFraction(IsotopicVector Fissil, IsotopicVector Fertil, double BurnUp = 0);
 
 	private :
 	double fReferenceFissilContent;   //!<The reference fraction of Pu for BurnUp=100Gwj/t with a ideal model(only @f$^{239}Pu@f$ and &@f$^{238}U@f$ are taken into account)