diff --git a/Utils/trunk/XSM/MLP/BuildInput/Gene.cxx b/Utils/trunk/XSM/MLP/BuildInput/Gene.cxx index 4a895d2c6e12512ab42513fbebd22049331d7cf5..7841a1ffe76b9ea32f63f082635a7355ad63bd1b 100755 --- a/Utils/trunk/XSM/MLP/BuildInput/Gene.cxx +++ b/Utils/trunk/XSM/MLP/BuildInput/Gene.cxx @@ -184,21 +184,21 @@ void DumpInputNeuron(string filename) //Fill containing all the output of the networks to train ofstream InputNetwork("TrainingInput.cxx"); - int NumOfBase=fPuCompoInit.size(); + int NumOfBase=fActinideCompoInit.size(); for(int b=0;b<NumOfBase;b++) { //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@// //@@@Change the input value according to your fresh fuel compo //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@// // (Z , A ,I) - U5 = fPuCompoInit[b].GetZAIIsotopicQuantity(ZAI(92,235,0)); - U8 = fPuCompoInit[b].GetZAIIsotopicQuantity(ZAI(92,238,0)); - Pu8 = fPuCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,238,0)); - Pu9 = fPuCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,239,0)); - Pu10 = fPuCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,240,0)); - Pu11 = fPuCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,241,0)); - Pu12 = fPuCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,242,0)); - Am1 = fPuCompoInit[b].GetZAIIsotopicQuantity(ZAI(95,241,0)); + U5 = fActinideCompoInit[b].GetZAIIsotopicQuantity(ZAI(92,235,0)); + U8 = fActinideCompoInit[b].GetZAIIsotopicQuantity(ZAI(92,238,0)); + Pu8 = fActinideCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,238,0)); + Pu9 = fActinideCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,239,0)); + Pu10 = fActinideCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,240,0)); + Pu11 = fActinideCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,241,0)); + Pu12 = fActinideCompoInit[b].GetZAIIsotopicQuantity(ZAI(94,242,0)); + Am1 = fActinideCompoInit[b].GetZAIIsotopicQuantity(ZAI(95,241,0)); //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@// for(int Tstep=0 ;Tstep<fNOfTimeStep;Tstep++ ) { @@ -481,7 +481,7 @@ void ReadAndFill(string jobname) } } - fPuCompoInit.push_back(CompoBasei); + fActinideCompoInit.push_back(CompoBasei); GoodJobName.push_back(jobname); diff --git a/Utils/trunk/XSM/MLP/BuildInput/Gene.hxx b/Utils/trunk/XSM/MLP/BuildInput/Gene.hxx index fdaea7b10718a7aa1a46c2bdb7f47603d30ca358..11d75520f759ced76e8497ee4273b5aceed79291 100755 --- a/Utils/trunk/XSM/MLP/BuildInput/Gene.hxx +++ b/Utils/trunk/XSM/MLP/BuildInput/Gene.hxx @@ -38,7 +38,7 @@ vector< map < ZAI, vector<double> > > fXSFis; // map of fission cross section fX vector< map < ZAI, vector<double> > > fXSCap; vector< map < ZAI, vector<double> > > fXSN2N; -vector<IsotopicVector> fPuCompoInit; //Fresh fuel composition +vector<IsotopicVector> fActinideCompoInit; //Fresh fuel composition int fNOfTimeStep=0; //number of time step in the Evolution