From 6c4366dcdd924b33118ae5dd1b357f958460428a Mon Sep 17 00:00:00 2001
From: Baptiste LENIAU <baptiste.leniau@subatech.in2p3.fr>
Date: Thu, 10 Jul 2014 09:12:21 +0000
Subject: [PATCH] git-svn-id: svn+ssh://svn.in2p3.fr/class@338
0e7d625b-0364-4367-a6be-d5be4a48d228
---
source/branches/CLASSV3/src/FabricationPlant.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/branches/CLASSV3/src/FabricationPlant.cxx b/source/branches/CLASSV3/src/FabricationPlant.cxx
index 5cf7aaf4a..96c938c8e 100644
--- a/source/branches/CLASSV3/src/FabricationPlant.cxx
+++ b/source/branches/CLASSV3/src/FabricationPlant.cxx
@@ -180,7 +180,7 @@ DBGL
if(LambdaArray[0] != -1)
{
IsotopicVector IV = BuildFuelFromEqModel(LambdaArray);
- EvolutionData EvolDB = FuelType->GenerateEvolutionData( /*GetDecay(IV,fCycleTime)*/ IV , R_CycleTime, R_Power);
+ EvolutionData EvolDB = FuelType->GenerateEvolutionData( GetDecay(IV,fCycleTime) /*IV*/ , R_CycleTime, R_Power);
{
pair<map<int, IsotopicVector>::iterator, bool> IResult;
@@ -258,13 +258,13 @@ void FabricationPlant::BuildFissileArray()
for(int i = 0; i < (int)fFissileStorage.size(); i++)
{
vector<IsotopicVector> IVArray = fFissileStorage[i]->GetIVArray();
+
for(int j = 0; j < (int)IVArray.size(); j++)
{
IsotopicVector SeparatedIV = Separation(IVArray[j], fFissileList).first;
IsotopicVector CooledSeparatedIV = GetDecay( SeparatedIV , GetCycleTime());
-
fFissileArray.push_back( CooledSeparatedIV );
fFissileArrayAdress.push_back( pair<int,int>(i,j) );
fFissileArrayTime.push_back(fFissileStorage[i]->GetIVArrayArrivalTime()[j]);
--
GitLab