diff --git a/source/branches/CLASSV3/src/FabricationPlant.cxx b/source/branches/CLASSV3/src/FabricationPlant.cxx index 5cf7aaf4acdac6c82988eb3ef9725317cc6c8c14..96c938c8ef9b9ee63d07f4ce7412b4b355cec08b 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]);