From 1d2b6a6330d9eebab4410142f64278161ac68f96 Mon Sep 17 00:00:00 2001
From: Baptiste LENIAU <baptiste.leniau@subatech.in2p3.fr>
Date: Wed, 29 Jul 2015 16:50:23 +0000
Subject: [PATCH] Wrong keyword value corrected
git-svn-id: svn+ssh://svn.in2p3.fr/class@717 0e7d625b-0364-4367-a6be-d5be4a48d228
---
.../branches/BaM_Dev/src/EquivalenceModel.cxx | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/source/branches/BaM_Dev/src/EquivalenceModel.cxx b/source/branches/BaM_Dev/src/EquivalenceModel.cxx
index 095489684..6012c1de0 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);
}
--
GitLab