Changeset 7843

Timestamp:

04/12/11 10:42:07 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed penalties for Pattyn-MacAyeal: check that the two nodes are on base

File:

• issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

@@ -58 +58 @@
         /*Create Penpair for penalties: */
         IoModelFetchData(&iomodel->penalties,&iomodel->numpenalties,NULL,iomodel_handle,"penalties");
+        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
 
         for(i=0;i<iomodel->numpenalties;i++){
@@ -65 +66 @@
                         /*In debugging mode, check that the second node is in the same cpu*/
                         _assert_(iomodel->my_vertices[(int)iomodel->penalties[2*i+1]-1]);
+
+                        /*Skip if one of the two is not on the bed*/
+                        if(!iomodel->gridonbed[(int)iomodel->penalties[2*i+0]-1] || !iomodel->gridonbed[(int)iomodel->penalties[2*i+1]-1]) continue;
 
                         /*Get node ids*/
@@ -81 +85 @@
         /*free ressources: */
         xfree((void**)&iomodel->penalties);
+        xfree((void**)&iomodel->gridonbed);