Changeset 3437

Timestamp:

04/07/10 16:52:49 (15 years ago)

Author:

Mathieu Morlighem

Message:

Prognostic2 is all up-to-date

Location:

issm/trunk/src/c/ModelProcessorx/Prognostic2

Files:

• CreateLoadsPrognostic2.cpp (modified) (4 diffs)
• CreateParametersPrognostic2.cpp (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp

@@ -13 +13 @@
 void    CreateLoadsPrognostic2(DataSet** ploads, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
+        /*Intermediary*/
         int i,j;
         int i1,i2;
@@ -18 +19 @@
         double e1,e2;
 
-        extern int my_rank;
-        extern int num_procs;
-
+        /*Output*/
         DataSet*       loads        = NULL;
-        Numericalflux* numericalflux= NULL;
 
         /*numericalflux intermediary data: */
@@ -44 +42 @@
                 e2=iomodel->edges[4*i+3]-1; //edges are [node1 node2 elem1 elem2]
 
-                #ifdef _PARALLEL_
-                if (iomodel->epart[(int)e1]!=my_rank){
-                        /*This load does not belong to this cluster node, as it references an element 
-                         *that does not belong to this node's partition. Drop this 'i':*/
-                        continue;
-                }
-                #endif
+                /*Now, if this element is not in the partition, pass: */
+                if(!iomodel->my_elements[i])continue;
 
                 /*Create load*/
@@ -103 +96 @@
                 }
 
-                numericalflux = new Numericalflux(numericalflux_id,numericalflux_type,numericalflux_node_ids,numericalflux_elem_id);
-
-                loads->AddObject(numericalflux);
+                loads->AddObject(new Numericalflux(numericalflux_id,numericalflux_type,numericalflux_node_ids,numericalflux_elem_id));
         }
 

issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp

@@ -44 +44 @@
                 for(j=0;j<3;j++){
                         part[3*i+j]=(int)elements[3*i+j]-1; //Matlab to C indexing
-                        ISSMASSERT(part[3*i+j]<iomodel->numberofnodes);
+                        ISSMASSERT(part[3*i+j]<iomodel->numberofvertices);
                 }
         }