Changeset 13941

Timestamp:

11/12/12 14:01:38 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: switching new allocation back on

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (2 diffs)
• modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (modified) (2 diffs)
• modules/Reduceloadx/Reduceloadx.cpp (modified) (1 diff)
• modules/Reducevectorgtofx/Reducevectorgtofx.cpp (modified) (1 diff)
• modules/Reducevectorgtosx/Reducevectorgtosx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -353 +353 @@
         Vector<IssmDouble> *df   = NULL;
 
-        bool oldalloc=true;
+        bool oldalloc=false;
 
         /*retrieve parameters: */
@@ -594 +594 @@
         /*Initialize Jacobian Matrix*/
         this->AllocateSystemMatrices(&Jff,NULL,NULL,NULL);
-        Jff=new Matrix<IssmDouble>(fsize,fsize,connectivity,numberofdofspernode);
 
         /*Create and assemble matrix*/

issm/trunk-jpl/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)){

issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp

@@ -20 +20 @@
         int         global_m,global_n;
         bool        fromlocalsize = true;
-        bool        oldalloc  = true;
+        bool        oldalloc  = false;
 
         if(VerboseModule()) _pprintLine_("   Dirichlet lifting applied to load vector");

issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp

@@ -15 +15 @@
         int         fsize;
         IssmDouble *ug_serial = NULL;
-        bool        oldalloc  = true;
+        bool        oldalloc  = false;
 
         /*first figure out fsize: */

issm/trunk-jpl/src/c/modules/Reducevectorgtosx/Reducevectorgtosx.cpp

@@ -21 +21 @@
         ssize=nodes->NumberOfDofs(configuration_type,SsetEnum);
 
+        int analysis_type;
+        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        int slocalsize = nodes->NumberOfDofsLocal(analysis_type,SsetEnum);
+
+        bool oldalloc = false;
+
         if(ssize==0){
                 ys=NULL;
@@ -26 +32 @@
         else{
                 /*allocate: */
-                ys=new Vector<IssmDouble>(ssize);
+                if(oldalloc)
+                 ys=new Vector<IssmDouble>(ssize);
+                else
+                 ys=new Vector<IssmDouble>(slocalsize,ssize);
 
                 if(nodes->NumberOfNodes(configuration_type)){