No more types for models.

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 618e360..ef5eb05 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -474,7 +474,11 @@ static void surf_config_models_setup()
   surf_host_model_description[host_id].model_init_preparse();
 
   XBT_DEBUG("Call vm_model_init");
-  surf_vm_model_init_HL13();
+  /* ideally we should get back the pointer to CpuModel from model_init_preparse(), but this
+   * requires changing the declaration of surf_cpu_model_description.
+   * To be reviewed in the future */
+  surf_vm_model_init_HL13(
+      simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get());
 
   XBT_DEBUG("Call disk_model_init");
   int disk_id = find_model_description(surf_disk_model_description, disk_model_name);
@@ -528,7 +532,7 @@ sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone)
     if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
       current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive;
     /* add to the sons dictionary */
-    current_routing->get_children()->push_back(new_zone);
+    current_routing->add_child(new_zone);
     /* set models from parent netzone */
     new_zone->set_network_model(current_routing->get_network_model());
     new_zone->set_cpu_pm_model(current_routing->get_cpu_pm_model());
@@ -600,7 +604,7 @@ void sg_platf_new_Zone_seal()
   xbt_assert(current_routing, "Cannot seal the current Zone: zone under construction");
   current_routing->seal();
   simgrid::s4u::NetZone::on_seal(*current_routing->get_iface());
-  current_routing = current_routing->get_father();
+  current_routing = current_routing->get_parent();
 }
 
 /** @brief Add a link connecting a host to the rest of its Zone (which must be cluster or vivaldi) */