Skip to content
Snippets Groups Projects
Commit e965f95c authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix for local onelab client

parent d8ef2a52
Branches
Tags
No related merge requests found
...@@ -151,6 +151,10 @@ void GetOptions(int argc, char *argv[]) ...@@ -151,6 +151,10 @@ void GetOptions(int argc, char *argv[])
Msg::InitializeOnelab(argv[i], argv[i + 1]); Msg::InitializeOnelab(argv[i], argv[i + 1]);
i += 2; i += 2;
} }
else if(argv[i]){
Msg::InitializeOnelab(argv[i], "");
i += 1;
}
else else
Msg::Fatal("Missing client name and/or address of OneLab server"); Msg::Fatal("Missing client name and/or address of OneLab server");
} }
......
...@@ -635,8 +635,10 @@ void Msg::InitializeOnelab(const std::string &name, const std::string &sockname) ...@@ -635,8 +635,10 @@ void Msg::InitializeOnelab(const std::string &name, const std::string &sockname)
{ {
#if defined(HAVE_ONELAB) #if defined(HAVE_ONELAB)
if(_onelabClient) delete _onelabClient; if(_onelabClient) delete _onelabClient;
if(sockname.empty()) if(sockname.empty()){
_onelabClient = new onelab::localClient(name); _onelabClient = new onelab::localClient("Gmsh");
_onelabClient->fromFile(name);
}
else{ else{
onelab::remoteNetworkClient *c = new onelab::remoteNetworkClient(name, sockname); onelab::remoteNetworkClient *c = new onelab::remoteNetworkClient(name, sockname);
_onelabClient = c; _onelabClient = c;
...@@ -661,7 +663,6 @@ void Msg::InitializeOnelab(const std::string &name, const std::string &sockname) ...@@ -661,7 +663,6 @@ void Msg::InitializeOnelab(const std::string &name, const std::string &sockname)
//Info("Performing OneLab '%s'", ps[0].getValue().c_str()); //Info("Performing OneLab '%s'", ps[0].getValue().c_str());
if(ps[0].getValue() == "initialize") Exit(0); if(ps[0].getValue() == "initialize") Exit(0);
} }
} }
#endif #endif
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment