/[escript]/trunk/escriptcore/src/EscriptParams.cpp
ViewVC logotype

Diff of /trunk/escriptcore/src/EscriptParams.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 6140 by caltinay, Wed Apr 6 02:10:10 2016 UTC revision 6141 by caltinay, Wed Apr 6 03:51:30 2016 UTC
# Line 45  EscriptParams::EscriptParams() Line 45  EscriptParams::EscriptParams()
45  #else    #else  
46     have_trilinos=0;     have_trilinos=0;
47  #endif    #endif  
48    #ifdef ESYS_HAVE_BOOST_IO
49       have_unzip = 1;
50    #else
51       have_unzip = 0;
52    #endif
53  #ifdef USE_LAPACK  #ifdef USE_LAPACK
54     lapack_support=1;     lapack_support=1;
55  #else  #else
56     lapack_support=0;     lapack_support=0;
57  #endif  #endif
58    
59      gmsh = gmsh_mpi = 0;  #ifdef ESYS_HAVE_GMSH
 #if defined(GMSH) || defined(GMSH_MPI)  
60      gmsh = 1;      gmsh = 1;
61    #else
62        gmsh = 0;
63  #endif  #endif
64      //only mark gmsh as mpi if escript built with mpi, otherwise comm_spawns      //only mark gmsh as mpi if escript built with mpi, otherwise comm_spawns
65      //might just fail terribly      //might just fail terribly
66  #if defined(GMSH_MPI) && defined(ESYS_MPI)  #if defined(ESYS_GMSH_MPI) && defined(ESYS_MPI)
67      gmsh_mpi = 1;      gmsh_mpi = 1;
68    #else
69        gmsh_mpi = 0;
70  #endif  #endif
71    
72  #ifdef ESYS_MPI  #ifdef ESYS_MPI
# Line 172  EscriptParams::getInt(const char* name, Line 180  EscriptParams::getInt(const char* name,
180      }      }
181      if (!strcmp(name, "HAVE_TRILINOS"))      if (!strcmp(name, "HAVE_TRILINOS"))
182          return have_trilinos;          return have_trilinos;
183        if (!strcmp(name, "HAVE_UNZIP"))
184            return have_unzip;
185      if (!strcmp(name, "GMSH_SUPPORT"))      if (!strcmp(name, "GMSH_SUPPORT"))
186          return gmsh;          return gmsh;
187      if (!strcmp(name, "GMSH_MPI"))      if (!strcmp(name, "GMSH_MPI"))
# Line 226  EscriptParams::listEscriptParams() Line 236  EscriptParams::listEscriptParams()
236     l.append(make_tuple("DISABLE_AMG", amg_disabled, "{0,1} AMG is disabled."));     l.append(make_tuple("DISABLE_AMG", amg_disabled, "{0,1} AMG is disabled."));
237     l.append(make_tuple("NETCDF_BUILD", has_netcdf, "{0,1} Was this build made with netcdf libraries?"));     l.append(make_tuple("NETCDF_BUILD", has_netcdf, "{0,1} Was this build made with netcdf libraries?"));
238     l.append(make_tuple("HAVE_TRILINOS", have_trilinos, "{0,1} Was this build made with trilinos libraries?"));     l.append(make_tuple("HAVE_TRILINOS", have_trilinos, "{0,1} Was this build made with trilinos libraries?"));
239       l.append(make_tuple("HAVE_UNZIP", have_unzip, "{0,1} Was this build made with unzip libraries (boost::iostreams)?"));
240     l.append(make_tuple("GMSH_SUPPORT", gmsh, "{0,1} Non-python GMSH support is available."));     l.append(make_tuple("GMSH_SUPPORT", gmsh, "{0,1} Non-python GMSH support is available."));
241     l.append(make_tuple("GMSH_MPI", gmsh_mpi, "{0,1} Both GMSH and escript have MPI capabilities."));     l.append(make_tuple("GMSH_MPI", gmsh_mpi, "{0,1} Both GMSH and escript have MPI capabilities."));
242     return l;     return l;

Legend:
Removed from v.6140  
changed lines
  Added in v.6141

  ViewVC Help
Powered by ViewVC 1.1.26