Merge branch 'master' into mc-process

[simgrid.git] / src / surf / workstation_clm03.hpp

diff --git a/src/surf/workstation_clm03.hpp b/src/surf/workstation_clm03.hpp
index f471b16..11e2435 100644 (file)
--- a/src/surf/workstation_clm03.hpp
+++ b/src/surf/workstation_clm03.hpp
@@ -33,16 +33,15 @@ class WorkstationCLM03Model : public WorkstationModel {
 public:
   WorkstationCLM03Model();
   ~WorkstationCLM03Model();
-  void parseInit(sg_platf_host_cbarg_t host);
-  WorkstationPtr createResource(const char *name);
+  WorkstationPtr createWorkstation(const char *name);
   double shareResources(double now);
 
   void updateActionsState(double now, double delta);
 
   ActionPtr executeParallelTask(int workstation_nb,
                                         void **workstation_list,
-                                        double *computation_amount,
-                                        double *communication_amount,
+                                        double *flops_amount,
+                                        double *bytes_amount,
                                         double rate);
  ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate);
 };