Changeset 3464

Timestamp:

04/08/10 10:00:48 (15 years ago)

Author:

Eric.Larour

Message:

New CreatePartitionVector abstract method for DofObject objects.

Location:

issm/trunk/src/c

Files:

• DataSet/DataSet.cpp (modified) (2 diffs)
• DataSet/DataSet.h (modified) (1 diff)
• Dofx/Dofx.cpp (modified) (1 diff)
• objects/DofObject.h (modified) (1 diff)
• objects/Node.cpp (modified) (2 diffs)
• objects/Node.h (modified) (2 diffs)
• objects/Vertex.cpp (modified) (1 diff)
• objects/Vertex.h (modified) (1 diff)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -885 +885 @@
 /*}}}*/
 /*FUNCTION DataSet::CreatePartitioningVector{{{1*/
-void  DataSet::CreatePartitioningVector(Vec* ppartition,int numberofnodes,int numdofspernode){
+void  DataSet::CreatePartitioningVector(Vec* ppartition,int numberofobjects){
 
         /*output: */
         Vec partition=NULL;
         vector<Object*>::iterator object;
-        Node* node=NULL;
+        DofObject* dofobject=NULL;
 
         /*Create partition vector: */
-        partition=NewVec(numberofnodes);
-
-        /*Go through all nodes, and ask each node to plug its 1D doflist in 
-         * partition. The location where each node plugs its doflist into 
-         * partition is determined by its (id-1)*3 (ie, serial * organisation of the dofs).
-         */
-
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                /*Check this is a node: */
+        partition=NewVec(numberofobjects);
+
+        /*Go through all objects, and ask each object to plug its doflist in 
+         * partition: */
+
+        for ( object=objects.begin() ; object < objects.end(); object++ ){
+
+                /*Check this is a object: */
                 if((*object)->Enum()==NodeEnum()){
 
-                        node=(Node*)(*object);
-
-                        /*Ok, this object is a node, ask it to plug values into partition: */
-                        node->CreatePartition(partition);
-
+                        dofobject=(DofObject*)(*object);
+                        dofobject->CreatePartition(partition);
                 }
         }
@@ -919 +914 @@
         /*Assign output pointers: */
         *ppartition=partition;
-
-        return;
 }
 /*}}}*/

issm/trunk/src/c/DataSet/DataSet.h

@@ -59 +59 @@
                 void  Ranks(int* ranks);
                 void  DistributeDofs(int numberofnodes,int numdofspernode);
-                void  CreatePartitioningVector(Vec* ppartition,int numnods,int numdofspernode);
+                void  CreatePartitioningVector(Vec* ppartition,int numobjects);
                 void  DistributeNumDofs(int** pnumdofspernode,int numberofnodes,int analysis_type,int sub_analysis_type);
                 void  FlagClones(int numberofnodes);

issm/trunk/src/c/Dofx/Dofx.cpp

@@ -55 +55 @@
 
         /*Now that dofs have been distributed, create partitioning vector and its transpose: */
-        nodes->CreatePartitioningVector(&partition->vector,numberofnodes,numberofdofspernode);
+        vertices->CreatePartitioningVector(&partition->vector,numberofvertices);
 
         /*Transpose partition into tpartition: */

issm/trunk/src/c/objects/DofObject.h

@@ -18 +18 @@
                 virtual void  UpdateCloneDofs(int* allborderdofs)=0;
                 virtual void  SetClone(int* minranks)=0;
+                virtual void  CreatePartition(Vec partition)=0;
 
 };

issm/trunk/src/c/objects/Node.cpp

@@ -408 +408 @@
 }
 /*}}}*/
-/*FUNCTION Node CreatePartition{{{2*/
-void  Node::CreatePartition(Vec partition){ 
-
-        int      idxm;
-        double   value;
-
-        idxm=(id-1);
-        value=(double)this->GetVertexDof();
-        ISSMASSERT(value>=0);
-
-        VecSetValues(partition,1,&idxm,&value,INSERT_VALUES);
-
-        return;
-}
-/*}}}*/
 /*FUNCTION Node CreateVecSets {{{2*/
 void  Node::CreateVecSets(Vec pv_g,Vec pv_m,Vec pv_n,Vec pv_f,Vec pv_s){
@@ -914 +899 @@
 }
 /*}}}*/
-/*}}}*/
+/*FUNCTION Node CreatePartition{{{2*/
+void  Node::CreatePartition(Vec partition){ 
+
+        int      idxm;
+        double   value;
+
+        idxm=(id-1);
+        value=(double)this->indexing.doflist[0];
+        ISSMASSERT(value>=0);
+
+        VecSetValues(partition,1,&idxm,&value,INSERT_VALUES);
+
+        return;
+}
+/*}}}*/
+/*}}}*/

issm/trunk/src/c/objects/Node.h

@@ -63 +63 @@
                 /*}}}*/
                 /*FUNCTION numerical routines {{{1*/
-                void  CreatePartition(Vec partition);
                 int   GetNumberOfDofs();
                 int   IsClone();
@@ -96 +95 @@
                 void  UpdateCloneDofs(int* allborderdofs);
                 void  SetClone(int* minranks);
+                void  CreatePartition(Vec partition);
                 /*}}}*/
 };

issm/trunk/src/c/objects/Vertex.cpp

@@ -298 +298 @@
 }
 /*}}}*/
-/*}}}*/
+/*FUNCTION Vertex CreatePartition{{{2*/
+void  Vertex::CreatePartition(Vec partition){ 
+
+        int      idxm;
+        double   value;
+
+        idxm=(id-1);
+        value=(double)this->dof;
+        ISSMASSERT(value>=0);
+
+        VecSetValues(partition,1,&idxm,&value,INSERT_VALUES);
+
+        return;
+}
+/*}}}*/
+/*}}}*/

issm/trunk/src/c/objects/Vertex.h

@@ -57 +57 @@
                 void  UpdateCloneDofs(int* allborderdofs);
                 void  SetClone(int* minranks);
+                void  CreatePartition(Vec partition);
                 /*}}}*/