Changeset 6021

Timestamp:

09/24/10 10:42:23 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor renaming of field square

Location:

issm/trunk/src/c/objects/Numerics

Files:

• ElementMatrix.cpp (modified) (10 diffs)
• ElementMatrix.h (modified) (1 diff)

issm/trunk/src/c/objects/Numerics/ElementMatrix.cpp

@@ -26 +26 @@
         this->ncols=0;
         this->values=NULL;
-        this->square=false;
+        this->dofsymmetrical=false;
         this->kff=false;
 
@@ -68 +68 @@
 
         /*General Case: Ke1 and Ke2 are not empty*/
-        if(!Ke1->square || !Ke2->square) ISSMERROR("merging 2 non square matrices not implemented yet");
+        if(!Ke1->dofsymmetrical || !Ke2->dofsymmetrical) ISSMERROR("merging 2 non dofsymmetrical matrices not implemented yet");
 
         /*Initialize itransformation matrix Ke[P[i]] = Ke2[i]*/
@@ -90 +90 @@
         this->nrows=gsize;
         this->ncols=gsize;
-        this->square=true;
+        this->dofsymmetrical=true;
         this->kff=Ke1->kff;
 
@@ -195 +195 @@
 
         /*get Matrix size and properties*/
-        this->square=true;
+        this->dofsymmetrical=true;
         this->nrows=GetNumberOfDofs(nodes,numnodes,GsetEnum,approximation);
         this->ncols=this->nrows;
@@ -223 +223 @@
         }
 
-        /*Because this matrix is "square" don't do cols, we can pick them up from the rows: */
+        /*Because this matrix is "dofsymmetrical" don't do cols, we can pick them up from the rows: */
         this->col_fsize=0;
         this->col_flocaldoflist=NULL;
@@ -268 +268 @@
         double* localvalues=NULL;
 
-        if(this->square){
+        if(this->dofsymmetrical){
                 /*only use row dofs to add values into global matrices: */
                 
@@ -309 +309 @@
         }
         else{
-                ISSMERROR(" non square matrix AddToGlobal routine not support yet!");
+                ISSMERROR(" non dofsymmetrical matrix AddToGlobal routine not support yet!");
         }
 
@@ -334 +334 @@
         printf("   nrows: %i\n",nrows);
         printf("   ncols: %i\n",ncols);
-        printf("   square: %s\n",square?"true":"false");
+        printf("   dofsymmetrical: %s\n",dofsymmetrical?"true":"false");
         printf("   kff: %s\n",kff?"true":"false");
 
@@ -359 +359 @@
         if(row_sglobaldoflist)for(i=0;i<row_ssize;i++)printf("%i ",row_sglobaldoflist[i]); printf("\n");
 
-        if(!square){
+        if(!dofsymmetrical){
                 printf("   col_fsize: %i\n",col_fsize);
                 printf("   col_flocaldoflist (%p): ",col_flocaldoflist);
@@ -381 +381 @@
         this->nrows =Ke->nrows;
         this->ncols =Ke->ncols;
-        this->square=Ke->square;
+        this->dofsymmetrical=Ke->dofsymmetrical;
         this->kff   =Ke->kff;
 

issm/trunk/src/c/objects/Numerics/ElementMatrix.h

@@ -23 +23 @@
                 int      nrows;
                 int      ncols;
-                bool     square;
+                bool     dofsymmetrical;
                 bool     kff;
                 double*  values;