diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa82a7c4b4c6b112c8b2876b4cf58c0ab35116ae..ff9495b27118ce2e805ca577ed65577868592a41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,8 +63,8 @@ opt(NATIVE_FILE_CHOOSER "Enable native file chooser in GUI" ${DEFAULT})
opt(NETGEN "Enable Netgen 3D frontal mesh generator" ${DEFAULT})
opt(NUMPY "Enable conversion between fullMatrix and numpy array (requires SWIG)" OFF)
opt(OCC "Enable Open CASCADE geometrical models" ${DEFAULT})
-opt(ONELAB "Enable OneLab solver interface" ${DEFAULT})
-opt(ONELAB_METAMODEL "Enable OneLab metamodels (experimental)" ${DEFAULT})
+opt(ONELAB "Enable ONELAB solver interface" ${DEFAULT})
+opt(ONELAB_METAMODEL "Enable ONELAB metamodels (experimental)" ${DEFAULT})
opt(OPENMP "Enable OpenMP (experimental)" OFF)
opt(OPTHOM "Enable high-order mesh optimization tools" ${DEFAULT})
opt(OS_SPECIFIC_INSTALL "Enable OS-specific (e.g. app bundle) installation" ${DEFAULT})
@@ -489,11 +489,11 @@ if(ENABLE_NATIVE_FILE_CHOOSER)
endif(ENABLE_NATIVE_FILE_CHOOSER)
if(ENABLE_ONELAB)
- set_config_option(HAVE_ONELAB "OneLab")
+ set_config_option(HAVE_ONELAB "ONELAB")
if(ENABLE_ONELAB_METAMODEL)
add_subdirectory(contrib/onelab)
include_directories(contrib/onelab)
- set_config_option(HAVE_ONELAB_METAMODEL "OneLabMetamodel")
+ set_config_option(HAVE_ONELAB_METAMODEL "ONELABMetamodel")
endif(ENABLE_ONELAB_METAMODEL)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
@@ -521,7 +521,7 @@ endif(ENABLE_BUILD_ANDROID)
if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
if(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS OR NOT HAVE_ONELAB)
- message(SEND_ERROR "Cannot compile GUI without Mesh, Post, Plugin and OneLab")
+ message(SEND_ERROR "Cannot compile GUI without Mesh, Post, Plugin and ONELAB")
endif(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS OR NOT HAVE_ONELAB)
if(FLTK_JPEG)
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 875b0120421044bfbf81b9cb252c692a58006222..1d3fece474ef6709a0fb21d77a23c696189625fe 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -302,7 +302,7 @@ void GetOptions(int argc, char *argv[])
i += 1;
}
else
- Msg::Fatal("Missing client name and/or address of OneLab server");
+ Msg::Fatal("Missing client name and/or address of ONELAB server");
}
else if(!strcmp(argv[i] + 1, "lol")) {
i++;
@@ -311,7 +311,7 @@ void GetOptions(int argc, char *argv[])
i += 2;
}
else
- Msg::Fatal("Missing client name and/or address of OneLab server");
+ Msg::Fatal("Missing client name and/or address of ONELAB server");
}
else if(!strcmp(argv[i] + 1, "socket")) {
i++;
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index 42d9416e96d472d4a973a2e33682fa736562e804..33d34278afb79374165184f2e4b40d632d6fb051 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -798,7 +798,7 @@ void Msg::InitializeOnelab(const std::string &name, const std::string &sockname)
std::vector<onelab::string> ps;
_onelabClient->get(ps, name + "/Action");
if(ps.size()){
- //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);
}
}
@@ -899,7 +899,7 @@ void Msg::ExchangeOnelabParameter(const std::string &key,
if(name.empty()){
if(copt.size() || fopt.size())
Msg::Error("From now on you need to use the `Name' attribute to create a "
- "OneLab parameter: `Name \"%s\"'",
+ "ONELAB parameter: `Name \"%s\"'",
_getParameterName(key, copt).c_str());
return;
}
@@ -1004,7 +1004,7 @@ void Msg::ExchangeOnelabParameter(const std::string &key,
if(name.empty()){
if(copt.size() || fopt.size())
Msg::Error("From now on you need to use the `Name' attribute to create a "
- "OneLab parameter: `Name \"%s\"'",
+ "ONELAB parameter: `Name \"%s\"'",
_getParameterName(key, copt).c_str());
return;
}
diff --git a/Common/GmshRemote.cpp b/Common/GmshRemote.cpp
index 4c701d448b10f0ce738dafa2a738fac13e855e6d..4116c39cdc95cf370d60f61bf5f4483b32e7182c 100644
--- a/Common/GmshRemote.cpp
+++ b/Common/GmshRemote.cpp
@@ -294,7 +294,7 @@ int GmshRemote()
int GmshRemote()
{
- Msg::Error("GmshRemote requires Post and OneLab modules");
+ Msg::Error("GmshRemote requires Post and ONELAB modules");
return 0;
}
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 5e65ce4683ae186f0361178bbb19afbe42be43ba..0600d1d189ae7fe8bd5970a6ad74286066fd9154 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -549,7 +549,7 @@ int MergePostProcessingFile(const std::string &fileName, bool showLastStep,
// hide everything except the onelab X-Y graphs
if(hideNewViews){
for(unsigned int i = 0; i < PView::list.size(); i++){
- if(PView::list[i]->getData()->getFileName().substr(0, 6) != "OneLab")
+ if(PView::list[i]->getData()->getFileName().substr(0, 6) != "ONELAB")
PView::list[i]->getOptions()->visible = 0;
}
}
@@ -557,7 +557,7 @@ int MergePostProcessingFile(const std::string &fileName, bool showLastStep,
// if we created new views, assume we only want to see those (and the
// onelab X-Y graphs)
for(unsigned int i = 0; i < n; i++){
- if(PView::list[i]->getData()->getFileName().substr(0, 6) != "OneLab")
+ if(PView::list[i]->getData()->getFileName().substr(0, 6) != "ONELAB")
PView::list[i]->getOptions()->visible = 0;
}
}
diff --git a/Common/onelab.h b/Common/onelab.h
index 3dce36d9981493a66e4a236c52b9f543aeeafcbb..9edf74072ab78685a5ae3f42d9e6966aa1be4d94 100644
--- a/Common/onelab.h
+++ b/Common/onelab.h
@@ -1,4 +1,4 @@
-// OneLab - Copyright (C) 2011-2014 ULg-UCL
+// ONELAB - Copyright (C) 2011-2014 ULg-UCL
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
@@ -254,7 +254,7 @@ namespace onelab{
{
time_t now;
time(&now);
- fprintf(fp, "OneLab database created by %s on %s",
+ fprintf(fp, "ONELAB database created by %s on %s",
creator.c_str(), ctime(&now));
for(unsigned int i = 0; i < msg.size(); i++){
fprintf(fp, "%d ", (int)msg[i].size());
diff --git a/Common/onelabUtils.cpp b/Common/onelabUtils.cpp
index b099b7870f666721795ec17bbd54397425e5770a..bab73fb5e077c77083931ec8e7367cd9b6acf8ee 100644
--- a/Common/onelabUtils.cpp
+++ b/Common/onelabUtils.cpp
@@ -234,7 +234,7 @@ namespace onelabUtils {
PView *view = 0;
for(unsigned int i = 0; i < PView::list.size(); i++){
- if(PView::list[i]->getData()->getFileName() == "OneLab" + graphNum){
+ if(PView::list[i]->getData()->getFileName() == "ONELAB" + graphNum){
view = PView::list[i];
break;
}
@@ -273,7 +273,7 @@ namespace onelabUtils {
}
else{
view = new PView(xName, yName, x, y);
- view->getData()->setFileName("OneLab" + graphNum);
+ view->getData()->setFileName("ONELAB" + graphNum);
view->getOptions()->intervalsType = PViewOptions::Discrete;
view->getOptions()->autoPosition = num / 2 + 2;
}
diff --git a/Fltk/onelabGroup.cpp b/Fltk/onelabGroup.cpp
index 8341c821a35353dd90eafa9a9e455f922508a8d3..b023c20e8687f7d3c5c300199372e922e8e4aef9 100644
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@ -50,9 +50,9 @@ typedef unsigned long intptr_t;
#include "metamodel.h"
#endif
-// This file contains the Gmsh/FLTK specific parts of the OneLab
+// This file contains the Gmsh/FLTK specific parts of the ONELAB
// interface. You'll need to reimplement this if you plan to build a different
-// OneLab server.
+// ONELAB server.
class onelabGmshServer : public GmshServer{
private:
@@ -209,7 +209,7 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
std::string version, ptype, name;
onelab::parameter::getInfoFromChar(message, version, ptype, name);
if(onelab::parameter::version() != version){
- Msg::Error("OneLab version mismatch (server: %s / client: %s)",
+ Msg::Error("ONELAB version mismatch (server: %s / client: %s)",
onelab::parameter::version().c_str(), version.c_str());
}
else if(ptype == "number"){
@@ -243,7 +243,7 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
onelab::function p; p.fromChar(message); set(p);
}
else
- Msg::Error("Unknown OneLab parameter type: %s", ptype.c_str());
+ Msg::Error("Unknown ONELAB parameter type: %s", ptype.c_str());
}
break;
case GmshSocket::GMSH_PARAMETER_QUERY:
@@ -251,7 +251,7 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
std::string version, ptype, name, reply;
onelab::parameter::getInfoFromChar(message, version, ptype, name);
if(onelab::parameter::version() != version){
- Msg::Error("OneLab version mismatch (server: %s / client: %s)",
+ Msg::Error("ONELAB version mismatch (server: %s / client: %s)",
onelab::parameter::version().c_str(), version.c_str());
}
else if(ptype == "number"){
@@ -271,7 +271,7 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
if(par.size() == 1) reply = par[0].toChar();
}
else
- Msg::Error("Unknown OneLab parameter type in query: %s", ptype.c_str());
+ Msg::Error("Unknown ONELAB parameter type in query: %s", ptype.c_str());
if(reply.size()){
getGmshServer()->SendMessage
@@ -290,7 +290,7 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
std::vector<std::string> replies;
onelab::parameter::getInfoFromChar(message, version, ptype, name);
if(onelab::parameter::version() != version){
- Msg::Error("OneLab version mismatch (server: %s / client: %s)",
+ Msg::Error("ONELAB version mismatch (server: %s / client: %s)",
onelab::parameter::version().c_str(), version.c_str());
}
else if(ptype == "number"){
@@ -314,12 +314,12 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
it != functions.end(); it++) replies.push_back((*it).toChar());
}
else
- Msg::Error("Unknown OneLab parameter type in query: %s", ptype.c_str());
+ Msg::Error("Unknown ONELAB parameter type in query: %s", ptype.c_str());
for(unsigned int i = 0; i < replies.size(); i++)
getGmshServer()->SendMessage
(GmshSocket::GMSH_PARAMETER_QUERY_ALL, replies[i].size(), &replies[i][0]);
- reply = "Sent all OneLab " + ptype + "s";
+ reply = "Sent all ONELAB " + ptype + "s";
getGmshServer()->SendMessage
(GmshSocket::GMSH_PARAMETER_QUERY_END, reply.size(), &reply[0]);
}
@@ -673,7 +673,7 @@ static void archiveOutputFiles(const std::string &fileName)
CreateSingleDir(split[0] + "archive/");
saveDb(split[0] + "archive/" + split[1] + stamp + split[2]);
}
-
+
FlGui::instance()->rebuildTree(true);
}
@@ -788,7 +788,7 @@ void onelab_cb(Fl_Widget *w, void *data)
if(action == "save"){
std::vector<std::string> db = onelab::server::instance()->toChar();
- Msg::Direct("OneLab database:");
+ Msg::Direct("ONELAB database:");
for(unsigned int i = 0; i < db.size(); i++){
for(unsigned int j = 0; j < db[i].size(); j++)
if(db[i][j] == onelab::parameter::charSep()) db[i][j] = '|';