From 52e2571ce19e5df5d1ecd1ea6c9d47d2c93736dc Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Thu, 28 Aug 2014 09:08:42 +0000
Subject: [PATCH] =?UTF-8?q?remove=20percent=20in=20the=20model=E2=80=A6.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn+ssh://svn.in2p3.fr/class@364 0e7d625b-0364-4367-a6be-d5be4a48d228
---
.../CLASSV3/Model/Equivalence/EQM_QUAD_PWR_MOX.cxx | 10 +++++-----
source/branches/CLASSV3/Model/XS/XSM_CLOSEST.hxx | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/branches/CLASSV3/Model/Equivalence/EQM_QUAD_PWR_MOX.cxx b/source/branches/CLASSV3/Model/Equivalence/EQM_QUAD_PWR_MOX.cxx
index 7914eea73..6ee873970 100644
--- a/source/branches/CLASSV3/Model/Equivalence/EQM_QUAD_PWR_MOX.cxx
+++ b/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;
}
diff --git a/source/branches/CLASSV3/Model/XS/XSM_CLOSEST.hxx b/source/branches/CLASSV3/Model/XS/XSM_CLOSEST.hxx
index 23692d14c..809f1c4b6 100644
--- a/source/branches/CLASSV3/Model/XS/XSM_CLOSEST.hxx
+++ b/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
--
GitLab