source: issm/oecreview/Archive/12678-13393/ISSM-12898-12899.diff@ 14312

Last change on this file since 14312 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 3.6 KB

  • u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementVector.h

     
    1515#include "../../EnumDefinitions/EnumDefinitions.h"
    1616class Node;
    1717class Vector;
     18class Parameters;
    1819/*}}}*/
    1920
    2021class ElementVector{

  • u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Vector.cpp

     
    2424/*FUNCTION Vector::Vector(){{{*/
    2525Vector::Vector(){
    2626
     27        #ifdef _HAVE_PETSC_
    2728        this->pvector=NULL;
     29        #endif
    2830        this->svector=NULL;
    2931       
    3032        type=PetscVecType; //default
    … …  
    3739/*FUNCTION Vector::Vector(int M,bool fromlocalsize,int type){{{*/
    3840Vector::Vector(int M,bool fromlocalsize,int in_type){
    3941       
     42        #ifdef _HAVE_PETSC_
    4043        pvector=NULL;
     44        #endif
    4145        svector=NULL;
    4246        type=in_type;
    4347
    … …  
    5963/*FUNCTION Vector::Vector(IssmDouble* serial_vec,int M,int type){{{*/
    6064Vector::Vector(IssmDouble* serial_vec,int M,int in_type){
    6165
     66        #ifdef _HAVE_PETSC_
    6267        pvector=NULL;
     68        #endif
     69
    6370        svector=NULL;
    6471        type=in_type;
    6572

  • u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementMatrix.h

     
    1515#include "../../EnumDefinitions/EnumDefinitions.h"
    1616class Node;
    1717class Matrix;
     18class Parameters;
    1819/*}}}*/
    1920
    2021class ElementMatrix{

  • u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Matrix.cpp

     
    2525/*FUNCTION Matrix::Matrix(){{{*/
    2626Matrix::Matrix(){
    2727
     28        #ifdef _HAVE_PETSC_
    2829        pmatrix=NULL;
     30        #endif
    2931        smatrix=NULL;
    3032
    3133        type=PetscMatType; //default
    … …  
    3840/*FUNCTION Matrix::Matrix(int M,int N,int type){{{*/
    3941Matrix::Matrix(int M,int N,int in_type){
    4042
     43        #ifdef _HAVE_PETSC_
    4144        pmatrix=NULL;
     45        #endif
    4246        smatrix=NULL;
    4347        type=in_type;
    4448
    … …  
    5963/*FUNCTION Matrix::Matrix(int M,int N,IssmDouble sparsity,int type){{{*/
    6064Matrix::Matrix(int M,int N,IssmDouble sparsity,int in_type){
    6165
     66        #ifdef _HAVE_PETSC_
    6267        pmatrix=NULL;
     68        #endif
    6369        smatrix=NULL;
    6470        type=in_type;
    6571
    … …  
    7985/*FUNCTION Matrix::Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity,int type){{{*/
    8086Matrix::Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity,int in_type){
    8187
     88        #ifdef _HAVE_PETSC_
    8289        pmatrix=NULL;
     90        #endif
    8391        smatrix=NULL;
    8492        type=in_type;
    8593
    … …  
    100108/*FUNCTION Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode,int type){{{*/
    101109Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode,int in_type){
    102110
     111        #ifdef _HAVE_PETSC_
    103112        pmatrix=NULL;
     113        #endif
    104114        smatrix=NULL;
    105115        type=in_type;
    106116
Note: See TracBrowser for help on using the repository browser.