diff --git a/source/branches/CLASSV3/include/CLASS.hxx b/source/branches/CLASSV3/include/CLASS.hxx
index 45eb760e5636068f2e7af86eba301e1471239d91..3d48b925cbe1c686dd3962aad419643dd4a7dbbb 100755
--- a/source/branches/CLASSV3/include/CLASS.hxx
+++ b/source/branches/CLASSV3/include/CLASS.hxx
@@ -200,7 +200,7 @@ public :
IsotopicVector GetGod() const { return fGod; } //!< Return the God Providings IsotopicVector
- void AddGodIncome(ZAI zai, double quantity) { AddGod(zai*quantity); } //!< Add a ZAI*quantity to GodIncome
+ void AddGod(ZAI zai, double quantity) { AddGod(zai*quantity); } //!< Add a ZAI*quantity to GodIncome
void AddGod(IsotopicVector isotopicvector) { fGod.Add(isotopicvector); } //!< Add a isotopicVector to GodIncome
void AddWaste(ZAI zai, double quantity) { AddWaste(zai*quantity); } //!< Add a ZAI*quantity to Waste
void AddWaste(IsotopicVector isotopicvector) { fWaste.Add(isotopicvector); } //!< Add a isotopicVector to Waste
diff --git a/source/branches/CLASSV3/include/CLASSBackEnd.hxx b/source/branches/CLASSV3/include/CLASSBackEnd.hxx
index 7a84b0061193bf94fb91b0de94e3906dc3880baa..ee6e40ac07f386e7f0213b9870fa5f350bdeee94 100644
--- a/source/branches/CLASSV3/include/CLASSBackEnd.hxx
+++ b/source/branches/CLASSV3/include/CLASSBackEnd.hxx
@@ -52,12 +52,17 @@ class CLASSBackEnd : public CLASSFacility
//@{
DecayDataBank* GetDecayDataBank() { return fDecayDataBase;} //!< Return the pointer to the decay DataBank
+
vector<IsotopicVector> GetIVArray() const { return fIVArray; } //!< Return the IsotopicVector Array
+ vector<cSecond> GetIVArrayArrivalTime() const { return fIVArrayArrivalTime;} //!<Return the pointer to the OUtBackEndFacility
+
int GetIVNumber() const { return fIVArray.size();}
bool GetStorageType() const { return fIsStorageType;} //!< Return the storageType
CLASSBackEnd* GetOutBackEndFacility() const { return fOutBackEndFacility;} //!<Return the pointer to the OUtBackEndFacility
- IsotopicVector GetIV(int i) const { if(i < (int)fIVArray.size()) return fIVArray[i];
+ IsotopicVector GetIV(int i) const { if(i < (int)fIVArray.size()) return fIVArray[i];
else return IsotopicVector(); }
+
+
//@}
//********* Set Method *********//
@@ -87,6 +92,7 @@ class CLASSBackEnd : public CLASSFacility
protected :
IsotopicVector GetDecay(IsotopicVector isotopicvector, cSecond t); //!< Get IsotopicVector Decay at the t time
vector<IsotopicVector> fIVArray; ///< Vector containning all the fuel stored.
+ vector<cSecond> fIVArrayArrivalTime; ///< Vector containning all the fuel stored.
CLASSBackEnd* fOutBackEndFacility; //!< Facility getting the fuel at the end of the cycle
//********* Internal Parameter *********//
diff --git a/source/branches/CLASSV3/include/FabricationPlant.hxx b/source/branches/CLASSV3/include/FabricationPlant.hxx
index 54c2cede56ed90037c74a116190a8386375ca371..b919caa3be42699aa8c565ef57081870deb01481 100644
--- a/source/branches/CLASSV3/include/FabricationPlant.hxx
+++ b/source/branches/CLASSV3/include/FabricationPlant.hxx
@@ -88,9 +88,8 @@ public :
void SetDecayDataBank(DecayDataBank* decayDB) {fDecayDataBase = decayDB;} //! Set the Decay DataBank
void SetUpdateReferenceDBatEachStep(bool val){ fUpdateReferenceDBatEachStep = val;} //!< Set fUpdateReferenceDBatEachStep variable
- void SetStorage(Storage* storage) { fStorage = storage; } //!< Set the Pointer to the Storage
-
- void SetChronologicalTimePriority(bool bval = true) { fChronologicalTimePriority = bval;} //!< Set the chronological priority (true for chronological, false unstead)
+
+ void SetFiFo(bool bval = true) { fFiFo = bval;} //!< Set the chronological priority (true for chronological, false unstead)
void SetSubstitutionFuel(EvolutionData fuel); //!< To use a subtition fuel if the fabrication fail (not enough material in stock)
@@ -108,13 +107,12 @@ public :
*/
//@{
- Storage* GetStorage() { return fStorage; } //!< Return the Pointer to the Storage
-
+ vector<Storage*> GetFissileStorage() { return fFissileStorage; } //!< Return the Pointer to the Storage
+ vector<Storage*> GetFertileStorage() { return fFertileStorage; } //!< Return the Pointer to the Storage
+
map<int, IsotopicVector > GetReactorFuturIncome() const
{ return fReactorFuturIV;} //!< Return the List of the Futur Fuel IV
- IsotopicVector GetFullFabrication(); //!< Return the Sum of all Fuel waiting to be put in a reator
-
EvolutionData GetReactorEvolutionDB(int ReactorId); //!< Return the EvolutionData of Reactor ReactorId
IsotopicVector GetDecay(IsotopicVector isotopicvector, cSecond t); //!< Get IsotopicVector Decay at the t time
@@ -132,18 +130,20 @@ public :
*/
//@{
- void SetSeparartionEfficiencyIV(ZAI zai, double factor); ///< Add Valorisable Element
- void Evolution(cSecond t); //!< Perform the Evolution
- virtual void BuildFuelForReactor(int ReactorId); //!< Build a Fuel for the reactor ReactorId
- void RecycleStock(double fraction); //!< Take a franction of the current stock
- IsotopicVector GetStockToRecycle(); //!< Get the next stock to recycle
- void DumpStock(); //!< Update the Stock status after building process
- EvolutionData BuildEvolutiveDB(int ReactorId, IsotopicVector isotopicvector);
- //!< Build the Evolution Database for the Reactir ReactorId Fuel
- void TakeReactorFuel(int ReactorId) ; //!< Remove the Fuel of reactor ReactorId
+ void SetSeparartionEfficiencyIV(ZAI zai, double factor); ///< Add Valorisable Element
+ void Evolution(cSecond t); //!< Perform the Evolution
+
+ void BuildFuelForReactor(int ReactorId); //!< Build a Fuel for the reactor ReactorId
+ void DumpStock(vector<double> lambdaArray); //!< Update the Stock status after building process
+ void TakeReactorFuel(int ReactorId) ; //!< Remove the Fuel of reactor ReactorId
- void BuildFissileArray(IsotopicVector FissileList);
+
+ void BuildFissileArray();
+ void BuildFertileArray();
+ IsotopicVector BuildFuelFromEqModel(vector<double> LambdaArray);
+
+ void SortArray(int i);
//@}
@@ -161,15 +161,22 @@ protected :
map< int,IsotopicVector > fReactorFuturIV; ///< List of the Futur Fuel Isotopic Vector used in the reactor
- Storage* fStorage;
- vector<Storage*> fFissileStorage; //!< Pointer to the Storage to recycle used to get the fissile part of the fuel
- vector<Storage*> fFertileStorage; //!< Pointer to the Storage to recycle used to get the fertile part of the fuel
- Storage* fReUsable; //!< Pointer to the Storage using for recycling unused Product
+ vector<Storage*> fFissileStorage; //!< Pointer to the Storage to recycle used to get the fissile part of the fuel
+ vector<IsotopicVector> fFissileArray;
+ vector<cSecond> fFissileArrayTime;
+ vector< pair<int,int> > fFissileArrayAdress;
+ IsotopicVector fFissileList;
- vector< pair<int, double> > fFractionToTake; //!< The Temporary Storage IsotopicVector
+ vector<Storage*> fFertileStorage; //!< Pointer to the Storage to recycle used to get the fertile part of the fuel
+ vector<IsotopicVector> fFertileArray;
+ vector<cSecond> fFertileArrayTime;
+ vector< pair<int,int> > fFertileArrayAdress;
+ IsotopicVector fFertileList;
+
+ Storage* fReUsable; //!< Pointer to the Storage using for recycling unused Product
- bool fChronologicalTimePriority; //!< Set the Chronological Priotity (for the Stock Management) or the anti-chronological one
+ bool fFiFo; //!< Set the First In First Out
bool fSubstitutionFuel; //!< true if a subtitution fuel as been set
EvolutionData fSubstitutionEvolutionData; //!< EvolutionData of the subtitution fuel
diff --git a/source/branches/CLASSV3/include/IrradiationModel.hxx b/source/branches/CLASSV3/include/IrradiationModel.hxx
index e0e3915f7ee458653dce52e239948941cb0ce8f1..4c28397a817f4260054e166a0b8cc2241975e3c3 100644
--- a/source/branches/CLASSV3/include/IrradiationModel.hxx
+++ b/source/branches/CLASSV3/include/IrradiationModel.hxx
@@ -56,7 +56,7 @@ class IrradiationModel : public CLASSObject
\param double Power, constant power to use for irradation
\param double irradiationtime, time of the irradiation
*/
- virtual EvolutionData GenerateEvolutionData(IsotopicVector IV, EvolutionData XSSet, double Power, double cycletime) { return 0;}
+ virtual EvolutionData GenerateEvolutionData(IsotopicVector IV, EvolutionData XSSet, double Power, double cycletime) { return EvolutionData();}
//}
diff --git a/source/branches/CLASSV3/include/PhysicModels.hxx b/source/branches/CLASSV3/include/PhysicModels.hxx
index cc6fe9c187a3635a208bf2f4b3e84589cb23cdf5..d2bbd440e11d18da372b664b9949e9118ab4653f 100644
--- a/source/branches/CLASSV3/include/PhysicModels.hxx
+++ b/source/branches/CLASSV3/include/PhysicModels.hxx
@@ -11,10 +11,11 @@
@authors BLG,BaM
@version 1.0
*/
- #include "CLASSObject.hxx"
- #include "EquivalenceModel.hxx"
- #include "XSModel.hxx"
- #include "IrradiationModel.hxx"
+#include "CLASSObject.hxx"
+#include "EquivalenceModel.hxx"
+#include "XSModel.hxx"
+#include "IrradiationModel.hxx"
+#include "EvolutionData.hxx"
using namespace std;
diff --git a/source/branches/CLASSV3/include/Pool.hxx b/source/branches/CLASSV3/include/Pool.hxx
index 3198f6bee272b3ab807df8495275c706a2fda3bd..5f452de38ceb46876e7452b09eac9e39922a285f 100755
--- a/source/branches/CLASSV3/include/Pool.hxx
+++ b/source/branches/CLASSV3/include/Pool.hxx
@@ -122,7 +122,7 @@ public :
//@{
vector<cSecond> GetCoolingStartingTime() const
- { return fCoolingStartingTime; } //!< Return the vector of Cooling Sstarting Time
+ { return GetIVArrayArrivalTime(); } //!< Return the vector of Cooling Sstarting Time
void RemoveIVCooling(int i); //!< Remove a Cooling IsotopicVector
void AddIV(IsotopicVector isotopicvector); //!< Add an Isotopicvector to the IVArray
@@ -154,7 +154,6 @@ protected :
//********* Isotopic Quantity *********//
//--------- Cooling ---------//
- vector<cSecond> fCoolingStartingTime; ///< Vector of the Cooling Starting Time
vector<int> fCoolingIndex; ///< Vector of the Cooling Index
int fCoolingLastIndex; //!< Number of Cooling IV Treated
vector<int> fCoolingEndOfCycle; //!< Index of the Cooling IV reaching the End of a Cooling Cycle
diff --git a/source/branches/CLASSV3/include/Reactor.hxx b/source/branches/CLASSV3/include/Reactor.hxx
index 06c8ab9ce9f32338a39b1fc2b9ccfde66b0e32ed..d353b016641bed2143438b181036b1561750d554 100755
--- a/source/branches/CLASSV3/include/Reactor.hxx
+++ b/source/branches/CLASSV3/include/Reactor.hxx
@@ -21,7 +21,7 @@ class CLASS;
class CLASSBackEnd;
//class Pool;
class EvolutionData;
-class FuelDataBank;
+class PhysicModels;
class FabricationPlant;
class Storage;
class LogFile;
@@ -72,7 +72,7 @@ public :
\param creationtime creation time
\param lifetime working time duration.
*/
- Reactor(LogFile* log, FuelDataBank* fueltypeDB,
+ Reactor(LogFile* log, PhysicModels* fueltypeDB,
FabricationPlant* fabricationplant, CLASSBackEnd* Pool,
cSecond creationtime , cSecond lifetime);
//}
@@ -90,7 +90,7 @@ public :
\param HMMass Mass of Heavy Metal in the Reactor
\param BurnUp Burnup reach by the fuel at the end of the cycle
*/
- Reactor(LogFile* log, FuelDataBank* fueltypeDB,
+ Reactor(LogFile* log, PhysicModels* fueltypeDB,
FabricationPlant* fabricationplant, CLASSBackEnd* Pool,
cSecond creationtime , cSecond lifetime, cSecond cycletime,
double HMMass, double BurnUp);
@@ -110,7 +110,7 @@ public :
\param BurnUp Burnup reach by the fuel at the end of the cycle
\param ChargeFactor effective charge of the reactor.
*/
- Reactor(LogFile* log, FuelDataBank* fueltypeDB,
+ Reactor(LogFile* log, PhysicModels* fueltypeDB,
FabricationPlant* fabricationplant, CLASSBackEnd* Pool,
cSecond creationtime , cSecond lifetime,
double Power, double HMMass, double BurnUp, double ChargeFactor);
@@ -159,7 +159,7 @@ public :
EvolutionData GetEvolutionDB() const { return fEvolutionDB; } //!< Return the Evolution database of the Fuel
- FuelDataBank* GetFuelType() const { return fFuelTypeDB; } //!< Return the Fuel Type DB of the reactor
+ PhysicModels* GetFuelType() const { return fFuelTypeDB; } //!< Return the Fuel Type DB of the reactor
CLASSBackEnd* GetOutBackEndFacility() const { return fOutBackEndFacility; } //!< Return the pointer to Associeted BackEnd Facility
FabricationPlant* GetFabricationPlant() const { return fFabricationPlant; } //!< Return the Pointer to the FabricationPlant
@@ -246,7 +246,7 @@ protected :
Storage* fStorage; //!< Pointer to the Stock (only for reprocessing fuel in fixed base...)
EvolutionData fEvolutionDB; //!< Pointer to the Evolution DataBase
- FuelDataBank* fFuelTypeDB; //! Pointer to a Fuel Type Database
+ PhysicModels* fFuelTypeDB; //! Pointer to a Fuel Type Database
double fPower; ///< Power (in Watt)
diff --git a/source/branches/CLASSV3/src/CLASS.cxx b/source/branches/CLASSV3/src/CLASS.cxx
index 28e7e4cec2ddcffa2321cdd98e294672b40c9172..121a82dee5789fe2ae945e04e646fe375a16fffb 100755
--- a/source/branches/CLASSV3/src/CLASS.cxx
+++ b/source/branches/CLASSV3/src/CLASS.cxx
@@ -807,7 +807,7 @@ void CLASS::UpdateParc()
ResetQuantity();
for(int i =0; i < (int)fFabricationPlant.size(); i++)
- fFuelFabrication += fFabricationPlant[i]->GetFullFabrication();
+ fFuelFabrication += fFabricationPlant[i]->GetInsideIV();
for(int i = 0; i < (int) fPool.size();i++)
fTotalCooling += fPool[i]->GetInsideIV();
diff --git a/source/branches/CLASSV3/src/CLASSBackEnd.cxx b/source/branches/CLASSV3/src/CLASSBackEnd.cxx
index b4918507140e61db026e74b0c8420a26fe062550..10568fa43a32a843439fbc8b355fda93531defba 100644
--- a/source/branches/CLASSV3/src/CLASSBackEnd.cxx
+++ b/source/branches/CLASSV3/src/CLASSBackEnd.cxx
@@ -44,6 +44,7 @@ void CLASSBackEnd::ClearIVArray()
IsotopicVector EmptyIV;
fInsideIV = EmptyIV;
fIVArray.clear();
+ fIVArrayArrivalTime.clear();
}
//________________________________________________________________________
@@ -53,6 +54,8 @@ void CLASSBackEnd::AddIV(IsotopicVector isotopicvector)
AddCumulativeIVIn(isotopicvector);
fIVArray.push_back(isotopicvector);
+ fIVArrayArrivalTime.push_back(fInternalTime);
+
}
diff --git a/source/branches/CLASSV3/src/FabricationPlant.cxx b/source/branches/CLASSV3/src/FabricationPlant.cxx
index c270b9a94e827e71f122ed63685cbee0ac1419d9..6150b0f92d466ccf99a71acc54f02a5847a4cc19 100644
--- a/source/branches/CLASSV3/src/FabricationPlant.cxx
+++ b/source/branches/CLASSV3/src/FabricationPlant.cxx
@@ -48,7 +48,6 @@ FabricationPlant::FabricationPlant():CLASSFacility()
SetFacilityType(16);
SetName("F_FabricationPLant.");
- fStorage = 0;
fReUsable = 0;
}
@@ -58,7 +57,7 @@ FabricationPlant::FabricationPlant(LogFile* log, double fabricationtime):CLASSFa
SetFacilityType(16);
SetName("F_FabricationPLant.");
- fChronologicalTimePriority = false;
+ fFiFo = false;
fUpdateReferenceDBatEachStep = false;
fSubstitutionFuel = false;
@@ -123,8 +122,7 @@ void FabricationPlant::Evolution(cSecond t)
void FabricationPlant::FabricationPlantEvolution(cSecond t)
{
- IsotopicVector EmptyIV;
- fInsideIV = EmptyIV;
+ IsotopicVector fInsideIV;
map<int ,cSecond >::iterator it;
@@ -169,27 +167,250 @@ void FabricationPlant::BuildFuelForReactor(int ReactorId)
-// PhysicModels* FuelType = GetParc()->GetReactor()[ReactorId]->GetFuelType();
+ double R_HM_Mass = GetParc()->GetReactor()[ ReactorId ]->GetHeavyMetalMass();
+ double R_BU = GetParc()->GetReactor()[ ReactorId ]->GetBurnUp();
+ double R_CycleTime = GetParc()->GetReactor()[ ReactorId ]->GetCycleTime();
+ double R_Power = GetParc()->GetReactor()[ ReactorId ]->GetPower();
- PhysicModels* FuelType;
+ PhysicModels* FuelType = GetParc()->GetReactor()[ReactorId]->GetFuelType();
+ //PhysicModels* FuelType;
- IsotopicVector FissileList = FuelType->GetEquivalenceModel()->GetFissileList();
+ fFissileList = FuelType->GetEquivalenceModel()->GetFissileList();
+ BuildFissileArray();
+
+
+ fFertileList = FuelType->GetEquivalenceModel()->GetFertileList();
+
+
+
+
+ if(fFertileStorage.size() != 0) // If the fertile need to be taken in stock
+ BuildFertileArray();
+ else // if their is not stock and the fertile come from outside of the park
+ {
+ fFertileArray.push_back( fFertileList / fFertileList.GetTotalMass() * R_HM_Mass );
+ }
+
+
+ vector<double> LambdaArray = FuelType->GetEquivalenceModel()->BuildFuel(R_HM_Mass, R_BU, fFissileArray, fFertileArray);
+
+
+ if(LambdaArray[0] != -1)
+ {
+ IsotopicVector IV = BuildFuelFromEqModel(LambdaArray);
+ EvolutionData EvolDB = FuelType->GenerateEvolutionData( /*GetDecay(IV,fCycleTime)*/ IV , R_CycleTime, R_Power);
+
+ {
+ pair<map<int, IsotopicVector>::iterator, bool> IResult;
+ IResult = fReactorFuturIV.insert( pair<int, IsotopicVector>(ReactorId, IV) );
+ if(!IResult.second)
+ IResult.first->second = IV;
+ }
+ {
+ pair<map<int, EvolutionData>::iterator, bool> IResult;
+ IResult = fReactorFuturDB.insert( pair<int, EvolutionData>(ReactorId,EvolDB) );
+ if(!IResult.second)
+ IResult.first->second = EvolDB;
+ }
+ fInsideIV += IV;
+ AddCumulativeIVIn(IV);
+
+ return;
+ }
+ else
+ {
+
+ if (!fSubstitutionFuel)
+ {
+ {
+ EvolutionData EmptyDB;
+ pair<map<int, EvolutionData>::iterator, bool> IResult;
+ IResult = fReactorFuturDB.insert( pair<int, EvolutionData>(ReactorId,EmptyDB) );
+ if(!IResult.second)
+ IResult.first->second = EmptyDB;
+ }
+ {
+ IsotopicVector EmptyIV;
+ pair<map<int, IsotopicVector>::iterator, bool> IResult;
+ IResult = fReactorFuturIV.insert( pair<int, IsotopicVector>(ReactorId,EmptyIV) );
+ if(!IResult.second)
+ IResult.first->second = EmptyIV;
+ }
+ }
+ else
+ {
+
+ IsotopicVector IV = fSubstitutionEvolutionData.GetIsotopicVectorAt(0);
+ EvolutionData evolutiondb = fSubstitutionEvolutionData * R_HM_Mass / IV.GetTotalMass();
+
+ IV = IV* R_HM_Mass / IV.GetTotalMass();
+ {
+ pair<map<int, IsotopicVector>::iterator, bool> IResult;
+ IResult = fReactorFuturIV.insert( pair<int, IsotopicVector>(ReactorId, IV) );
+ if(!IResult.second)
+ IResult.first->second = IV;
+ }
+ {
+ pair<map<int, EvolutionData>::iterator, bool> IResult;
+ IResult = fReactorFuturDB.insert( pair<int, EvolutionData>(ReactorId,evolutiondb) );
+ if(!IResult.second)
+ IResult.first->second = evolutiondb;
+ }
+ GetParc()->AddGod( IV );
+ fInsideIV += IV;
+ AddCumulativeIVIn(IV);
+
+
+
+ }
+ return;
+ }
- BuildFissileArray(FissileList);
}
-void FabricationPlant::BuildFissileArray(IsotopicVector FissileList)
+void FabricationPlant::BuildFissileArray()
{
+ for(int i = 0; i < (int)fFissileStorage.size(); i++)
+ {
+ vector<IsotopicVector> IVArray = fFissileStorage[i]->GetIVArray();
+ for(int j = 0; j < (int)IVArray.size(); j++)
+ {
+
+ IsotopicVector SeparatedIV = Separation(IVArray[j], fFissileList).first;
+ IsotopicVector CooledSeparatedIV = GetDecay( SeparatedIV , GetCycleTime());
+
+ fFissileArray.push_back( CooledSeparatedIV );
+ fFissileArrayAdress.push_back( pair<int,int>(i,j) );
+ fFissileArrayTime.push_back(fFissileStorage[i]->GetIVArrayArrivalTime()[j]);
+ }
+
+ }
+ SortArray(0);
}
+void FabricationPlant::BuildFertileArray()
+{
+
+
+ for(int i = 0; i < (int)fFertileStorage.size(); i++)
+ {
+ vector<IsotopicVector> IVArray = fFertileStorage[i]->GetIVArray();
+ for(int j = 0; j < (int)IVArray.size(); j++)
+ {
+
+ IsotopicVector SeparatedIV = Separation(IVArray[j], fFertileList).first;
+ IsotopicVector CooledSeparatedIV = GetDecay( SeparatedIV , GetCycleTime());
+
+
+ fFertileArray.push_back( CooledSeparatedIV );
+ fFertileArrayAdress.push_back( pair<int,int>(i,j) );
+ fFertileArrayTime.push_back(fFertileStorage[i]->GetIVArrayArrivalTime()[j]);
+ }
+
+ }
+
+ SortArray(1);
+
+}
+
+void FabricationPlant::SortArray(int i)
+{
+
+
+ vector<IsotopicVector> IVArray;
+ vector<cSecond> TimeArray;
+ vector< pair<int,int> > AdressArray;
+
+ if(i==0) //Fissile
+ {
+ IVArray = fFissileArray;
+ TimeArray = fFissileArrayTime;
+ AdressArray = fFissileArrayAdress;
+ }
+ else if (i==1) //Fertile
+ {
+ IVArray = fFertileArray;
+ TimeArray = fFertileArrayTime;
+ AdressArray = fFertileArrayAdress;
+
+ }
+
+ if(fFiFo)
+ {
+ for(int j = 0; j < (int)TimeArray.size(); j++)
+ {
+ for (int k = j+1; k < (int)TimeArray.size(); k++)
+ {
+ cSecond time_tmp = TimeArray[j];
+ pair<int,int> Adress_tmp = AdressArray[j];
+ IsotopicVector IV_tmp = IVArray[j];
+
+ if(time_tmp > TimeArray[k])
+ {
+ TimeArray[j] = TimeArray[k];
+ TimeArray[k] = time_tmp;
+
+ AdressArray[j] = AdressArray[k];
+ AdressArray[k] = Adress_tmp;
+
+ IVArray[j] = IVArray[k];
+ IVArray[k] = IV_tmp;
+ }
+
+ }
+ }
+ }
+ else
+ {
+ for(int j = 0; j < (int)fFissileArrayTime.size(); j++)
+ {
+ for (int k = j+1; k < (int)TimeArray.size(); k++)
+ {
+ cSecond time_tmp = TimeArray[j];
+ pair<int,int> Adress_tmp = AdressArray[j];
+ IsotopicVector IV_tmp = IVArray[j];
+
+ if(time_tmp < TimeArray[k])
+ {
+ TimeArray[j] = TimeArray[k];
+ TimeArray[k] = time_tmp;
+
+ AdressArray[j] = AdressArray[k];
+ AdressArray[k] = Adress_tmp;
+
+ IVArray[j] = IVArray[k];
+ IVArray[k] = IV_tmp;
+ }
+
+ }
+ }
+ }
+
+
+ if(i==0) //Fissile
+ {
+ fFissileArray = IVArray;
+ fFissileArrayTime = TimeArray;
+ fFissileArrayAdress = AdressArray;
+ }
+ else if (i==1) //Fertile
+ {
+ fFertileArray = IVArray;
+ fFertileArrayTime = TimeArray;
+ fFertileArrayAdress = AdressArray;
+
+ }
+
+
+}
@@ -213,23 +434,6 @@ void FabricationPlant::SetSubstitutionFuel(EvolutionData fuel)
//________________________________________________________________________
//_____________________________ Reactor & DB _____________________________
//________________________________________________________________________
-EvolutionData FabricationPlant::BuildEvolutiveDB(int ReactorId,IsotopicVector isotopicvector)
-{
-
- FuelDataBank* evolutiondb = GetParc()->GetReactor()[ReactorId]->GetFuelType();
-
- isotopicvector = GetDecay(isotopicvector, GetCycleTime());
-
- EvolutionData EvolBuild;
-
-#pragma omp single
- {
- EvolBuild = evolutiondb->GenerateEvolutionData(isotopicvector, GetParc()->GetReactor()[ReactorId]->GetCycleTime(), GetParc()->GetReactor()[ReactorId]->GetPower());
- }
- return EvolBuild;
-
-}
-
//________________________________________________________________________
void FabricationPlant::TakeReactorFuel(int Id)
{
@@ -244,80 +448,115 @@ void FabricationPlant::TakeReactorFuel(int Id)
if (it2 != fReactorFuturIV.end())
(*it2).second = IV;
+
+ map< int,EvolutionData >::iterator it = fReactorFuturDB.find(Id);
+ (*it).second = EvolutionData();
+
}
- //________________________________________________________________________
+//________________________________________________________________________
EvolutionData FabricationPlant::GetReactorEvolutionDB(int ReactorId)
{
-
+
map< int,EvolutionData >::iterator it = fReactorFuturDB.find(ReactorId);
return (*it).second;
-
-}
-
-IsotopicVector FabricationPlant::GetFullFabrication()
-{
-
- IsotopicVector tmp = 0*ZAI(0,0,0);
-
- map<int, IsotopicVector > reactorNextStep = fReactorFuturIV;
- map<int, IsotopicVector >::iterator it;
- for ( it = reactorNextStep.begin(); it != reactorNextStep.end(); it++)
- tmp += (*it).second;
-
- return tmp;
-
}
-
//________________________________________________________________________
//_______________________________ Storage ________________________________
//________________________________________________________________________
-
-IsotopicVector FabricationPlant::GetStockToRecycle()
+IsotopicVector FabricationPlant::BuildFuelFromEqModel(vector<double> LambdaArray)
{
-
- IsotopicVector NextStock;
- int IdToTake = -1;
-
- if(fChronologicalTimePriority )
- IdToTake = (int)( fFractionToTake.size() );
- else
- IdToTake = (int)( fStorage->GetIVArray().size() -1 - fFractionToTake.size() );
+ IsotopicVector BuildedFuel;
+ IsotopicVector Lost;
- if(0 <= IdToTake && IdToTake < (int)fStorage->GetIVArray().size())
+ for(int i = 0; i < (int)fFissileArray.size(); i++)
{
- NextStock = fStorage->GetIVArray()[IdToTake];
- fFractionToTake.push_back( pair<int,double>(IdToTake,0.) );
+ if(LambdaArray[i] != 0)
+ {
+ int Stor_N = fFissileArrayAdress[i].first;
+ int IV_N = fFissileArrayAdress[i].second;
+
+ pair<IsotopicVector, IsotopicVector> Separated_Lost;
+ Separated_Lost = Separation( fFissileStorage[Stor_N]->GetIVArray()[IV_N]*LambdaArray[i], fFissileList);
+ BuildedFuel += Separated_Lost.first;
+ Lost += Separated_Lost.second;
+ }
}
- else NextStock += ZAI(-1,-1,-1) *1;
-
- return NextStock;
-
+
+ if(fFertileStorage.size() != 0)
+ {
+ for(int i = fFissileArray.size(); i < (int)(fFertileArray.size()+fFissileArray.size()); i++)
+ {
+ if(LambdaArray[i] != 0)
+ {
+ int Stor_N = fFertileArrayAdress[i].first;
+ int IV_N = fFertileArrayAdress[i].second;
+
+ pair<IsotopicVector, IsotopicVector> Separated_Lost;
+ Separated_Lost = Separation( fFertileStorage[Stor_N]->GetIVArray()[IV_N]*LambdaArray[i], fFissileList);
+ BuildedFuel += Separated_Lost.first;
+ Lost += Separated_Lost.second;
+ }
+ }
+ }
+ else
+ BuildedFuel += fFertileArray[0]*LambdaArray.back();
+
+ DumpStock(LambdaArray);
+
+
+ return BuildedFuel;
+
}
+
//________________________________________________________________________
-void FabricationPlant::RecycleStock(double fraction)
+void FabricationPlant::DumpStock(vector<double> LambdaArray)
{
-
- fFractionToTake.back().second = fraction;
-
-}
+ for(int i = 0; i < (int)fFissileArray.size(); i++)
+ {
+ if(LambdaArray[i] != 0)
+ {
+ int Stor_N = fFissileArrayAdress[i].first;
+ int IV_N = fFissileArrayAdress[i].second;
+ fFissileStorage[Stor_N]->TakeFractionFromStock( IV_N, LambdaArray[i] );
+ }
+ }
+ if(fFertileStorage.size() != 0)
+ {
+ for(int i = fFissileArray.size(); i < (int)(fFertileArray.size()+fFissileArray.size()); i++)
+ {
+ if(LambdaArray[i] != 0)
+ {
+ int Stor_N = fFertileArrayAdress[i].first;
+ int IV_N = fFertileArrayAdress[i].second;
+
+ fFertileStorage[Stor_N]->TakeFractionFromStock( IV_N, LambdaArray[i] );
+ }
+ }
+ }
+ else
+ GetParc()->AddGod( fFertileArray[0]*LambdaArray.back() );
- //________________________________________________________________________
-void FabricationPlant::DumpStock()
-{
+ //Clear the Building Array (Fissile and Fertile)
+ fFissileArray.clear();
+ fFissileArrayTime.clear();
+ fFissileArrayAdress.clear();
+ fFertileArray.clear();
+ fFertileArrayTime.clear();
+ fFertileArrayAdress.clear();
+ fFertileList = fFissileList = IsotopicVector();
}
//________________________________________________________________________
-//pair<IsotopicVector, IsotopicVector> FabricationPlant::Separation(IsotopicVector IVStock, IsotopicVector IVToExtract)
pair<IsotopicVector, IsotopicVector> FabricationPlant::Separation(IsotopicVector isotopicvector, IsotopicVector ExtractedList)
{
diff --git a/source/branches/CLASSV3/src/Makefile b/source/branches/CLASSV3/src/Makefile
index eb84ed95f915523c8acfb7b4083b4575da154899..3108e59e4ce1c8c1d18dd5cd083f9ab04f20d9da 100755
--- a/source/branches/CLASSV3/src/Makefile
+++ b/source/branches/CLASSV3/src/Makefile
@@ -22,8 +22,6 @@ OBJS = CLASS.o \
CLASSBackEnd.o CLASSBackEndDict.o\
Storage.o StorageDict.o\
FabricationPlant.o FabricationPlantDict.o \
- PWR_THU_FabricationPlant.o \
- PWR_THPU_FabricationPlant.o \
Pool.o PoolDict.o\
Reactor.o ReactorDict.o \
FuelDataBank.o DecayDataBank.o \
@@ -48,6 +46,7 @@ ROOTOBJS = CLASSObject.o CLASSObjectDict.o\
FuelDataBank.o DecayDataBank.o \
DynamicalSystem.o\
EvolutionData.o EvolutionDataDict.o \
+ PhysicModels.o \
LogFile.o
diff --git a/source/branches/CLASSV3/src/PWR_THPU_FabricationPlant.cxx b/source/branches/CLASSV3/src/PWR_THPU_FabricationPlant.cxx
index cb392152700e51cfc2c9056538c00509c6345276..5b385a5d002bc9c94de6d65b9379352fdcd379e4 100644
--- a/source/branches/CLASSV3/src/PWR_THPU_FabricationPlant.cxx
+++ b/source/branches/CLASSV3/src/PWR_THPU_FabricationPlant.cxx
@@ -50,7 +50,7 @@ PWR_THPU_FabricationPlant::PWR_THPU_FabricationPlant(LogFile* log)
SetFacilityType(16);
SetLog(log);
- fChronologicalTimePriority = false;
+ fFiFo = false;
SetCycleTime(-1);
fUpdateReferenceDBatEachStep = false;
fSubstitutionFuel = false;
@@ -74,7 +74,7 @@ PWR_THPU_FabricationPlant::PWR_THPU_FabricationPlant(LogFile* log, Storage* stor
SetLog(log);
- fChronologicalTimePriority = false;
+ fFiFo = false;
fUpdateReferenceDBatEachStep = false;
fSubstitutionFuel = false;
diff --git a/source/branches/CLASSV3/src/PWR_THU_FabricationPlant.cxx b/source/branches/CLASSV3/src/PWR_THU_FabricationPlant.cxx
index fec48037ff389b4dd3a085a9bc4afef1cb75681e..05de6bf629b55b931ed4fa9dad808bc4222f62e4 100644
--- a/source/branches/CLASSV3/src/PWR_THU_FabricationPlant.cxx
+++ b/source/branches/CLASSV3/src/PWR_THU_FabricationPlant.cxx
@@ -48,7 +48,7 @@ PWR_THU_FabricationPlant::PWR_THU_FabricationPlant(LogFile* log)
SetFacilityType(16);
SetLog(log);
- fChronologicalTimePriority = false;
+ fFiFo = false;
SetCycleTime(-1);
fUpdateReferenceDBatEachStep = false;
fSubstitutionFuel = false;
@@ -72,7 +72,7 @@ PWR_THU_FabricationPlant::PWR_THU_FabricationPlant(LogFile* log, Storage* storag
SetLog(log);
- fChronologicalTimePriority = false;
+ fFiFo = false;
fUpdateReferenceDBatEachStep = false;
fSubstitutionFuel = false;
diff --git a/source/branches/CLASSV3/src/Pool.cxx b/source/branches/CLASSV3/src/Pool.cxx
index b72e984d05d4639e2ddfa386decf0bad4fb606a8..5e78d7e41e69b8637fed9c4dc7e053391ea1a589 100755
--- a/source/branches/CLASSV3/src/Pool.cxx
+++ b/source/branches/CLASSV3/src/Pool.cxx
@@ -105,7 +105,7 @@ void Pool::SetIVArray(vector<IsotopicVector> ivarray)
void Pool::SetIVArray(vector<IsotopicVector> ivarray, vector<cSecond> timearray)
{
fIVArray = ivarray;
- fCoolingStartingTime = timearray;
+ fIVArrayArrivalTime = timearray;
}
//________________________________________________________________________
@@ -118,7 +118,7 @@ void Pool::AddIV(IsotopicVector IV)
fIVArray.push_back(IV);
fInsideIV += IV;
- fCoolingStartingTime.push_back(fInternalTime);
+ fIVArrayArrivalTime.push_back(fInternalTime);
fCoolingLastIndex++;
fCoolingIndex.push_back(fCoolingLastIndex);
@@ -133,7 +133,7 @@ void Pool::RemoveIVCooling(int i) //!< Remove a Cooling IsotopicVector
AddCumulativeIVOut(fIVArray[i]);
fIVArray.erase(fIVArray.begin()+i);
- fCoolingStartingTime.erase(fCoolingStartingTime.begin()+i);
+ fIVArrayArrivalTime.erase( fIVArrayArrivalTime.begin()+i);
fCoolingIndex.erase(fCoolingIndex.begin()+i);
}
@@ -164,19 +164,19 @@ void Pool::CoolingEvolution(cSecond t)
#pragma omp parallel for
for ( int i = 0 ; i < (int)fIVArray.size() ; i++)
{
- if ( abs(t - fCoolingStartingTime[i] - fCycleTime) < 3600 ) // ">" should not append, only "=" is normal...
+ if ( abs(t - fIVArrayArrivalTime[i] - fCycleTime) < 3600 ) // ">" should not append, only "=" is normal...
{
- if (t - fCoolingStartingTime[i] > fCycleTime) // Warning & Quit
+ if (t - fIVArrayArrivalTime[i] > fCycleTime) // Warning & Quit
{
cout << "!!Warning!! !!!TreamtmentFactory!!! Cooling Step : " << t/3600./24/365.25<< " :"
<< " An evolution Step is probably missing ! " << " " << endl;
- cout << t << " " << fCoolingStartingTime[i] << " " << fCycleTime << endl;
+ cout << t << " " << fIVArrayArrivalTime[i] << " " << fCycleTime << endl;
GetLog()->fLog << "!!Warning!! !!!TreamtmentFactory!!! Cooling Step : "<< t << " :"
<< " An evolution Step is probably missing ! " << endl;
exit (1);
}
- RemainingCoolingTime = fCycleTime - (fInternalTime - fCoolingStartingTime[i]);
+ RemainingCoolingTime = fCycleTime - (fInternalTime - fIVArrayArrivalTime[i]);
//Cooling Decay
fIVArray[i] = GetDecay( fIVArray[i], RemainingCoolingTime);
@@ -185,7 +185,7 @@ void Pool::CoolingEvolution(cSecond t)
{fCoolingEndOfCycle.push_back(i);}
}
- else if ( fCoolingStartingTime[i] != t )
+ else if ( fIVArrayArrivalTime[i] != t )
{
fIVArray[i] = GetDecay( fIVArray[i] , EvolutionTime);
fInsideIV += fIVArray[i];
diff --git a/source/branches/CLASSV3/src/Reactor.cxx b/source/branches/CLASSV3/src/Reactor.cxx
index 3243fd51cbda10c7af4ef5512c07c3c3b7b17342..1030ccd7554e12d85c3dd101636ca3a3522f46b9 100755
--- a/source/branches/CLASSV3/src/Reactor.cxx
+++ b/source/branches/CLASSV3/src/Reactor.cxx
@@ -1,7 +1,7 @@
#include "Reactor.hxx"
#include "EvolutionData.hxx"
-#include "FuelDataBank.hxx"
+#include "PhysicModels.hxx"
#include "Pool.hxx"
#include "FabricationPlant.hxx"
#include "Storage.hxx"
@@ -56,7 +56,7 @@ Reactor::Reactor(LogFile* log):CLASSFacility(log)
}
-Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB,
+Reactor::Reactor(LogFile* log, PhysicModels* fueltypeDB,
FabricationPlant* fabricationplant,
CLASSBackEnd* Pool,
cSecond creationtime, cSecond lifetime):CLASSFacility(log, creationtime, lifetime)
@@ -86,7 +86,6 @@ Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB,
cout << "!!INFO!! !!!Reactor!!! A Reactor has been define :" << endl;
cout << "\t Fuel Composition is not fixed ! "<< endl;
- cout << "\t Fuel Type set to : \t "<< fFuelTypeDB->GetFuelType() << endl;
cout << "\t Creation time set at \t " << (double)(GetCreationTime()/3600/24/365.25) << " year" << endl;
cout << "\t Life time (Operating's Duration) set at \t " << (double)(GetLifeTime()/3600/24/365.25) << " year" << endl << endl;
cout << "!!WARNING!! !!!Reactor!!! You need to set Burn-up/Power/CycleTime (2 of 3) & Heavy Metal Mass Manualy !! " << endl;
@@ -94,14 +93,13 @@ Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB,
GetLog()->fLog << "!!INFO!! !!!Reactor!!! A Reactor has been define :" << endl;
GetLog()->fLog << "\t Fuel Composition is not fixed ! "<< endl;
- GetLog()->fLog << "\t Fuel Type set to : \t "<< fFuelTypeDB->GetFuelType() << endl;
GetLog()->fLog << "\t Creation time set at \t " << (double)(GetCreationTime()/3600/24/365.25) << " year" << endl;
GetLog()->fLog << "\t Life time (Operating's Duration) set at \t " << (double)(GetLifeTime()/3600/24/365.25) << " year" << endl << endl;
GetLog()->fLog << "!!WARNING!! !!!Reactor!!! You need to set Burn-up/Power/CycleTime (2 of 3) & Heavy Metal Mass Manualy !! " << endl;
}
-Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB, FabricationPlant* fabricationplant, CLASSBackEnd* Pool,
+Reactor::Reactor(LogFile* log, PhysicModels* fueltypeDB, FabricationPlant* fabricationplant, CLASSBackEnd* Pool,
cSecond creationtime, cSecond lifetime,
double Power, double HMMass, double BurnUp, double ChargeFactor):CLASSFacility(log, creationtime, lifetime)
{
@@ -132,7 +130,6 @@ Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB, FabricationPlant* fabri
cout << "!!INFO!! !!!Reactor!!! A Reactor has been define :" << endl;
cout << "\t Fuel Composition is not fixed ! "<< endl;
- cout << "\t Fuel Type set to : \t "<< fFuelTypeDB->GetFuelType() << endl;
cout << "\t Creation time set at \t " << (double)(GetCreationTime()/3600/24/365.25) << " year" << endl;
cout << "\t Life time (Operating's Duration) set at \t " << (double)(GetLifeTime()/3600/24/365.25) << " year" << endl;
cout << "\t The Effective Thermal Power is \t " << (double)(fPower *1e-6) << " MW (with Full Power " << Power << " and " << ChargeFactor << " Charge Factor)"<< endl;
@@ -142,7 +139,6 @@ Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB, FabricationPlant* fabri
GetLog()->fLog << "!!INFO!! !!!Reactor!!! A Reactor has been define :" << endl;
GetLog()->fLog << "\t Fuel Composition is not fixed ! "<< endl;
- GetLog()->fLog << "\t Fuel Type set to : \t "<< fFuelTypeDB->GetFuelType() << endl;
GetLog()->fLog << "\t Creation time set at \t " << (double)(GetCreationTime()/3600/24/365.25) << " year" << endl;
GetLog()->fLog << "\t Life time (Operating's Duration) set at \t " << (double)(GetLifeTime()/3600/24/365.25) << " year" << endl;
GetLog()->fLog << "\t The Effective Thermal Power is \t " << (double)(fPower *1e-6) << " MW (with Full Power " << Power << " and " << ChargeFactor << " Charge Factor)"<< endl;
@@ -154,7 +150,7 @@ Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB, FabricationPlant* fabri
}
-Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB,
+Reactor::Reactor(LogFile* log, PhysicModels* fueltypeDB,
FabricationPlant* fabricationplant,
CLASSBackEnd* Pool,
cSecond creationtime, cSecond lifetime, cSecond cycletime,
@@ -185,7 +181,6 @@ Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB,
cout << "!!INFO!! !!!Reactor!!! A Reactor has been define :" << endl;
cout << "\t Fuel Composition is not fixed ! "<< endl;
- cout << "\t Fuel Type set to : \t "<< fFuelTypeDB->GetFuelType() << endl;
cout << "\t Creation time set at \t " << (double)(GetCreationTime()/3600/24/365.25) << " year" << endl;
cout << "\t Life time (Operating's Duration) set at \t " << (double)(GetCreationTime()/3600/24/365.25) << " year" << endl;
cout << "\t The Cycle Time set at\t " << (double)(fCycleTime/3600/24/365.25) << " year" << endl;
@@ -195,7 +190,6 @@ Reactor::Reactor(LogFile* log, FuelDataBank* fueltypeDB,
GetLog()->fLog << "!!INFO!! !!!Reactor!!! A Reactor has been define :" << endl;
GetLog()->fLog << "\t Fuel Composition is not fixed ! "<< endl;
- GetLog()->fLog << "\t Fuel Type set to : \t "<< fFuelTypeDB->GetFuelType() << endl;
GetLog()->fLog << "\t Creation time set at \t " << (double)(GetCreationTime()/3600/24/365.25) << " year" << endl;
GetLog()->fLog << "\t Life time (Operating's Duration) set at \t " << (double)(GetCreationTime()/3600/24/365.25) << " year" << endl;
GetLog()->fLog << "\t The Cycle Time set at\t " << (double)(fCycleTime/3600/24/365.25) << " year" << endl;
diff --git a/source/branches/CLASSV3/src/Storage.cxx b/source/branches/CLASSV3/src/Storage.cxx
index 1e310ddbd364fc54af1a976a882c396b280786b6..7d4543858532082b93d3cf1ca40b424ad98949eb 100644
--- a/source/branches/CLASSV3/src/Storage.cxx
+++ b/source/branches/CLASSV3/src/Storage.cxx
@@ -72,7 +72,10 @@ void Storage::AddIV(IsotopicVector isotopicvector)
AddCumulativeIVIn(isotopicvector);
if(GetParc()->GetStockManagement() )
+ {
fIVArray.push_back(isotopicvector);
+ fIVArrayArrivalTime.push_back(fInternalTime);
+ }
AddToFullStock(isotopicvector);
}
@@ -92,8 +95,8 @@ void Storage::TakeFractionFromStock(int IVId,double fraction)
{
AddCumulativeIVOut(fIVArray[IVId]*fraction);
- fInsideIV -= fIVArray[IVId]*fraction;
- fIVArray[IVId] = fIVArray[IVId]*(1-fraction);
+ fInsideIV -= fIVArray[IVId] * fraction;
+ fIVArray[IVId] -= fIVArray[IVId] * fraction;
}
}
@@ -136,8 +139,11 @@ void Storage::StorageEvolution(cSecond t)
for(int i = (int)fIVArray.size()-1 ; i >=0; i--) //Removing empty Stock
if(Norme(fIVArray[i]) == 0)
- fIVArray.erase(fIVArray.begin()+i);
-
+ {
+ fIVArray.erase(fIVArray.begin()+i);
+ fIVArrayArrivalTime.erase(fIVArrayArrivalTime.begin()+i);
+
+ }
int EvolutionTime = t - fInternalTime;