Changeset 17294

Timestamp:

02/18/14 14:48:28 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing some windows warnings

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyShreveAnalysis.cpp (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• classes/Loads/Riftfront.cpp (modified) (2 diffs)
• classes/Misfit.h (modified) (1 diff)
• shared/FSanalyticals/FSanalytical3.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp ¶

@@ -117 +117 @@
         element->GetVerticesCoordinates(&xyz_list);
         element->FindParam(&dt,TimesteppingTimeStepEnum);
+        element->FindParam(&diffusivity,HydrologyshreveStabilizationEnum);
         Input* vx_input=element->GetInput(HydrologyWaterVxEnum); _assert_(vx_input);
         Input* vy_input=element->GetInput(HydrologyWaterVyEnum); _assert_(vy_input);

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

@@ -814 +814 @@
 }/*}}}*/
 void Element::TransformSolutionCoord(IssmDouble* values,Node** nodes_list,int numnodes,int transformenum){/*{{{*/
-        this->TransformSolutionCoord(values,nodes_list,numnodes,transformenum);
+        /*NOT NEEDED*/
+        /*All nodes have the same Coordinate System*/
+        int* cs_array = xNew<int>(numnodes);
+        for(int i=0;i<numnodes;i++) cs_array[i]=transformenum;
+
+        /*Call core*/
+        this->TransformSolutionCoord(values,nodes_list,numnodes,cs_array);
+
+        /*Clean-up*/
+        xDelete<int>(cs_array);
 }/*}}}*/
 void Element::TransformSolutionCoord(IssmDouble* solution,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/

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

@@ -200 +200 @@
         IssmDouble  pressure,viscosity,Jdet2d;
         IssmDouble  bed_normal[3];
-        IssmDouble  basalforce[3];
+        IssmDouble  basalforce[3] = {0.};
         IssmDouble  epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/
         IssmDouble  stresstensor[6]={0.0};

issm/trunk-jpl/src/c/classes/FemModel.cpp ¶

@@ -117 +117 @@
         this->parameters->FindParam(&waitonlock,SettingsWaitonlockEnum);
         this->parameters->FindParam(&lockfilename,LockFileNameEnum);
-        if (waitonlock>0){
+        if(waitonlock){
                 _printf0_("write lock file:\n");
                 WriteLockFile(lockfilename);

issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp ¶

@@ -589 +589 @@
 
         IssmDouble  penetration;
-        int         activate;
+        bool        activate;
         int         unstable;
         IssmDouble  vx1;
@@ -634 +634 @@
 
         /*activation: */
-        if(penetration<0)activate=1;
-        else  activate=0;
+        if(penetration<0)activate=true;
+        else  activate=false;
 
         /*Here, we try to avoid zigzaging. When a penalty activates and deactivates for more than penalty_lock times, 

issm/trunk-jpl/src/c/classes/Misfit.h ¶

@@ -113 +113 @@
 
                          int i;
-                         IssmDouble misfit_t=0;
-                         IssmDouble all_misfit_t=0;
+                         IssmDouble misfit_t=0.;
+                         IssmDouble all_misfit_t=0.;
                          IssmDouble dt;
-                         IssmDouble area_t;
+                         IssmDouble area_t=0.;
                          IssmDouble all_area_t;
                          IssmDouble time,starttime,finaltime;

issm/trunk-jpl/src/c/shared/FSanalyticals/FSanalytical3.cpp ¶

@@ -4 +4 @@
  */
 
-#include <cmath.h>
+#include <math.h>
 #include "../Numerics/types.h"
 #include "../Numerics/constants.h"