Changeset 15396 for issm/trunk/src/c/classes/matrix/ElementMatrix.cpp

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/classes/matrix/ElementMatrix.cpp (modified) (3 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

issm/trunk/src/c/classes/matrix/ElementMatrix.cpp

@@ -15 +15 @@
 #include "../classes.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
 /*}}}*/
 
@@ -251 +249 @@
         IssmDouble* localvalues=NULL;
 
+        /*Check that Kff has been alocated in debugging mode*/
+        _assert_(Kff);
+
         /*If Kfs is not provided, call the other function*/
         if(!Kfs){
@@ -376 +377 @@
 
         int i,j;
-        _printLine_("Element Matrix echo:");
-        _printLine_("   nrows: " << this->nrows);
-        _printLine_("   ncols: " << this->ncols);
-        _printLine_("   dofsymmetrical: " << (dofsymmetrical?"true":"false"));
-
-        _printLine_("   values:");
+        _printf_("Element Matrix echo:\n");
+        _printf_("   nrows: " << this->nrows << "\n");
+        _printf_("   ncols: " << this->ncols << "\n");
+        _printf_("   dofsymmetrical: " << (dofsymmetrical?"true":"false") << "\n");
+
+        _printf_("   values:\n");
         for(i=0;i<nrows;i++){
-                _printString_(setw(4) << right << i << ": ");
-                for(j=0;j<ncols;j++) _printString_( " " << setw(11) << setprecision (5) << right << values[i*ncols+j]);
-                _printLine_("");
-        }
-
-        _printString_("   gglobaldoflist (" << gglobaldoflist << "): ");
-        if(gglobaldoflist) for(i=0;i<nrows;i++) _printString_(" " << gglobaldoflist[i]); _printLine_("");
-
-        _printLine_("   row_fsize: " << row_fsize);
-        _printString_("   row_flocaldoflist  (" << row_flocaldoflist << "): ");
-        if(row_flocaldoflist) for(i=0;i<row_fsize;i++) _printString_(" " << row_flocaldoflist[i]); _printLine_(" ");
-        _printString_("   row_fglobaldoflist  (" << row_fglobaldoflist << "): ");
-        if(row_fglobaldoflist) for(i=0;i<row_fsize;i++) _printString_(" " << row_fglobaldoflist[i]); _printLine_(" ");
-
-        _printLine_("   row_ssize: " << row_ssize);
-        _printString_("   row_slocaldoflist  (" << row_slocaldoflist << "): ");
-        if(row_slocaldoflist) for(i=0;i<row_ssize;i++) _printString_(" " << row_slocaldoflist[i]); _printLine_(" ");
-        _printString_("   row_sglobaldoflist  (" << row_sglobaldoflist << "): ");
-        if(row_sglobaldoflist) for(i=0;i<row_ssize;i++) _printString_(" " << row_sglobaldoflist[i]); _printLine_(" ");
+                _printf_(setw(4) << right << i << ": ");
+                for(j=0;j<ncols;j++) _printf_( " " << setw(11) << setprecision (5) << right << values[i*ncols+j]);
+                _printf_("\n");
+        }
+
+        _printf_("   gglobaldoflist (" << gglobaldoflist << "): ");
+        if(gglobaldoflist) for(i=0;i<nrows;i++) _printf_(" " << gglobaldoflist[i] << "\n"); _printf_("\n");
+
+        _printf_("   row_fsize: " << row_fsize << "\n");
+        _printf_("   row_flocaldoflist  (" << row_flocaldoflist << "): ");
+        if(row_flocaldoflist) for(i=0;i<row_fsize;i++) _printf_(" " << row_flocaldoflist[i] << "\n"); _printf_(" \n");
+        _printf_("   row_fglobaldoflist  (" << row_fglobaldoflist << "): ");
+        if(row_fglobaldoflist) for(i=0;i<row_fsize;i++) _printf_(" " << row_fglobaldoflist[i] << "\n"); _printf_(" \n");
+
+        _printf_("   row_ssize: " << row_ssize << "\n");
+        _printf_("   row_slocaldoflist  (" << row_slocaldoflist << "): ");
+        if(row_slocaldoflist) for(i=0;i<row_ssize;i++) _printf_(" " << row_slocaldoflist[i] << "\n"); _printf_(" \n");
+        _printf_("   row_sglobaldoflist  (" << row_sglobaldoflist << "): ");
+        if(row_sglobaldoflist) for(i=0;i<row_ssize;i++) _printf_(" " << row_sglobaldoflist[i] << "\n"); _printf_(" \n");
 
         if(!dofsymmetrical){
-                _printLine_("   col_fsize: " << col_fsize);
-                _printString_("   col_flocaldoflist  (" << col_flocaldoflist << "): ");
-                if(col_flocaldoflist) for(i=0;i<col_fsize;i++) _printString_(" " << col_flocaldoflist[i]); _printLine_(" ");
-                _printString_("   col_fglobaldoflist  (" << col_fglobaldoflist << "): ");
-                if(col_fglobaldoflist) for(i=0;i<col_fsize;i++) _printString_(" " << col_fglobaldoflist[i]); _printLine_(" ");
-
-                _printLine_("   col_ssize: " << col_ssize);
-                _printString_("   col_slocaldoflist  (" << col_slocaldoflist << "): ");
-                if(col_slocaldoflist) for(i=0;i<col_ssize;i++) _printString_(" " << col_slocaldoflist[i]); _printLine_(" ");
-                _printString_("   col_sglobaldoflist  (" << col_sglobaldoflist << "): ");
-                if(col_sglobaldoflist) for(i=0;i<col_ssize;i++) _printString_(" " << col_sglobaldoflist[i]); _printLine_(" ");
+                _printf_("   col_fsize: " << col_fsize << "\n");
+                _printf_("   col_flocaldoflist  (" << col_flocaldoflist << "): ");
+                if(col_flocaldoflist) for(i=0;i<col_fsize;i++) _printf_(" " << col_flocaldoflist[i] << "\n"); _printf_(" \n");
+                _printf_("   col_fglobaldoflist  (" << col_fglobaldoflist << "): ");
+                if(col_fglobaldoflist) for(i=0;i<col_fsize;i++) _printf_(" " << col_fglobaldoflist[i] << "\n"); _printf_(" \n");
+
+                _printf_("   col_ssize: " << col_ssize << "\n");
+                _printf_("   col_slocaldoflist  (" << col_slocaldoflist << "): ");
+                if(col_slocaldoflist) for(i=0;i<col_ssize;i++) _printf_(" " << col_slocaldoflist[i] << "\n"); _printf_(" \n");
+                _printf_("   col_sglobaldoflist  (" << col_sglobaldoflist << "): ");
+                if(col_sglobaldoflist) for(i=0;i<col_ssize;i++) _printf_(" " << col_sglobaldoflist[i] << "\n"); _printf_(" \n");
         }
 }

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache