Changeset 4221

Timestamp:

06/24/10 20:07:47 (15 years ago)

Author:

Eric.Larour

Message:

Some leftovers transfers from DataSet to Nodes, Vertices and Constraints

Location:

issm/trunk/src/c/DataSet

Files:

• DataSet.cpp (modified) (1 diff)
• DataSet.h (modified) (4 diffs)
• Nodes.cpp (modified) (1 diff)
• Vertices.cpp (modified) (1 diff)

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

@@ -481 +481 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::Ranks{{{1*/
-void   DataSet::Ranks(int* ranks){
-
-        /*Go through a dataset, and for each object, report it cpu: */
-
-        int i;
-        int rank;
-        int sid;
-        
-        for(i=0;i<this->Size();i++){
-                Object* object=(Object*)this->GetObjectByOffset(i);
-                rank=object->MyRank();
-
-                if (object->Enum()==NodeEnum){
-                        Node* node=(Node*)object;
-                        sid=node->Sid();
-                }
-                else if (object->Enum()==VertexEnum){
-                        Vertex* vertex=(Vertex*)object;
-                        sid=vertex->Sid();
-                }
-                else{
-                        ISSMERROR("object %s not supported yet",EnumAsString(object->Enum()));
-                }
-                /*Plug rank into ranks, according to id: */
-                ranks[sid]=rank; 
-        }
-        return;
-}
-/*}}}*/
 /*FUNCTION DataSet::Presort{{{1*/
 void DataSet::Presort(){

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

@@ -46 +46 @@
                 /*}}}*/
                 /*management: {{{1*/
-
                 int   GetEnum();
                 int   GetEnum(int offset);
@@ -56 +55 @@
                 int   DeleteObject(int id);
                 int   Size();
-                
-                Object* FindParamObject(char* name);
-                void  Ranks(int* ranks);
                 void  clear();
                 void  Configure(Elements* elements,Loads* loads, DataSet* nodes, Vertices* vertices, Materials* materials,Parameters* parameters);
@@ -139 +135 @@
                 int   NumberOfDofs(int analysis_type);
                 int   NumberOfNodes(void);
+                void  Ranks(int* ranks);
                 /*}}}*/
 
@@ -160 +157 @@
                 void  FlagClones(int numberofnodes);
                 int   NumberOfVertices(void);
+                void  Ranks(int* ranks);
                 /*}}}*/
 

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

@@ -244 +244 @@
 }
 /*}}}*/
-
+/*FUNCTION Nodes::Ranks{{{1*/
+void   Nodes::Ranks(int* ranks){
+
+        /*Go through nodes, and for each object, report it cpu: */
+
+        int i;
+        int rank;
+        int sid;
+        
+        for(i=0;i<this->Size();i++){
+                Node* node=(Node*)this->GetObjectByOffset(i);
+                rank=node->MyRank();
+                sid=node->Sid();
+                
+                /*Plug rank into ranks, according to id: */
+                ranks[sid]=rank; 
+        }
+        return;
+}
+/*}}}*/

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

@@ -208 +208 @@
 }
 /*}}}*/
+/*FUNCTION Vertices::Ranks{{{1*/
+void   Vertices::Ranks(int* ranks){
+
+        /*Go through a dataset, and for each object, report it cpu: */
+
+        int i;
+        int rank;
+        int sid;
+        
+        for(i=0;i<this->Size();i++){
+                Vertex* vertex=(Vertex*)this->GetObjectByOffset(i);
+                rank=vertex->MyRank();
+                sid=vertex->Sid();
+                
+                /*Plug rank into ranks, according to id: */
+                ranks[sid]=rank; 
+        }
+        return;
+}
+/*}}}*/