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

fix warnings

parent 2e36dce1
No related branches found
No related tags found
No related merge requests found
...@@ -39,9 +39,9 @@ option(ENABLE_OCC "Enable OpenCASCADE geometrical models" ON) ...@@ -39,9 +39,9 @@ option(ENABLE_OCC "Enable OpenCASCADE geometrical models" ON)
option(ENABLE_OSMESA "Use OSMesa for offscreen rendering" OFF) option(ENABLE_OSMESA "Use OSMesa for offscreen rendering" OFF)
option(ENABLE_PARSER "Build the GEO file parser" ON) option(ENABLE_PARSER "Build the GEO file parser" ON)
option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ON) option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ON)
option(ENABLE_SLEPC "Enable SLEPc eigensolvers" ON)
option(ENABLE_POST "Build the post-processing module" ON) option(ENABLE_POST "Build the post-processing module" ON)
option(ENABLE_QT "Build QT GUI" OFF) option(ENABLE_QT "Build QT GUI" OFF)
option(ENABLE_SLEPC "Enable SLEPc eigensolvers" ON)
option(ENABLE_TAUCS "Enable Taucs linear algebra solver" ON) option(ENABLE_TAUCS "Enable Taucs linear algebra solver" ON)
option(ENABLE_TETGEN "Enable Tetgen mesh generator" ON) option(ENABLE_TETGEN "Enable Tetgen mesh generator" ON)
option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF) option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF)
......
...@@ -25,6 +25,9 @@ ConnectionManager::ConnectionManager() ...@@ -25,6 +25,9 @@ ConnectionManager::ConnectionManager()
std::string ConnectionManager::getSocketName() std::string ConnectionManager::getSocketName()
{ {
// FIXME: this should be changed to incorporate info about the
// connection number (i.e. the integer in the _all map) so that we
// can have several connections active at the same time
std::string sockname; std::string sockname;
if(!strstr(CTX::instance()->solver.socketName.c_str(), ":")){ if(!strstr(CTX::instance()->solver.socketName.c_str(), ":")){
// Unix socket // Unix socket
......
...@@ -67,9 +67,10 @@ class ConnectionManager { ...@@ -67,9 +67,10 @@ class ConnectionManager {
// a pointer to the server when the remote program is running, or 0 // a pointer to the server when the remote program is running, or 0
// when stopped // when stopped
GmshServer *_server; GmshServer *_server;
// a static map of all available remote programs: ints 0, 1, ... 4 // a static map of all available remote programs: values 0, 1, 2, 3,
// are reserved for the main solver menu; int -1 is used when // 4 are reserved for the main solver menu; -1 is used when
// permanently listening for incoming connections // permanently listening for incoming connections; 99 is used for
// remote Gmsh
static std::map<int, ConnectionManager*> _all; static std::map<int, ConnectionManager*> _all;
public: public:
ConnectionManager(); ConnectionManager();
......
...@@ -204,6 +204,7 @@ class GmshSocket{ ...@@ -204,6 +204,7 @@ class GmshSocket{
} }
return 0; return 0;
} }
// str should be allocated with size (len+1)
int ReceiveString(int len, char *str) int ReceiveString(int len, char *str)
{ {
if(_ReceiveData(str, len) == len) { if(_ReceiveData(str, len) == len) {
......
...@@ -141,7 +141,7 @@ class Graph ...@@ -141,7 +141,7 @@ class Graph
{ {
const int i = numGrVert++; const int i = numGrVert++;
xadj[i] = adjncy.size(); xadj[i] = adjncy.size();
vwgts[i-1]=(int)(1.0); vwgts[i-1] = 1;
grVertMapIt->second.write(adjncy); grVertMapIt->second.write(adjncy);
element[i] = grVertMapIt->first; element[i] = grVertMapIt->first;
// Translated vertex numbers start from 1 // Translated vertex numbers start from 1
...@@ -151,7 +151,7 @@ class Graph ...@@ -151,7 +151,7 @@ class Graph
{ {
int num = 0; int num = 0;
for(std::vector<int>::iterator it = wgts.begin(); it != wgts.end(); it++){ for(std::vector<int>::iterator it = wgts.begin(); it != wgts.end(); it++){
vwgts[num]= 1.0; //*it; vwgts[num]= 1; //*it;
num++; num++;
} }
} }
......
...@@ -44,7 +44,7 @@ class eigenSolver{ ...@@ -44,7 +44,7 @@ class eigenSolver{
{ {
Msg::Error("Eigen solver requires SLEPc"); Msg::Error("Eigen solver requires SLEPc");
} }
int getNumEigenValues(){ return 0.; } int getNumEigenValues(){ return 0; }
std::complex<double> getEigenValue(int num){ return 0.; } std::complex<double> getEigenValue(int num){ return 0.; }
std::vector<std::complex<double> > &getEigenVector(int num){ return _dummy; } std::vector<std::complex<double> > &getEigenVector(int num){ return _dummy; }
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment