From 3a5b07188b7dc7d71f7f655deaad6d5dfea67f50 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Tue, 24 Feb 2015 13:16:57 +0000
Subject: [PATCH] cleaning many include...
debuging decay chain plot
git-svn-id: svn+ssh://svn.in2p3.fr/class@622 0e7d625b-0364-4367-a6be-d5be4a48d228
---
source/trunk/include/CLASSBackEnd.hxx | 2 --
source/trunk/include/CLASSConstante.hxx | 12 ++++++------
source/trunk/include/CLASSFacility.hxx | 2 --
source/trunk/include/CLASSHeaders.hxx | 1 -
source/trunk/include/DecayDataBank.hxx | 2 --
source/trunk/include/Reactor.hxx | 1 -
source/trunk/src/DecayDataBank.cxx | 5 ++---
source/trunk/src/FabricationPlant.cxx | 1 -
source/trunk/src/SeparationPlant.cxx | 2 --
source/trunk/src/ZAIMass.cxx | 1 -
10 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/source/trunk/include/CLASSBackEnd.hxx b/source/trunk/include/CLASSBackEnd.hxx
index 4241d99c2..451866eca 100644
--- a/source/trunk/include/CLASSBackEnd.hxx
+++ b/source/trunk/include/CLASSBackEnd.hxx
@@ -22,8 +22,6 @@
using namespace std;
-typedef long long int cSecond;
-
//-----------------------------------------------------------------------------//
//! Class defining the common properties of all back end fuel cycle facilities
diff --git a/source/trunk/include/CLASSConstante.hxx b/source/trunk/include/CLASSConstante.hxx
index 1c23fb85f..489b48acd 100644
--- a/source/trunk/include/CLASSConstante.hxx
+++ b/source/trunk/include/CLASSConstante.hxx
@@ -9,14 +9,14 @@
typedef long long int cSecond;
-const double AVOGADRO = 6.02214129e23; // Avogadro Number [1/mol]
+static const double AVOGADRO = 6.02214129e23; // Avogadro Number [1/mol]
-const ZAIMass cZAIMass; // Mass list of all nuclei stored in [g/mol]
-const ZAIHeat cZAIHeat; // Thermal power list of all nuclei [W/nucleus]
-const ZAITox cZAITox;
+static const ZAIMass cZAIMass; // Mass list of all nuclei stored in [g/mol]
+static const ZAIHeat cZAIHeat; // Thermal power list of all nuclei [W/nucleus]
+static const ZAITox cZAITox;
-const cSecond cYear = 3600*24*365.25; // Seconds in a year
-DecayDataBank cDecayData; // Seconds in a year
+static const cSecond cYear = 3600*24*365.25; // Seconds in a year
+static DecayDataBank cDecayData; // Seconds in a year
#endif
diff --git a/source/trunk/include/CLASSFacility.hxx b/source/trunk/include/CLASSFacility.hxx
index 05807c986..9897e97b2 100644
--- a/source/trunk/include/CLASSFacility.hxx
+++ b/source/trunk/include/CLASSFacility.hxx
@@ -14,12 +14,10 @@
#include "CLASSObject.hxx"
#include "IsotopicVector.hxx"
-#include "DecayDataBank.hxx"
#include "TNamed.h"
using namespace std;
-typedef long long int cSecond;
class Scenario;
//-----------------------------------------------------------------------------//
diff --git a/source/trunk/include/CLASSHeaders.hxx b/source/trunk/include/CLASSHeaders.hxx
index 5fc0561f9..08575e6ac 100755
--- a/source/trunk/include/CLASSHeaders.hxx
+++ b/source/trunk/include/CLASSHeaders.hxx
@@ -18,6 +18,5 @@
#include "EvolutionData.hxx"
#include "PhysicsModels.hxx"
-#include "DecayDataBank.hxx"
#endif
diff --git a/source/trunk/include/DecayDataBank.hxx b/source/trunk/include/DecayDataBank.hxx
index 0c6902efe..e9a3d7615 100644
--- a/source/trunk/include/DecayDataBank.hxx
+++ b/source/trunk/include/DecayDataBank.hxx
@@ -8,10 +8,8 @@
*/
#include "CLASSObject.hxx"
-#include "TMatrix.h"
#include "EvolutionData.hxx"
#include "IsotopicVector.hxx"
-#include "DynamicalSystem.hxx"
#include <map>
#include <vector>
diff --git a/source/trunk/include/Reactor.hxx b/source/trunk/include/Reactor.hxx
index 79771e22d..9728d9f3d 100755
--- a/source/trunk/include/Reactor.hxx
+++ b/source/trunk/include/Reactor.hxx
@@ -16,7 +16,6 @@
#include "CLASSFuelPlan.hxx"
using namespace std;
-typedef long long int cSecond;
class CLASSBackEnd;
diff --git a/source/trunk/src/DecayDataBank.cxx b/source/trunk/src/DecayDataBank.cxx
index 6a854d194..5ddaf2efb 100644
--- a/source/trunk/src/DecayDataBank.cxx
+++ b/source/trunk/src/DecayDataBank.cxx
@@ -1,6 +1,5 @@
#include "DecayDataBank.hxx"
-#include "IsotopicVector.hxx"
#include "CLASSLogger.hxx"
#include "StringLine.hxx"
@@ -31,7 +30,7 @@ DecayDataBank::DecayDataBank():CLASSObject(new CLASSLogger("DecayDataBank.log"))
string CLASSPATH = getenv("CLASS_PATH");
string DB_index_file = CLASSPATH + "/data/DECAY/Decay.idx";
fDataBaseIndex = DB_index_file;
- fOldReadMethod = olfreadmethod;
+ fOldReadMethod = false;
fFastCalculation = true;
// Warning
@@ -213,7 +212,7 @@ IsotopicVector DecayDataBank::GetDecay(IsotopicVector isotopicvector, cSecond t)
cSecond remainingTime = t;
for(int i = 16; i >= 0; i--)
{
- evolutionDecade[i] = (int)remainingTime/pow(10,i);
+ evolutionDecade[i] = (cSecond)remainingTime/pow(10,i);
remainingTime -= evolutionDecade[i]*pow(10,i);
}
diff --git a/source/trunk/src/FabricationPlant.cxx b/source/trunk/src/FabricationPlant.cxx
index 441ea8902..1534fd18f 100644
--- a/source/trunk/src/FabricationPlant.cxx
+++ b/source/trunk/src/FabricationPlant.cxx
@@ -3,7 +3,6 @@
#include "Storage.hxx"
#include "Reactor.hxx"
#include "EvolutionData.hxx"
-#include "DecayDataBank.hxx"
#include "PhysicsModels.hxx"
#include "IsotopicVector.hxx"
#include "Scenario.hxx"
diff --git a/source/trunk/src/SeparationPlant.cxx b/source/trunk/src/SeparationPlant.cxx
index 5cd68fdd1..c9781b914 100644
--- a/source/trunk/src/SeparationPlant.cxx
+++ b/source/trunk/src/SeparationPlant.cxx
@@ -1,7 +1,5 @@
#include "SeparationPlant.hxx"
-#include "IsotopicVector.hxx"
-#include "Storage.hxx"
#include "Scenario.hxx"
#include "CLASSLogger.hxx"
diff --git a/source/trunk/src/ZAIMass.cxx b/source/trunk/src/ZAIMass.cxx
index ec95f3289..de948ee16 100644
--- a/source/trunk/src/ZAIMass.cxx
+++ b/source/trunk/src/ZAIMass.cxx
@@ -42,7 +42,6 @@ ZAIMass::ZAIMass()
}
infile.close();
-
}
--
GitLab