Changeset 16013

Timestamp:

08/29/13 10:45:40 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor cosmetics

Location:

issm/trunk-jpl/src/c

Files:

• analyses/balancevelocity_core.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/analyses/balancevelocity_core.cpp

@@ -20 +20 @@
 
         if(VerboseSolution()) _printf0_("call computational core:\n");
-        femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SmoothedSurfaceSlopeXAnalysisEnum);
-        solutionsequence_linear(femmodel);
-        femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SmoothedSurfaceSlopeYAnalysisEnum);
-        solutionsequence_linear(femmodel);
+        //femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SmoothedSurfaceSlopeXAnalysisEnum);
+        //solutionsequence_linear(femmodel);
+        //femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SmoothedSurfaceSlopeYAnalysisEnum);
+        //solutionsequence_linear(femmodel);
+        surfaceslope_core(femmodel);
 
         if(VerboseSolution()) _printf0_("call computational core:\n");

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

@@ -992 +992 @@
         vector[1]=xyz_list[1][1] - xyz_list[0][1];
 
-        norm=sqrt(pow(vector[0],2.0)+pow(vector[1],2.0));
+        norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]);
 
         normal[0]= + vector[1]/norm;
@@ -7255 +7255 @@
         GetInputListOnNodes(Ny,SurfaceSlopeYEnum);
         for(int i=0;i<numnodes;i++){
-                IssmDouble norm=sqrt(Nx[i]*Nx[i]+Ny[i]*Ny[i]);
+                IssmDouble norm=sqrt(Nx[i]*Nx[i]+Ny[i]*Ny[i]+1.e-10);
                 Nx[i] = Nx[i]/norm;
                 Ny[i] = Ny[i]/norm;
@@ -7261 +7261 @@
 
         /*Build HNx and HNy*/
-        GetInputListOnNodes(H, ThicknessEnum);
+        GetInputListOnNodes(H,ThicknessEnum);
         for(int i=0;i<numnodes;i++){
                 HNx[i]=H[i]*Nx[i];
@@ -7292 +7292 @@
                                                         basis[i]*basis[j]*(dhnx[0]+dhny[1])
                                                         + basis[i]*(dbasis[0*numnodes+j]*hnx + dbasis[1*numnodes+j]*hny)
-                                                        + gamma*(basis[j]*(dhnx[0]+dhny[1]) + dbasis[0*numnodes+j]*hnx + dbasis[1*numnodes+j]*hny)*
+                                                        + gamma*(basis[j]*(dhnx[0]+dhny[1])  + dbasis[0*numnodes+j]*hnx + dbasis[1*numnodes+j]*hny)*
                                                         (basis[i]*(dhnx[0]+dhny[1]) + dbasis[0*numnodes+i]*hnx + dbasis[1*numnodes+i]*hny)
                                                         );
@@ -7490 +7490 @@
         GetInputListOnNodes(Ny,SurfaceSlopeYEnum);
         for(int i=0;i<numnodes;i++){
-                IssmDouble norm=sqrt(Nx[i]*Nx[i]+Ny[i]*Ny[i]);
+                IssmDouble norm=sqrt(Nx[i]*Nx[i]+Ny[i]*Ny[i]+1.e-10);
                 Nx[i] = Nx[i]/norm;
                 Ny[i] = Ny[i]/norm;
@@ -7496 +7496 @@
 
         /*Build HNx and HNy*/
-        GetInputListOnNodes(H, ThicknessEnum);
+        GetInputListOnNodes(H,ThicknessEnum);
         for(int i=0;i<numnodes;i++){
                 HNx[i]=H[i]*Nx[i];