From 7a0022b0b549ee061ee803c403dd4a1822410905 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Thu, 10 Jul 2014 09:14:17 +0000
Subject: [PATCH] git-svn-id: svn+ssh://svn.in2p3.fr/class@339
0e7d625b-0364-4367-a6be-d5be4a48d228
---
source/branches/CLASSV3/Model/Equivalence/EQM_LIN_PWR_MOX.cxx | 2 +-
source/branches/CLASSV3/src/EvolutionData.cxx | 2 +-
source/branches/CLASSV3/src/FabricationPlant.cxx | 2 +-
source/branches/CLASSV3/src/Scenario.cxx | 4 +++-
4 files changed, 6 insertions(+), 4 deletions(-)
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 c1ab6c930..d007107fb 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 3f45095cc..779f596a7 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 96c938c8e..e1c1de072 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 8e69bc3a4..f34e6003f 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;
}
--
GitLab