From 91a1637db592bf005e285676c2cec25b1b5cb236 Mon Sep 17 00:00:00 2001 From: Gauthier Becker <gauthierbecker@gmail.com> Date: Tue, 10 May 2011 10:06:22 +0000 Subject: [PATCH] full DG non linear shell seems works create NonLinearSystem (have Fext and Fint separately in system) default implementation for explicit hulbert chung scheme (no need of petsc) --- Solver/linearSystemGMM.h | 2 +- Solver/linearSystemPETSc.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Solver/linearSystemGMM.h b/Solver/linearSystemGMM.h index a611822877..40d7a4ba6b 100644 --- a/Solver/linearSystemGMM.h +++ b/Solver/linearSystemGMM.h @@ -19,9 +19,9 @@ template <class scalar> class linearSystemGmm : public linearSystem<scalar> { protected: std::vector<scalar> *_x; // the nonLinearSystemGmm has to access to this vector + std::vector<scalar> *_b; // idem private: gmm::row_matrix<gmm::wsvector<scalar> > *_a; - std::vector<scalar> *_b; double _prec; int _noisy, _gmres; public: diff --git a/Solver/linearSystemPETSc.hpp b/Solver/linearSystemPETSc.hpp index dc66e63041..2694650dd6 100644 --- a/Solver/linearSystemPETSc.hpp +++ b/Solver/linearSystemPETSc.hpp @@ -2,13 +2,13 @@ #include <petsc.h> #include <petscksp.h> #include "linearSystemPETSc.h" -static void _try(int ierr) +static void _try(int ierr) { CHKERRABORT(PETSC_COMM_WORLD, ierr); } template <class scalar> -void linearSystemPETSc<scalar>::_kspCreate() +void linearSystemPETSc<scalar>::_kspCreate() { _try(KSPCreate(PETSC_COMM_WORLD, &_ksp)); PC pc; @@ -120,7 +120,7 @@ void linearSystemPETSc<scalar>::allocate(int nbRows) } template <class scalar> -void linearSystemPETSc<scalar>::print() +void linearSystemPETSc<scalar>::print() { _try(MatAssemblyBegin(_a, MAT_FINAL_ASSEMBLY)); _try(MatAssemblyEnd(_a, MAT_FINAL_ASSEMBLY)); @@ -254,7 +254,7 @@ int linearSystemPETSc<scalar>::systemSolve() //Msg::Info("%d iterations", its); return 1; } - + template <class scalar> std::vector<scalar> linearSystemPETSc<scalar>::getData() { -- GitLab