diff --git a/source/branches/CLASSV3/include/Scenario.hxx b/source/branches/CLASSV3/include/Scenario.hxx index ed5b57bdc8a41b4510d4ca6bab9457ce1d86f828..6f87ffc37b4d1682d8f4ae68a21675eeea679e4d 100755 --- a/source/branches/CLASSV3/include/Scenario.hxx +++ b/source/branches/CLASSV3/include/Scenario.hxx @@ -6,6 +6,7 @@ */ #include "CLASSObject.hxx" +#include "CLASSLogger.hxx" #include "IsotopicVector.hxx" #include <TFile.h> @@ -54,7 +55,7 @@ public : - Scenario(CLASSLogger* Log= new CLASSLogger(), cSecond abstime = 0); ///< Log Constructor. + Scenario(CLASSLogger* Log = new CLASSLogger(), cSecond abstime = 0); ///< Log Constructor. /*! Use to load a CLASSLogger \param CLASSLogger: CLASSLogger used for the log... diff --git a/source/branches/CLASSV3/src/Makefile_good b/source/branches/CLASSV3/src/Makefile_good index c49e9c6dfbda7b8f8bdf24b0e623191a7d3d47e2..18340fe3e3ea940840fdf818a8a4dcac8c55e1b8 100644 --- a/source/branches/CLASSV3/src/Makefile_good +++ b/source/branches/CLASSV3/src/Makefile_good @@ -18,17 +18,17 @@ ROOTGLIBS = `root-config --glibs` ######### nothing to change from here ######### INCLUDES = $(LOCALINC)/*.hxx LIBNAME = CLASSpkg -OBJS = Scenario.o \ +OBJS = CLASSLogger.o \ + ZAI.o ZAIDict.o \ IsotopicVector.o IsotopicVectorDict.o \ ZAIMass.o \ - ZAI.o ZAIDict.o \ CLASSObject.o CLASSObjectDict.o\ CLASSFacility.o CLASSFacilityDict.o\ + FabricationPlant.o FabricationPlantDict.o \ + Reactor.o ReactorDict.o \ CLASSBackEnd.o CLASSBackEndDict.o\ Storage.o StorageDict.o\ - FabricationPlant.o FabricationPlantDict.o \ Pool.o PoolDict.o\ - Reactor.o ReactorDict.o \ DecayDataBank.o \ DynamicalSystem.o\ EvolutionData.o EvolutionDataDict.o \ @@ -36,28 +36,28 @@ OBJS = Scenario.o \ EquivalenceModel.o \ XSModel.o \ PhysicModels.o \ - CLASSLogger.o + Scenario.o OBJMODEL = $(EQM)/EQM_MLP_PWR_MOX.o $(EQM)/EQM_QUAD_PWR_MOX.o $(EQM)/EQM_LIN_PWR_MOX.o \ $(XSM)/XSM_MLP_PWR_MOX.o $(XSM)/XSM_CLOSEST.o \ $(IM)/IM_RK4.o $(IM)/IM_Matrix.o -ROOTOBJS = CLASSObject.o CLASSObjectDict.o\ +ROOTOBJS = CLASSLogger.o \ + ZAI.o ZAIDict.o \ + IsotopicVector.o IsotopicVectorDict.o \ + ZAIMass.o \ + CLASSObject.o CLASSObjectDict.o\ CLASSFacility.o CLASSFacilityDict.o\ + Reactor.o ReactorDict.o \ + FabricationPlant.o FabricationPlantDict.o \ CLASSBackEnd.o CLASSBackEndDict.o\ Storage.o StorageDict.o\ Pool.o PoolDict.o\ - Reactor.o ReactorDict.o \ - FabricationPlant.o FabricationPlantDict.o \ - IsotopicVector.o IsotopicVectorDict.o \ - ZAIMass.o \ - ZAI.o ZAIDict.o \ DecayDataBank.o \ DynamicalSystem.o\ EvolutionData.o EvolutionDataDict.o \ - PhysicModels.o \ - CLASSLogger.o + PhysicModels.o CXX = g++