Changeset 13975 for issm/trunk/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

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

issm/trunk/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp

@@ -12 +12 @@
 void CreateNodalConstraintsx( Vector<IssmDouble>** pys, Nodes* nodes,int configuration_type){
 
-        int i;
-        
-        /*intermediary: */
-        int  numberofdofs;
+        bool  oldalloc  = false;
 
         /*output: */
@@ -21 +18 @@
 
         /*figure out how many dofs we have: */
-        numberofdofs=nodes->NumberOfDofs(configuration_type,SsetEnum);
+        int ssize=nodes->NumberOfDofs(configuration_type,SsetEnum);
+        int slocalsize = nodes->NumberOfDofsLocal(configuration_type,SsetEnum);
 
         /*allocate:*/
-        ys=new Vector<IssmDouble>(numberofdofs);
+        if(oldalloc)
+         ys=new Vector<IssmDouble>(ssize);
+        else
+         ys=new Vector<IssmDouble>(slocalsize,ssize);
 
         /*go through all nodes, and for the ones corresponding to this configuration_type, fill the 
          * constraints vector with the constraint values: */
-        for (i=0;i<nodes->Size();i++){
+        for(int i=0;i<nodes->Size();i++){
                 Node* node=(Node*)nodes->GetObjectByOffset(i);
                 if (node->InAnalysis(configuration_type)){