X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f4329821ed097d617ccb739e1dd1b22caaadf92..b9d349f4e630752232d93f23b5cb3c33e02e0d05:/src/surf/network_smpi.cpp diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index 0c32b4f94a..54185c6b9b 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -36,8 +36,8 @@ std::vector smpi_lat_factor; void surf_network_model_init_SMPI() { auto net_model = std::make_shared(); - simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::NETWORK, net_model, - true); + net_model->set_name("Network_SMPI"); + simgrid::kernel::EngineImpl::get_instance()->add_model(net_model, {}); simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); simgrid::config::set_default("network/weight-S", 8775); @@ -52,7 +52,7 @@ NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model() {} double NetworkSmpiModel::get_bandwidth_factor(double size) { if (smpi_bw_factor.empty()) - smpi_bw_factor = parse_factor(config::get_value("smpi/bw-factor")); + smpi_bw_factor = simgrid::smpi::utils::parse_factor(config::get_value("smpi/bw-factor")); double current = 1.0; for (auto const& fact : smpi_bw_factor) { @@ -70,7 +70,7 @@ double NetworkSmpiModel::get_bandwidth_factor(double size) double NetworkSmpiModel::get_latency_factor(double size) { if (smpi_lat_factor.empty()) - smpi_lat_factor = parse_factor(config::get_value("smpi/lat-factor")); + smpi_lat_factor = simgrid::smpi::utils::parse_factor(config::get_value("smpi/lat-factor")); double current = 1.0; for (auto const& fact : smpi_lat_factor) {