Changeset 22737

Timestamp:

05/03/18 10:00:45 (7 years ago)

Author:

erobo

Message:

CHG: corrected definition of norm inf

Location:

issm/trunk-jpl/src/c/toolkits/issm

Files:

• IssmDenseMat.h (modified) (2 diffs)
• IssmMpiDenseMat.h (modified) (2 diffs)
• IssmMpiSparseMat.h (modified) (1 diff)
• IssmMpiVec.h (modified) (2 diffs)
• IssmSeqVec.h (modified) (1 diff)
• SparseRow.h (modified) (2 diffs)

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

@@ -140 +140 @@
                         switch(mode){
                                 case NORM_INF:
-                                        norm=0;
+                                        norm=0.;
                                         for(i=0;i<this->M;i++){
                                                 absolute=0;
@@ -151 +151 @@
                                         break; 
                                 case NORM_FROB:
-                                        norm=0;
+                                        norm=0.;
                                         for(i=0;i<this->M;i++){
                                                 for(j=0;j<this->N;j++){
-                                                        norm+=pow(this->matrix[N*i+j],2);
+                                                        norm+=this->matrix[N*i+j]*this->matrix[N*i+j];
                                                 }
                                         }

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

@@ -311 +311 @@
                         switch(mode){
                                 case NORM_INF:
-                                        local_norm=0;
+                                        local_norm=0.;
                                         for(i=0;i<this->m;i++){
                                                 absolute=0;
@@ -324 +324 @@
                                         break; 
                                 case NORM_FROB:
-                                        local_norm=0;
+                                        local_norm=0.;
                                         for(i=0;i<this->m;i++){
                                                 for(j=0;j<this->N;j++){
-                                                        local_norm+=pow(this->matrix[N*i+j],2);
+                                                        local_norm+=this->matrix[N*i+j]*this->matrix[N*i+j];
                                                 }
                                         }

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

@@ -24 +24 @@
 #include "./SparseRow.h"
 #include <math.h>
-
 /*}}}*/
 

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

@@ -461 +461 @@
                         switch(mode){
                                 case NORM_INF:
-                                        //local_norm=0; for(i=0;i<this->m;i++)local_norm=max(local_norm,fabs(this->vector[i]));
-                                        local_norm=0; for(i=0;i<this->m;i++)local_norm=max(local_norm,this->vector[i]);
+                                        local_norm=0.; for(i=0;i<this->m;i++)local_norm=max(local_norm,fabs(this->vector[i]));
+                                        //local_norm=0; for(i=0;i<this->m;i++)local_norm=max(local_norm,this->vector[i]);
                                         ISSM_MPI_Reduce(&local_norm, &norm, 1, ISSM_MPI_DOUBLE, ISSM_MPI_MAX, 0, IssmComm::GetComm());
                                         ISSM_MPI_Bcast(&norm,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
@@ -468 +468 @@
                                         break;
                                 case NORM_TWO:
-                                        local_norm=0; 
-                                        for(i=0;i<this->m;i++)local_norm+=pow(this->vector[i],2);
+                                        local_norm=0.; 
+                                        for(i=0;i<this->m;i++)local_norm+=this->vector[i]*this->vector[i];
                                         ISSM_MPI_Reduce(&local_norm, &norm, 1, ISSM_MPI_DOUBLE, ISSM_MPI_SUM, 0, IssmComm::GetComm());
                                         ISSM_MPI_Bcast(&norm,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());

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

@@ -226 +226 @@
                         switch(mode){
                                 case NORM_INF:
-                                        //norm=0; for(i=0;i<this->M;i++)norm=max(norm,fabs(this->vector[i]));
-                                        norm=0; for(i=0;i<this->M;i++)norm=max(norm,this->vector[i]);
+                                        norm=0.; for(i=0;i<this->M;i++)norm=max(norm,fabs(this->vector[i]));
+                                        //norm=0.; for(i=0;i<this->M;i++)norm=max(norm,this->vector[i]);
                                         return norm;
                                         break;
                                 case NORM_TWO:
-                                        norm=0; 
-                                        for(i=0;i<this->M;i++)norm+=pow(this->vector[i],2);
+                                        norm=0.; 
+                                        for(i=0;i<this->M;i++)norm+=this->vector[i]*this->vector[i];
                                         return sqrt(norm);
                                         break;

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

@@ -102 +102 @@
 
                         int i;
-                        doubletype norm=0;
+                        doubletype norm=0.;
 
                         switch(mode){
@@ -113 +113 @@
                                 case NORM_FROB:
                                         for(i=0;i<ncols;i++){
-                                                norm+=pow(values[i],2);
+                                                norm+=values[i]*values[i];
                                         }
                                         return norm;