diff --git a/source/branches/CLASSV3/Model/Equivalence/EQM_LIN_PWR_MOX.cxx b/source/branches/CLASSV3/Model/Equivalence/EQM_LIN_PWR_MOX.cxx index c1ab6c93080a40e559ab5374e287b1401b4bc9a4..d007107fb755bece52a82b1526d574a989db4704 100644 --- a/source/branches/CLASSV3/Model/Equivalence/EQM_LIN_PWR_MOX.cxx +++ b/source/branches/CLASSV3/Model/Equivalence/EQM_LIN_PWR_MOX.cxx @@ -30,7 +30,7 @@ EQM_LIN_PWR_MOX::EQM_LIN_PWR_MOX(string WeightPath):EquivalenceModel(new CLASSLo while(start < (int)line.size()) fFuelParameter.push_back(atof(StringLine::NextWord(line, start, ' ').c_str())); - INFO << (int)fFuelParameter.size() << " have been read " << endl; + INFO << " " << (int)fFuelParameter.size() << " parameters have been read " << endl; diff --git a/source/branches/CLASSV3/src/EvolutionData.cxx b/source/branches/CLASSV3/src/EvolutionData.cxx index 3f45095cc5365f3a5c5b385a51969f230459539c..779f596a7246f2bfb6748b35cdb7b8fbc23ab59a 100755 --- a/source/branches/CLASSV3/src/EvolutionData.cxx +++ b/source/branches/CLASSV3/src/EvolutionData.cxx @@ -1130,7 +1130,7 @@ void EvolutionData::OldReadDB(string DBfile) ifstream InfoDB(InfoDBFile.c_str()); // Open the File if(!InfoDB) { - WARNING << " Can't open \"" << InfoDBFile << "\"\n" << endl; + INFO << " Can't open \"" << InfoDBFile << "\"\n" << endl; return; } diff --git a/source/branches/CLASSV3/src/FabricationPlant.cxx b/source/branches/CLASSV3/src/FabricationPlant.cxx index 96c938c8ef9b9ee63d07f4ce7412b4b355cec08b..e1c1de07272dcfa49d2299030f65d3ae5cb29ec3 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), R_CycleTime, R_Power); { pair<map<int, IsotopicVector>::iterator, bool> IResult; diff --git a/source/branches/CLASSV3/src/Scenario.cxx b/source/branches/CLASSV3/src/Scenario.cxx index 8e69bc3a40c6dcc66de5699d3d467ad6f6c5d569..f34e6003fc7eaf95d6dcc303f7a67dc261768e83 100755 --- a/source/branches/CLASSV3/src/Scenario.cxx +++ b/source/branches/CLASSV3/src/Scenario.cxx @@ -179,6 +179,7 @@ void Scenario::AddPool(Pool* Pool) fPool.back()->SetDecayDataBank( (*this).GetDecayDataBase() ); fPool.back()->SetLog(GetLog()); fPool.back()->SetId((int)fPool.size()-1); + fPool.back()->SetCreationTime(fAbsoluteTime); string Pool_name = fPool.back()->GetName(); @@ -248,6 +249,7 @@ void Scenario::AddStorage(Storage* storage) fStorage.back()->SetDecayDataBank( (*this).GetDecayDataBase() ); fStorage.back()->SetLog(GetLog()); fStorage.back()->SetId((int)fStorage.size()-1); + fStorage.back()->SetCreationTime(fAbsoluteTime); string Storage_name = fStorage.back()->GetName(); @@ -791,7 +793,7 @@ void Scenario::ProgressPrintout(cSecond t) else cout << endl; - INFO << " Proccessed" << (int)Time << " / " << (int)Total << " Years \r" << endl; + INFO << " Proccessed " << (int)Time << " / " << (int)Total << " Years \r" << endl; }