diff --git a/source/branches/BaM_Dev/src/EquivalenceModel.cxx b/source/branches/BaM_Dev/src/EquivalenceModel.cxx index 0954896845c858073e0cc3da966bcb94ffb881d1..6012c1de0d00ab9974afb41f32fcc765fec5f973 100644 --- a/source/branches/BaM_Dev/src/EquivalenceModel.cxx +++ b/source/branches/BaM_Dev/src/EquivalenceModel.cxx @@ -76,13 +76,13 @@ void EquivalenceModel::ReadLine(string line) void EquivalenceModel::LoadKeyword() { DBGL - fKeyword.insert( pair<string, EQM_MthPtr>( "k_zail", & EquivalenceModel::ReadZAIlimits)); - fKeyword.insert( pair<string, EQM_MthPtr>( "k_reactor", & EquivalenceModel::ReadType) ); - fKeyword.insert( pair<string, EQM_MthPtr>( "k_fuel", & EquivalenceModel::ReadType) ); - fKeyword.insert( pair<string, EQM_MthPtr>( "k_fissil", & EquivalenceModel::ReadFissil) ); - fKeyword.insert( pair<string, EQM_MthPtr>( "k_fertil", & EquivalenceModel::ReadFertil) ); - fKeyword.insert( pair<string, EQM_MthPtr>( "k_specpower", & EquivalenceModel::ReadSpecificPower)); - fKeyword.insert( pair<string, EQM_MthPtr>( "k_fertil", & EquivalenceModel::ReadMaximalContent)); + fKeyword.insert( pair<string, EQM_MthPtr>( "k_zail", & EquivalenceModel::ReadZAIlimits)); + fKeyword.insert( pair<string, EQM_MthPtr>( "k_reactor", & EquivalenceModel::ReadType) ); + fKeyword.insert( pair<string, EQM_MthPtr>( "k_fuel", & EquivalenceModel::ReadType) ); + fKeyword.insert( pair<string, EQM_MthPtr>( "k_fissil", & EquivalenceModel::ReadFissil) ); + fKeyword.insert( pair<string, EQM_MthPtr>( "k_fertil", & EquivalenceModel::ReadFertil) ); + fKeyword.insert( pair<string, EQM_MthPtr>( "k_specpower", & EquivalenceModel::ReadSpecificPower)); + fKeyword.insert( pair<string, EQM_MthPtr>( "k_maxfiscontent", & EquivalenceModel::ReadMaximalContent)); DBGL } //________________________________________________________________________ @@ -195,9 +195,9 @@ void EquivalenceModel::ReadMaximalContent(const string &line) DBGL int pos = 0; string keyword = tlc(StringLine::NextWord(line, pos, ' ').c_str()); - if( keyword != "k_contentmax") // Check the keyword + if( keyword != "k_maxfiscontent") // Check the keyword { - ERROR << " Bad keyword : \"k_contentmax\" Not found !" << endl; + ERROR << " Bad keyword : \"k_maxfiscontent\" Not found !" << endl; exit(1); }