From 8836ebcec79351a0e8a7796cf44413d133772e38 Mon Sep 17 00:00:00 2001
From: Fanny <fanny.courtin@subatech.in2p3.fr>
Date: Tue, 24 Jan 2017 10:51:39 +0100
Subject: [PATCH] Updating FP
---
source/include/EquivalenceModel.hxx | 9 +++------
source/src/EquivalenceModel.cxx | 4 ++--
source/src/FabricationPlant.cxx | 8 ++++----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/source/include/EquivalenceModel.hxx b/source/include/EquivalenceModel.hxx
index 03e4eb75c..739ecf206 100644
--- a/source/include/EquivalenceModel.hxx
+++ b/source/include/EquivalenceModel.hxx
@@ -80,7 +80,7 @@ class EquivalenceModel : public CLASSObject
\param double HMMass, Heavy metal mass needed
\param map < string , vector <IsotopicVector> > StreamArray, the string is the stream code (fissile fertile ,...) the IsotopicVector the fraction of each IV to take in the (fissile, fertile,..) stock .
*/
- virtual map <string , vector<double> > BuildFuel(double BurnUp, double HMMass, map < string , vector <IsotopicVector> > StreamArray);
+ virtual map <string , vector<double> > BuildFuel(double BurnUp, double HMMass, map < string , vector <IsotopicVector> > StreamArray, map < string , double> StreamListMassFractionMin, map < string , double> StreamListMassFractionMax, map < string , int> StreamListPriority, map < string , bool> StreamListIsBuffer);
//}
//@}
@@ -183,7 +183,7 @@ class EquivalenceModel : public CLASSObject
#endif
bool freaded;
- map< ZAI, pair<double,double> > fZAILimits; //!< Fresh fuel range : map<ZAI<min edge ,max edge >>
+ map< ZAI, pair<double,double> > fZAILimits; //!< Fresh fuel range : map<ZAI<min edge ,max edge >>
string fInformationFile; //!< file containing Reactor Type, Fuel type, HM mass, Power, time vector, and TMVA input variables names (looks the manual for format details)
string fDBFType; //!< Fuel Type (e.g MOX, UOX, ThU, ThPu ...)
@@ -194,12 +194,9 @@ class EquivalenceModel : public CLASSObject
*/
//@{
map <string , double > fTotalMassInStocks; //!< Total mass in each vector of stock
- map <string , double > fLambdaMax; //!< Total lambda of available stocks
+ map <string , double > fLambdaMax; //!< Total lambda of available stocks
//@}
-
-
-
};
#endif
diff --git a/source/src/EquivalenceModel.cxx b/source/src/EquivalenceModel.cxx
index dab4bd161..8c8fc6b96 100644
--- a/source/src/EquivalenceModel.cxx
+++ b/source/src/EquivalenceModel.cxx
@@ -322,7 +322,7 @@ void EquivalenceModel::SetLambdaToErrorCode(vector<double>& lambda)
lambda.push_back(-1);
}
- else // other errors (no enought material or too many steps)
+ else // other errors (no enough material or too many steps)
{
for( int i=0; i < (int)lambda.size(); i++)
{
@@ -333,7 +333,7 @@ void EquivalenceModel::SetLambdaToErrorCode(vector<double>& lambda)
}
//________________________________________________________________________
-map <string , vector<double> > EquivalenceModel::BuildFuel(double BurnUp, double HMMass, map < string , vector <IsotopicVector> > StreamArray)
+map <string , vector<double> > EquivalenceModel::BuildFuel(double BurnUp, double HMMass, map < string , vector <IsotopicVector> > StreamArray, map < string , double> StreamListMassFractionMin, map < string , double> StreamListMassFractionMax, map < string , int> StreamListPriority, map < string , bool> StreamListIsBuffer)
{
DBGL
diff --git a/source/src/FabricationPlant.cxx b/source/src/FabricationPlant.cxx
index ef077c1bb..c6cb56aad 100644
--- a/source/src/FabricationPlant.cxx
+++ b/source/src/FabricationPlant.cxx
@@ -254,10 +254,10 @@ void FabricationPlant::BuildFuelForReactor(int ReactorId, cSecond t)
// Construit les stocks de matière infini (=taille du réacteur)
// string="MA, .." LambdaArray = tableau sur les IV
- map < string , vector <double> > LambdaArray = FuelType->GetEquivalenceModel()->BuildFuel(R_BU, R_HM_Mass, fStreamArray);
+ map < string , vector <double> > LambdaArray = FuelType->GetEquivalenceModel()->BuildFuel(R_BU, R_HM_Mass, fStreamArray, fStreamListMassFractionMin, fStreamListMassFractionMax, fStreamListPriority, fStreamListIsBuffer);
- fFuelCanBeBuilt = true;
- double LambdaSum = 0;
+ fFuelCanBeBuilt = true;
+ double LambdaSum = 0;
map < string, IsotopicVector>::iterator it_s_IV;
@@ -347,7 +347,7 @@ void FabricationPlant::BuildFuelForReactor(int ReactorId, cSecond t)
for( it_s_vD = LambdaArray.begin(); it_s_vD != LambdaArray.end(); it_s_vD++)
LambdaArray[(*it_s_vD).first].clear();
- LambdaArray = FuelType->GetEquivalenceModel()->BuildFuel(R_BU, R_HM_Mass, fStreamArray);
+ LambdaArray = FuelType->GetEquivalenceModel()->BuildFuel(R_BU, R_HM_Mass, fStreamArray, fStreamListMassFractionMin, fStreamListMassFractionMax, fStreamListPriority, fStreamListIsBuffer);
IsotopicVector IV = BuildFuelFromEqModel(LambdaArray);
//Generating the EvolutionData
--
GitLab