Changeset 18149

Timestamp:

06/12/14 15:33:54 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed AD compilation

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (5 diffs)
• shared/Matrix/MatrixUtils.cpp (modified) (2 diffs)

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

@@ -7 +7 @@
 #include "../cores/cores.h"
 
-//#define FSANALYTICAL 21
+#define FSANALYTICAL 4
 
 /*Model processing*/
@@ -3064 +3064 @@
 
         if(element->IsFloating() || !element->IsOnBase()) return NULL;
+        return NULL;
 
         /*If on water or not FS, skip stiffness: */
@@ -3074 +3075 @@
         IssmDouble  alpha2,Jdet;
         IssmDouble  x_coord,y_coord,z_coord;
+        IssmDouble *xyz_list      = NULL;
         IssmDouble *xyz_list_base = NULL;
         Gauss*      gauss         = NULL;
@@ -3091 +3093 @@
 
         /*Retrieve all inputs and parameters*/
+        element->GetVerticesCoordinates(&xyz_list);
         element->GetVerticesCoordinatesBase(&xyz_list_base);
         Input* vx_input         = element->GetInput(VxEnum);      _assert_(vx_input);
@@ -3123 +3126 @@
         /*Clean up and return*/
         delete gauss;
+        xDelete<IssmDouble>(xyz_list);
         xDelete<IssmDouble>(xyz_list_base);
         xDelete<IssmDouble>(B);

issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

@@ -3 +3 @@
  */ 
 
-#include "../Elements/elements.h"
 /*Headers*/
 /*{{{*/
@@ -461 +460 @@
         /*Compute determinant*/
         Matrix4x4Determinant(&det,A);
-        if(fabs(det) < DBL_EPSILON){
-                printarray(A,4,4);
-                _error_("Determinant smaller than machine epsilon");
-        }
+        if(fabs(det) < DBL_EPSILON) _error_("Determinant smaller than machine epsilon");
 
         /*Compute adjoint matrix*/