Changeset 15728

Timestamp:

08/06/13 14:39:01 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing some memory leaks + cosmetics

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (4 diffs)
• main/globals.h (modified) (1 diff)
• toolkits/ToolkitOptions.cpp (modified) (1 diff)
• toolkits/ToolkitOptions.h (modified) (1 diff)

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

@@ -5597 +5597 @@
         /*Fetch number of nodes and dof for this finite element*/
         int numnodes = this->NumberofNodes();
-        int numdof   = numnodes*NDOF1;
 
         /*Initialize Element matrix and vectors*/
         ElementMatrix* Ke     = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum);
         IssmDouble*    basis  = xNew<IssmDouble>(numnodes);
-        IssmDouble*    B      = xNew<IssmDouble>(2*numdof);
-        IssmDouble*    Bprime = xNew<IssmDouble>(2*numdof);
+        IssmDouble*    B      = xNew<IssmDouble>(2*numnodes);
+        IssmDouble*    Bprime = xNew<IssmDouble>(2*numnodes);
         IssmDouble     D[2][2];
 
@@ -5633 +5632 @@
                 D_scalar=gauss->weight*Jdettria;
 
-                TripleMultiply(basis,1,numdof,1,
+                TripleMultiply(basis,1,numnodes,1,
                                         &D_scalar,1,1,0,
-                                        basis,1,numdof,0,
+                                        basis,1,numnodes,0,
                                         Ke->values,1);
 
@@ -5647 +5646 @@
                 D[0][0]=D_scalar*dvxdx;
                 D[0][1]=0.;
+                D[1][0]=0.;
                 D[1][1]=D_scalar*dvydy;
-                D[1][1]=0.;
-                TripleMultiply(B,2,numdof,1,
+                TripleMultiply(B,2,numnodes,1,
                                         &D[0][0],2,2,0,
-                                        B,2,numdof,0,
+                                        B,2,numnodes,0,
                                         &Ke->values[0],1);
 
                 D[0][0]=D_scalar*vx;
                 D[1][1]=D_scalar*vy;
-                TripleMultiply(B,2,numdof,1,
+                TripleMultiply(B,2,numnodes,1,
                                         &D[0][0],2,2,0,
-                                        Bprime,2,numdof,0,
+                                        Bprime,2,numnodes,0,
                                         &Ke->values[0],1);
 
@@ -5667 +5666 @@
                 D[0][1]=D_scalar*diffusivity*h/(2*vel)*vx*vy;
                 D[1][1]=D_scalar*diffusivity*h/(2*vel)*vy*vy;
-                TripleMultiply(Bprime,2,numdof,1,
+                TripleMultiply(Bprime,2,numnodes,1,
                                         &D[0][0],2,2,0,
-                                        Bprime,2,numdof,0,
+                                        Bprime,2,numnodes,0,
                                         &Ke->values[0],1);
         }

issm/trunk-jpl/src/c/main/globals.h

@@ -13 +13 @@
 bool IssmComm::parallel;
 
-/*String that is used to characterize our toolkits, ends up in Petsc Options database if we use Petsc. Can also be used to characterize the ISSM toolkit, often used when Petsc is not allowed*/
+/*String that is used to characterize our toolkits, ends up in Petsc Options
+ * database if we use Petsc. Can also be used to characterize the ISSM toolkit,
+ * often used when Petsc is not allowed*/
 char* ToolkitOptions::toolkitoptions;
 

issm/trunk-jpl/src/c/toolkits/ToolkitOptions.cpp

@@ -2 +2 @@
  * \brief  file containing the methods for ToolkitOptions.h
  */
-
-#ifdef HAVE_CONFIG_H
-        #include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
 
 #include <string.h>

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

@@ -7 +7 @@
 #ifndef _TOOLKIT_OPTIONS_H
 #define _TOOLKIT_OPTIONS_H
-
-/*{{{*/
-#ifdef HAVE_CONFIG_H
-        #include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-/*}}}*/
 
 class ToolkitOptions {