Changeset 211

Timestamp:

05/04/09 12:09:38 (16 years ago)

Author:

seroussi

Message:

mising indice for penpair

File:

• issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -162 +162 @@
 
                 /*First deal with internal grids: */
-                if (model->penaltypartitioning[i]>=0){ //this penalty belongs to at least this CPU
-
-                        for(j=0;j<model->numlayers-1;j++){
-
-                                /*We are pairing grids along a vertical profile.*/
-                                grid1=(int)*(model->penalties+model->numlayers*i+j);
-                                grid2=(int)*(model->penalties+model->numlayers*i+j+1);
-                                
-                                penpair_id=counter+1; //matlab indexing
-                                penpair_dof=1;
-                                penpair_node_ids[0]=grid1;
-                                penpair_node_ids[1]=grid2;
-                                penpair_penalty_offset=model->penalty_offset;
-                                penpair_numdofs=1;
-                
-                                penpair= new Penpair(penpair_id,penpair_penalty_offset,penpair_penalty_lock,penpair_numdofs,penpair_node_ids,penpair_dof,
-                                                penpair_element_ids,penpair_friction,penpair_fill,penpair_normal,penpair_length);
-                                loads->AddObject(penpair);
-                
-
-                                counter++;
-                        
-                                penpair_id=counter+1; //matlab indexing
-                                penpair_dof=2;
-                                penpair_node_ids[0]=grid1;
-                                penpair_node_ids[1]=grid2;
-                                penpair_penalty_offset=model->penalty_offset;
-                                penpair_numdofs=1;
-                        
-                                penpair= new Penpair(penpair_id,penpair_penalty_offset,penpair_penalty_lock,penpair_numdofs,penpair_node_ids,penpair_dof,
-                                                penpair_element_ids,penpair_friction,penpair_fill,penpair_normal,penpair_length);
-                                loads->AddObject(penpair);
-        
-
-                                counter++;
-
+                for (i=0;i<model->numpenalties;i++){
+                        if (model->penaltypartitioning[i]>=0){ //this penalty belongs to at least this CPU
+
+                                for(j=0;j<model->numlayers-1;j++){
+
+                                        /*We are pairing grids along a vertical profile.*/
+                                        grid1=(int)*(model->penalties+model->numlayers*i+j);
+                                        grid2=(int)*(model->penalties+model->numlayers*i+j+1);
+
+                                        penpair_id=counter+1; //matlab indexing
+                                        penpair_dof=1;
+                                        penpair_node_ids[0]=grid1;
+                                        penpair_node_ids[1]=grid2;
+                                        penpair_penalty_offset=model->penalty_offset;
+                                        penpair_numdofs=1;
+
+                                        penpair= new Penpair(penpair_id,penpair_penalty_offset,penpair_penalty_lock,penpair_numdofs,penpair_node_ids,penpair_dof,
+                                                                penpair_element_ids,penpair_friction,penpair_fill,penpair_normal,penpair_length);
+                                        loads->AddObject(penpair);
+
+
+                                        counter++;
+
+                                        penpair_id=counter+1; //matlab indexing
+                                        penpair_dof=2;
+                                        penpair_node_ids[0]=grid1;
+                                        penpair_node_ids[1]=grid2;
+                                        penpair_penalty_offset=model->penalty_offset;
+                                        penpair_numdofs=1;
+
+                                        penpair= new Penpair(penpair_id,penpair_penalty_offset,penpair_penalty_lock,penpair_numdofs,penpair_node_ids,penpair_dof,
+                                                                penpair_element_ids,penpair_friction,penpair_fill,penpair_normal,penpair_length);
+                                        loads->AddObject(penpair);
+
+
+                                        counter++;
+
+                                } //for ( i=0; i<numpenalties; i++) 
                         }
-                } //for ( i=0; i<numpenalties; i++) 
+                }
         }