Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp

@@ -37 +37 @@
 
         /*Allocate connectivity: */
-        connectivity=(double*)xcalloc(nods*width,sizeof(double));
+        connectivity=xNewZeroInit<double>(nods*width);
 
         /*Go through all elements, and for each elements, plug into the connectivity, all the nodes. 
@@ -71 +71 @@
          * warn the user to increase the connectivity width: */
         for(i=0;i<nods;i++){
-                if (*(connectivity+width*i+maxels)>maxels)_error_("%s%g%s"," max connectivity width reached (",*(connectivity+width*i+maxels),")! increase width of connectivity table");
+                if (*(connectivity+width*i+maxels)>maxels)_error2_("max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table");
         }