From c0c9d0ab2811cddfebee6a81f3afe8c4cb079381 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Wed, 24 Jun 2015 20:21:30 +0000
Subject: [PATCH] bug correction
git-svn-id: svn+ssh://svn.in2p3.fr/class@677 0e7d625b-0364-4367-a6be-d5be4a48d228
---
source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx | 1 -
source/branches/BaM_Dev/src/XSModel.cxx | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx b/source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx
index f009774bb..48f96a73d 100644
--- a/source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx
+++ b/source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx
@@ -131,7 +131,6 @@ void XSM_MLP::ReadTimeSteps(const string &line)
while( pos < (int)line.size() )
fMLP_Time.push_back( atof( (StringLine::NextWord(line,pos,' ')).c_str() ));
-
DBGL
}
diff --git a/source/branches/BaM_Dev/src/XSModel.cxx b/source/branches/BaM_Dev/src/XSModel.cxx
index 24b0acea8..f2dcd6360 100644
--- a/source/branches/BaM_Dev/src/XSModel.cxx
+++ b/source/branches/BaM_Dev/src/XSModel.cxx
@@ -43,10 +43,10 @@ void XSModel::ReadNFO()
{
string line;
getline(NFO,line);
-
+
XSModel::ReadLine(line);
- } while(NFO.eof());
+ } while(!NFO.eof());
DBGL
}
@@ -93,7 +93,7 @@ void XSModel::ReadRParam(const string &line)
DBGL
int pos = 0;
string keyword = tlc(StringLine::NextWord(line, pos, ' '));
- if( keyword != "k_power" || keyword != "k_mass" ) // Check the keyword
+ if( keyword != "k_power" && keyword != "k_mass" ) // Check the keyword
{
ERROR << " Bad keyword : " << keyword << " Not found !" << endl;
exit(1);
@@ -112,7 +112,7 @@ void XSModel::ReadType(const string &line)
DBGL
int pos = 0;
string keyword = tlc(StringLine::NextWord(line, pos, ' '));
- if( keyword != "k_fuel" || keyword != "k_reactor" ) // Check the keyword
+ if( keyword != "k_fuel" && keyword != "k_reactor" ) // Check the keyword
{
ERROR << " Bad keyword : " << keyword << " Not found !" << endl;
exit(1);
--
GitLab