From dc907c7af3b3eb0c04efb5d010035cd86400738a Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Wed, 3 Sep 2014 15:21:36 +0000
Subject: [PATCH] del PhysicModel
git-svn-id: svn+ssh://svn.in2p3.fr/class@377 0e7d625b-0364-4367-a6be-d5be4a48d228
---
.../branches/CLASSV3/include/PhysicModels.hxx | 86 -------------------
source/branches/CLASSV3/src/PhysicModels.cxx | 50 -----------
2 files changed, 136 deletions(-)
delete mode 100644 source/branches/CLASSV3/include/PhysicModels.hxx
delete mode 100644 source/branches/CLASSV3/src/PhysicModels.cxx
diff --git a/source/branches/CLASSV3/include/PhysicModels.hxx b/source/branches/CLASSV3/include/PhysicModels.hxx
deleted file mode 100644
index a27c2c1af..000000000
--- a/source/branches/CLASSV3/include/PhysicModels.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-
-#ifndef _PHYSICMODELS_HXX
-#define _PHYSICMODELS_HXX
-
-
-/*!
- \file
- \brief Header file for XS_INTERPOLATOR class.
-
-
- @authors BLG,BaM
- @version 1.0
- */
-#include "CLASSFuel.hxx"
-#include "EquivalenceModel.hxx"
-#include "XSModel.hxx"
-#include "IrradiationModel.hxx"
-#include "EvolutionData.hxx"
-
-
-using namespace std;
-typedef long long int cSecond;
-
-//-----------------------------------------------------------------------------//
-/*!
- Define all the physic models used for a specific database
-
- The 2 following are data base related (for one Reactor and one fuel type and one ...) :
- User can either define his own (see manual) or uses the provided ones ) :
-
- XS_Interpolator = Closest , MLP ....
- Equivalence_Model = Linear,Quadratique, MLP ...
-
- this one is bateman solvers related :
- (or it may be link to a evolution code (like MURE), not yet implemented but envisaged)
- IrradiationModel = RK4 or Matrix
-
-
- @authors BLG,BaM
- @version 1.0
- */
-//________________________________________________________________________
-
-
-class PhysicModels : public CLASSFuel
-{
-
- public :
-
- /*!
- \name Constructor/Desctructor
- */
- //@{
-
- PhysicModels();
- PhysicModels(XSModel* XS, EquivalenceModel* EM, IrradiationModel* IM );
- PhysicModels(CLASSLogger* log, XSModel* XS, EquivalenceModel* EM, IrradiationModel* IM );
-
- ~PhysicModels() {;}
- //{
-
- EvolutionData GenerateEvolutionData(IsotopicVector IV, double cycletime, double Power);
-
- XSModel* GetXSModel() {return fXSModel;}
- EquivalenceModel* GetEquivalenceModel() {return fEquivalenceModel;}
- IrradiationModel* GetIrradiationModel() {return fIrradiationModel;}
-
- PhysicModels* GetPhysicModels() {return this;}
-
-
-
-
-
-
- private :
-
- XSModel* fXSModel;
- EquivalenceModel* fEquivalenceModel;
- IrradiationModel* fIrradiationModel;
-
-
-
-};
-
-#endif
-
diff --git a/source/branches/CLASSV3/src/PhysicModels.cxx b/source/branches/CLASSV3/src/PhysicModels.cxx
deleted file mode 100644
index 422ee7415..000000000
--- a/source/branches/CLASSV3/src/PhysicModels.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "PhysicModels.hxx"
-
-//________________________________________________________________________
-//
-// PhysicModels
-//
-//
-//
-//
-//________________________________________________________________________
-
-
-
-PhysicModels::PhysicModels():CLASSFuel()
-{
-
- fXSModel = 0;
- fEquivalenceModel = 0;
- fIrradiationModel = 0;
-
-
-}
-//________________________________________________________________________
-PhysicModels::PhysicModels(XSModel* XS, EquivalenceModel* EM, IrradiationModel* IM ):CLASSFuel()
-{
-
- fXSModel = XS;
- fEquivalenceModel = EM;
- fIrradiationModel = IM;
-
-
-}
-//________________________________________________________________________
-PhysicModels::PhysicModels(CLASSLogger* log, XSModel* XS, EquivalenceModel* EM, IrradiationModel* IM ):CLASSFuel(log)
-{
-
- fXSModel = XS;
- fEquivalenceModel = EM;
- fIrradiationModel = IM;
-
-
-}
-
-//________________________________________________________________________
-EvolutionData PhysicModels::GenerateEvolutionData(IsotopicVector IV, double cycletime, double Power)
-{
-
- return fIrradiationModel->GenerateEvolutionData(IV, fXSModel->GetCrossSections(IV), Power, cycletime);
-}
-//________________________________________________________________________
--
GitLab