Changeset 13036 for issm/trunk-jpl/src/c/classes/matrix/Matrix.cpp

Timestamp:

08/14/12 16:58:21 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renaming _error2_ _error_

File:

• issm/trunk-jpl/src/c/classes/matrix/Matrix.cpp (modified) (20 diffs)

issm/trunk-jpl/src/c/classes/matrix/Matrix.cpp

@@ -51 +51 @@
                 this->pmatrix=new PetscMat(M,N);
                 #else
-                _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
+                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
                 #endif
         }
@@ -57 +57 @@
                 this->smatrix=new SeqMat(M,N);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 
 }
@@ -74 +74 @@
                 this->pmatrix=new PetscMat(M,N,sparsity);
                 #else
-                _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
+                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
                 #endif
         }
@@ -80 +80 @@
                 this->smatrix=new SeqMat(M,N,sparsity);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 }
 /*}}}*/
@@ -96 +96 @@
                 this->pmatrix=new PetscMat(serial_mat,M,N,sparsity);
                 #else
-                _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
+                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
                 #endif
         }
@@ -102 +102 @@
                 this->smatrix=new SeqMat(serial_mat,M,N,sparsity);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
         
 }
@@ -119 +119 @@
                 this->pmatrix=new PetscMat(M,N,connectivity,numberofdofspernode);
                 #else
-                _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
+                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
                 #endif
         }
@@ -125 +125 @@
                 this->smatrix=new SeqMat(M,N,connectivity,numberofdofspernode);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
         
 }
@@ -136 +136 @@
                 delete this->pmatrix;
                 #else
-                _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
+                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
                 #endif
         }
@@ -142 +142 @@
                 delete this->smatrix;
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 
 }
@@ -159 +159 @@
                 this->smatrix->Echo();
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 
 }
@@ -175 +175 @@
         }
         else{
-                _error2_("Matrix type: " << type << " not supported yet!");
+                _error_("Matrix type: " << type << " not supported yet!");
         }
 }
@@ -192 +192 @@
                 norm=this->smatrix->Norm(norm_type);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 
         return norm;
@@ -208 +208 @@
                 this->smatrix->GetSize(pM,pN);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
         
 }
@@ -223 +223 @@
                 this->smatrix->GetLocalSize(pM,pN);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 
 }
@@ -238 +238 @@
                 this->smatrix->MatMult(X->svector,AX->svector);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 
 }
@@ -257 +257 @@
                 output->smatrix=this->smatrix->Duplicate();
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
         
         return output;
@@ -275 +275 @@
                 output=this->smatrix->ToSerial();
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 
 
@@ -292 +292 @@
                 this->smatrix->SetValues(m,idxm,n,idxn,values,mode);
         }
-        else _error2_("Matrix type: " << type << " not supported yet!");
+        else _error_("Matrix type: " << type << " not supported yet!");
 }
 /*}}}*/
@@ -307 +307 @@
         }
         else{
-                _error2_("Matrix type: " << type << " not supported yet!");
-        }
-
-}
-/*}}}*/
+                _error_("Matrix type: " << type << " not supported yet!");
+        }
+
+}
+/*}}}*/