onelab

Common/CommandLine.cpp

@@ -141,12 +141,13 @@ void GetOptions(int argc, char *argv[])
       else if(!strcmp(argv[i] + 1, "onelab")) {
         i++;        
         if(argv[i])
-           Msg::InitializeOnelab(argv[i++]);
+          Msg::InitializeOnelab("GmshOnelab", argv[i++]);
         else
           Msg::Fatal("Missing string");
         CTX::instance()->batch = -4;
       }
       else if(!strcmp(argv[i] + 1, "socket")) {
+        // FIXME: this will create the "GmshRemote" onelab client in the future
         i++;        
         if(argv[i])
           Msg::InitClient(argv[i++]);

Common/GmshMessage.cpp

@@ -91,7 +91,7 @@ void Msg::Init(int argc, char **argv)
     if(i) _commandLine += " ";
     _commandLine += argv[i];
   }
-  InitializeOnelab();
+  InitializeOnelab("Gmsh");
 }
 
 void Msg::Exit(int level)
@@ -597,14 +597,13 @@ void Msg::FinalizeClient()
   _client = 0;
 }
 
-void Msg::InitializeOnelab(const std::string &sockname)
+void Msg::InitializeOnelab(const std::string &name, const std::string &sockname)
 {
-  // Gmsh could also be used as a distant CAD/post-pro client... 
+  if(_onelabClient) delete _onelabClient;
   if (sockname.empty())
-    _onelabClient = new onelab::localClient("Gmsh");
-  else {
-    _onelabClient = new onelab::remoteNetworkClient("GmshRemote",sockname);
-  }
+    _onelabClient = new onelab::localClient(name);
+  else
+    _onelabClient = new onelab::remoteNetworkClient(name, sockname);
 }
 
 void Msg::ExchangeOnelabParameter(const std::string &key,

Common/GmshMessage.h

@@ -84,7 +84,7 @@ class Msg {
   static void InitClient(std::string sockname);
   static GmshClient *GetClient(){ return _client; }
   static void FinalizeClient();
-  static void InitializeOnelab(const std::string &sockname="");
+  static void InitializeOnelab(const std::string &name, const std::string &sockname="");
   static void FinalizeOnelab();
   static bool UseOnelab(){ return _onelabClient ? true : false; }
   static void ExchangeOnelabParameter(const std::string &key,