Changeset 26135

Timestamp:

03/23/21 13:01:13 (4 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing DenseMat with new indices

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.cpp (modified) (1 diff)
• toolkits/issm/IssmDenseMat.h (modified) (1 diff)
• toolkits/issm/IssmSeqVec.h (modified) (2 diffs)

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

@@ -2340 +2340 @@
                 }
                 else{
-                        values[i]=meltratefactor[i]*tanh((base[i]-bed[i])/thresholdthickness)*(upperdepthmelt-base[i]);
+                        values[i]=meltratefactor[i]*tanh((base[i]-bed[i])/thresholdthickness);//*(upperdepthmelt-base[i]);
                 }
         }

issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h

@@ -230 +230 @@
                         switch(mode){
                                 case ADD_VAL:
-                                        for(i=0;i<m;i++) for(j=0;j<n;j++) this->matrix[N*idxm[i]+idxn[j]]+=values[n*i+j];
+                                        for(i=0;i<m;i++){
+                                                if(idxm[i]<0) continue;
+                                                for(j=0;j<n;j++){
+                                                        if(idxn[j]<0) continue;
+                                                        this->matrix[N*idxm[i]+idxn[j]]+=values[n*i+j];
+                                                }
+                                        }
                                         break;
                                 case INS_VAL:
-                                        for(i=0;i<m;i++) for(j=0;j<n;j++) this->matrix[N*idxm[i]+idxn[j]]=values[n*i+j];
+                                        for(i=0;i<m;i++){
+                                                if(idxm[i]<0) continue;
+                                                for(j=0;j<n;j++){
+                                                        if(idxn[j]<0) continue;
+                                                        this->matrix[N*idxm[i]+idxn[j]]=values[n*i+j];
+                                                }
+                                        }
                                         break;
                                 default:

issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h

@@ -101 +101 @@
                         switch(mode){
                                 case ADD_VAL:
-                                        for(i=0;i<ssize;i++) this->vector[list[i]]+=values[i];
+                                        for(i=0;i<ssize;i++) if(list[i]>=0) this->vector[list[i]]+=values[i];
                                         break;
                                 case INS_VAL:
-                                        for(i=0;i<ssize;i++) this->vector[list[i]]=values[i];
+                                        for(i=0;i<ssize;i++) if(list[i]>=0) this->vector[list[i]]=values[i];
                                         break;
                                 default:
@@ -113 +113 @@
                 }
                 /*}}}*/
-                void SetValue(int dof, doubletype value, InsMode mode){/*{{{*/
+                void SetValue(int dof, doubletype value,InsMode mode){/*{{{*/
+
+                        _assert_(dof>=0);
 
                         switch(mode){