diff --git a/Numeric/gmshLinearSystemGmm.h b/Numeric/gmshLinearSystemGmm.h index 79baa71bc753d02656654af2b2cc5ff3121b6568..a43d052cbcc1aa522afa97fc4ff67b34fc88222f 100644 --- a/Numeric/gmshLinearSystemGmm.h +++ b/Numeric/gmshLinearSystemGmm.h @@ -22,10 +22,10 @@ class gmshLinearSystemGmm : public gmshLinearSystem<scalar> { gmm::row_matrix<gmm::wsvector<scalar> > *_a; std::vector<scalar> *_b, *_x; double _prec; - int _noisy; - int _gmres; + int _noisy, _gmres; public: - gmshLinearSystemGmm() : _a(0), _b(0), _x(0), _prec(1.e-8), _noisy(0), _gmres(0) {} + gmshLinearSystemGmm() + : _a(0), _b(0), _x(0), _prec(1.e-8), _noisy(0), _gmres(0) {} virtual bool isAllocated() const { return _a != 0; } virtual void allocate(int _nbRows) { @@ -75,7 +75,7 @@ class gmshLinearSystemGmm : public gmshLinearSystem<scalar> { void setGmres(int n){ _gmres = n; } virtual int systemSolve() { - // gmm::ilutp_precond<gmm::row_matrix<gmm::rsvector<scalar> > > P(*_a, 10,0.); + //gmm::ilutp_precond<gmm::row_matrix<gmm::wsvector<scalar> > > P(*_a, 10, 0.); gmm::ildltt_precond<gmm::row_matrix<gmm::wsvector<scalar> > > P(*_a, 2, 1.e-10); gmm::iteration iter(_prec); iter.set_noisy(_noisy); diff --git a/Plugin/FiniteElement.cpp b/Plugin/FiniteElement.cpp index 4ab625b8d638fc53cbb87dae2fe4b8a94e7724d2..268be47708c32401366ec35c888740955c9f4d21 100644 --- a/Plugin/FiniteElement.cpp +++ b/Plugin/FiniteElement.cpp @@ -47,9 +47,10 @@ void GMSH_FiniteElementPlugin::getInfos(char *author, char *copyright, strcpy(help_text, "Plugin(FiniteElement) solves simple PDEs\n" "using the finite element method. This is only\n" - "intended as a demonstration!\n" + "intended as a demonstration tool: it is NOT\n" + "intended for general use." "\n" - "Plugin(FiniteElement) is creates a new view.\n"); + "Plugin(FiniteElement) creates a new view.\n"); } int GMSH_FiniteElementPlugin::getNbOptions() const @@ -150,8 +151,7 @@ PView *GMSH_FiniteElementPlugin::execute(PView *v) } else if(equation == "Helmholtz"){ solver<std::complex<double> > s; - std::complex<double> k(parameter, 0.1); - gmshFunction<std::complex<double> > waveNumber(k); + gmshFunction<std::complex<double> > waveNumber(parameter); gmshHelmholtzTerm helmholtz(m, &waveNumber, 1); for(unsigned int i = 0; i < groups[3][volume].size(); i++) helmholtz.addToMatrix(*s.myAssembler, groups[3][volume][i]);