From dec0c1c1f34f11b22b02f8c83a337bead3fa5cb1 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <mouginot.baptiste@gmail.com> Date: Thu, 7 Feb 2013 17:22:34 +0000 Subject: [PATCH] CLASS VERSION : 1.2.1 CLASS, REACTOR : add the tracking of the installed power FABRICATIONPLANT : remove come commented include git-svn-id: svn+ssh://svn.in2p3.fr/class@59 0e7d625b-0364-4367-a6be-d5be4a48d228 --- source/trunk/include/CLASS.hxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/trunk/include/CLASS.hxx b/source/trunk/include/CLASS.hxx index 5956a3fda..483479d09 100755 --- a/source/trunk/include/CLASS.hxx +++ b/source/trunk/include/CLASS.hxx @@ -87,14 +87,14 @@ public : -//-------- God --------// +//-------- IsotopicVector --------// - 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 + 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(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 - + 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 + void AddToPower(double power) { fParcPower += power;} //!< Add power to the installed power in the Parc //********* In/Out related Method *********// @@ -149,7 +149,7 @@ protected : IsotopicVector fTotalInReactor; ///< Sum of all IV in Reactor IV IsotopicVector fIVInCycleTotal; ///< Summ of all IV in the cycle (without Waste) IV IsotopicVector fIVTotal; ///< Summ of all IV in the parc (including Waste) IV - + double fParcPower; ///< Summ of the Power of all reactor in the parc }; -- GitLab