Skip to content
Snippets Groups Projects
Commit d384d469 authored by Fanny Courtin's avatar Fanny Courtin Committed by BaM
Browse files

Merge branch 'CLASS_V5' into 'CLASS_V5'

Class v5

See merge request !31
parents bff5a61d 211fecd7
No related branches found
No related tags found
No related merge requests found
......@@ -156,8 +156,8 @@ public :
{ return fReactorFuturIV;} //!< Return the list of the futur fuel IV
map < string, double> GetfStreamListFPMassFractionMax(){return fStreamListFPMassFractionMax;} //!< Get the map of allowed max fractions
map < string, double> GetfStreamListFPMassFractionMin(){return fStreamListFPMassFractionMin;} //!< Get the map of allowed min fractions
map < string, double> GetStreamListFPMassFractionMax(){return fStreamListFPMassFractionMax;} //!< Get the map of allowed max fractions
map < string, double> GetStreamListFPMassFractionMin(){return fStreamListFPMassFractionMin;} //!< Get the map of allowed min fractions
//@}
......@@ -219,15 +219,15 @@ protected:
void FabricationPlantEvolution(cSecond t); //!< Deal the FabricationPlant evolution
void ResetArrays(); //!< Empty Arrays
#ifndef __CINT__
map < string , IsotopicVector> fStreamList; ///< Map that contains lists of stream according to the EqModel with corresponding isotopes list
map < string , double> fStreamListFPMassFractionMax; ///< Map that contains lists of stream according to the EqModel with mass maximum fraction
map < string , double> fStreamListFPMassFractionMin; ///< Map that contains lists of stream according to the EqModel with mass minimum fraction
map < int, string> fStreamListFPPriority; ///< Map that contains lists of stream according to the EqModel with priority (1 = first, 2 = second, etc...)
map < string , bool> fStreamListFPIsBuffer; ///< Map that contains lists of stream according to the EqModel saying if fuel buffer
#ifndef __CINT__
map < string , vector <Storage*> > fStorage; //!< Pointer to the Storages defined for each list
map < string , vector <IsotopicVector> > fStreamArray; //!< The vector of isotopicVector of each material and each stock
map < string , vector <cSecond> > fStreamArrayTime; //!< Time when a IsotopicVector arrives in its storage
......@@ -259,7 +259,7 @@ protected:
#endif
ClassDef(FabricationPlant,4);
ClassDef(FabricationPlant,5);
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment