Changeset 25910

Timestamp:

12/21/20 18:01:22 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics

Location:

issm/trunk-jpl/src/c/classes/matrix

Files:

• ElementMatrix.cpp (modified) (5 diffs)
• ElementVector.cpp (modified) (1 diff)

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

@@ -271 +271 @@
 void ElementMatrix::AddToGlobal(Matrix<IssmDouble>* Kff, Matrix<IssmDouble>* Kfs){/*{{{*/
 
-        int i,j;
-        IssmDouble* localvalues=NULL;
-
         /*Check that Kff has been alocated in debugging mode*/
         _assert_(Kff);
@@ -291 +288 @@
                 if(this->row_fsize){
                         /*first, retrieve values that are in the f-set from the g-set values matrix: */
-                        localvalues=xNew<IssmDouble>(this->row_fsize*this->row_fsize);
-                        for(i=0;i<this->row_fsize;i++){
-                                for(j=0;j<this->row_fsize;j++){
+                        IssmDouble* localvalues=xNew<IssmDouble>(this->row_fsize*this->row_fsize);
+                        for(int i=0;i<this->row_fsize;i++){
+                                for(int j=0;j<this->row_fsize;j++){
                                         localvalues[this->row_fsize*i+j]=this->values[this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]];
                                 }
@@ -307 +304 @@
                 if((this->row_ssize!=0) && (this->row_fsize!=0)){
                         /*first, retrieve values that are in the f and s-set from the g-set values matrix: */
-                        localvalues=xNew<IssmDouble>(this->row_fsize*this->row_ssize);
-                        for(i=0;i<this->row_fsize;i++){
-                                for(j=0;j<this->row_ssize;j++){
+                        IssmDouble* localvalues=xNew<IssmDouble>(this->row_fsize*this->row_ssize);
+                        for(int i=0;i<this->row_fsize;i++){
+                                for(int j=0;j<this->row_ssize;j++){
                                         localvalues[this->row_ssize*i+j]=this->values[this->ncols*this->row_flocaldoflist[i]+this->row_slocaldoflist[j]];
                                 }
@@ -328 +325 @@
 void ElementMatrix::AddToGlobal(Matrix<IssmDouble>* Jff){/*{{{*/
 
-        int i,j;
-        IssmDouble* localvalues=NULL;
-
         /*Check that Jff is not NULL*/
         _assert_(Jff); 
@@ -342 +336 @@
                 if(this->row_fsize){
                         /*first, retrieve values that are in the f-set from the g-set values matrix: */
-                        localvalues=xNew<IssmDouble>(this->row_fsize*this->row_fsize);
-                        for(i=0;i<this->row_fsize;i++){
-                                for(j=0;j<this->row_fsize;j++){
-                                        *(localvalues+this->row_fsize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]);
+                        IssmDouble* localvalues=xNew<IssmDouble>(this->row_fsize*this->row_fsize);
+                        for(int i=0;i<this->row_fsize;i++){
+                                for(int j=0;j<this->row_fsize;j++){
+                                        localvalues[this->row_fsize*i+j]=this->values[this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]];
                                 }
                         }

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

@@ -238 +238 @@
 void ElementVector::InsertIntoGlobal(Vector<IssmDouble>* pf){/*{{{*/
 
-        int i;
-        IssmDouble* localvalues=NULL;
-
         if(this->fsize){
                 /*first, retrieve values that are in the f-set from the g-set values vector: */
-                localvalues=xNew<IssmDouble>(this->fsize);
-                for(i=0;i<this->fsize;i++){
+                IssmDouble* localvalues=xNew<IssmDouble>(this->fsize);
+                for(int i=0;i<this->fsize;i++){
                         localvalues[i]=this->values[this->flocaldoflist[i]];
                 }