Changeset 26131 for issm/trunk-jpl/src/c/classes/Elements/Element.cpp

Timestamp:

03/23/21 11:52:52 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: big simplification here: we now carry the vectors of fset and sset using the same size as gset, with -1 when they are not in the right set. Example: old_fset = [1 2 3], new_fset=[1 -1 2 3 -1 -1]; enjoy

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp ¶

@@ -947 +947 @@
         /*First, figure out size of doflist and create it: */
         int numberofdofs=0;
-        for(int i=0;i<numnodes;i++) numberofdofs+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum);
+        for(int i=0;i<numnodes;i++) numberofdofs+=nodes[i]->GetNumberOfDofs(approximation_enum,GsetEnum);
 
         /*Allocate output*/
@@ -955 +955 @@
         int count=0;
         for(int i=0;i<numnodes;i++){
-                nodes[i]->GetDofList(doflist+count,approximation_enum,setenum);
-                count+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum);
+                nodes[i]->GetDofList(&doflist[count],approximation_enum,setenum);
+                count+=nodes[i]->GetNumberOfDofs(approximation_enum,GsetEnum);
         }
 
@@ -970 +970 @@
         /*First, figure out size of doflist and create it: */
         int numberofdofs=0;
-        for(int i=0;i<numnodes;i++) numberofdofs+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum);
+        for(int i=0;i<numnodes;i++) numberofdofs+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum);
 
         /*Allocate output*/
@@ -978 +978 @@
         int count=0;
         for(int i=0;i<numnodes;i++){
+                _assert_(count<numberofdofs);
                 nodes[i]->GetDofListLocal(doflist+count,approximation_enum,setenum);
-                count+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum);
+                count+=nodes[i]->GetNumberOfDofs(approximation_enum,GsetEnum);
         }
 
@@ -4373 +4374 @@
 
         /*Copy current stiffness matrix*/
-        values=xNew<IssmDouble>(Ke->nrows*Ke->ncols);
-        for(i=0;i<Ke->nrows;i++) for(j=0;j<Ke->ncols;j++) values[i*Ke->ncols+j]=Ke->values[i*Ke->ncols+j];
+        values=xNew<IssmDouble>(Ke->nrows*Ke->nrows);
+        for(i=0;i<Ke->nrows;i++) for(j=0;j<Ke->nrows;j++) values[i*Ke->nrows+j]=Ke->values[i*Ke->nrows+j];
 
         /*Get Coordinate Systems transform matrix*/
@@ -4381 +4382 @@
         /*Transform matrix: R*Ke*R^T */
         TripleMultiply(transform,numdofs,numdofs,0,
-                                values,Ke->nrows,Ke->ncols,0,
+                                values,Ke->nrows,Ke->nrows,0,
                                 transform,numdofs,numdofs,1,
                                 &Ke->values[0],0);
@@ -4549 +4550 @@
 
         /*Copy current stiffness matrix*/
-        values=xNew<IssmDouble>(Ke->nrows*Ke->ncols);
-        for(int i=0;i<Ke->nrows*Ke->ncols;i++) values[i]=Ke->values[i];
+        values=xNew<IssmDouble>(Ke->nrows*Ke->nrows);
+        for(int i=0;i<Ke->nrows*Ke->nrows;i++) values[i]=Ke->values[i];
 
         /*Get Coordinate Systems transform matrix*/
@@ -4557 +4558 @@
         /*Transform matrix: R^T*Ke*R */
         TripleMultiply(transform,numdofs,numdofs,1,
-                                values,Ke->nrows,Ke->ncols,0,
+                                values,Ke->nrows,Ke->nrows,0,
                                 transform,numdofs,numdofs,0,
                                 &Ke->values[0],0);