Changeset 3624

Timestamp:

04/27/10 08:27:44 (15 years ago)

Author:

Eric.Larour

Message:

new pengrid constructor

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp (modified) (2 diffs)
• Melting/CreateLoadsMelting.cpp (modified) (2 diffs)
• Thermal/CreateLoadsThermal.cpp (modified) (4 diffs)

issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp

@@ -68 +68 @@
         IoModelFetchData(&iomodel->gridonicesheet,NULL,NULL,iomodel_handle,"gridonicesheet");
         IoModelFetchData(&iomodel->gridonstokes,NULL,NULL,iomodel_handle,"gridonstokes");
+        iomodel->CreateSingleNodeToElementConnectivity;
         
         for (i=0;i<iomodel->numberofvertices;i++){
-                /*keep only this partition's nodes:*/
+                
                 if((iomodel->my_vertices[i]==1)){
 
                         if ((iomodel->gridonbed[i]) && (iomodel->gridonicesheet[i]) && (iomodel->gridonstokes[i])){
-
-                                loads->AddObject(new Pengrid(count+1, i+1,iomodel->numberofelements+1,1, 0, iomodel->penalty_offset,1,iomodel->stabilize_constraints));
-                                count++;
+                                
+                                loads->AddObject(new Pengrid(count,i,iomodel));
                         }
                 } //if((iomodel->my_vertices[i]==1))
@@ -84 +84 @@
         xfree((void**)&iomodel->gridonstokes);
         xfree((void**)&iomodel->gridonicesheet);
+        xfree((void**)&iomodel->singlenodetoelementconnectivity);
 
         /*All our datasets are already order by ids. Set presort flag so that later on, when sorting is requested on these 

issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp

@@ -13 +13 @@
 
         int i;
-        int count=0;
 
         DataSet*    loads    = NULL;
@@ -25 +24 @@
         //create penalties for grids: no grid can have a temperature over the melting point
         IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
+        iomodel->CreateSingleNodeToElementConnectivity;
 
-        count=1; //matlab indexing
         for (i=0;i<iomodel->numberofvertices;i++){
-                /*keep only this partition's nodes:*/
+                
                 if((iomodel->my_vertices[i]==1)){
 
                         if (iomodel->gridonbed[i]){ 
-
-                                loads->AddObject( new Pengrid(count+1, i+1,iomodel->numberofelements+1, 1, 0, iomodel->penalty_offset, 1, iomodel->stabilize_constraints));
-                                count++;
+                                
+                                loads->AddObject(new Pengrid(i+1,i,iomodel));
                         }
-                } //if((iomodel->my_vertices[i]==1))
+                }
         }
         xfree((void**)&iomodel->gridonbed);
+        xfree((void**)&iomodel->singlenodetoelementconnectivity);
 
         /*All our datasets are already order by ids. Set presort flag so that later on, when sorting is requested on these 

issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

@@ -13 +13 @@
 
         int i;
-        int count=0;
 
         DataSet*    loads    = NULL;
@@ -26 +25 @@
         //create penalties for grids: no grid can have a temperature over the melting point
         IoModelFetchData(&iomodel->spctemperature,NULL,NULL,iomodel_handle,"spctemperature");
+        iomodel->CreateSingleNodeToElementConnectivity;
 
-        count=1; //matlab indexing
         for (i=0;i<iomodel->numberofvertices;i++){
+        
                 /*keep only this partition's nodes:*/
                 if((iomodel->my_vertices[i]==1)){
@@ -34 +34 @@
                         if (!iomodel->spctemperature[2*i]){ //No penalty applied on spc grids!
 
-                                loads->AddObject( new Pengrid(count+1, i+1,iomodel->numberofelements+1,1, 0, iomodel->penalty_offset,1,iomodel->stabilize_constraints));
-                                count++;
+                                loads->AddObject(new Pengrid(i+1,i,iomodel));
+                                                
                         }
-                } //if((iomodel->my_vertices[i]==1))
+                }
         }
         xfree((void**)&iomodel->spctemperature);
+        xfree((void**)&iomodel->singlenodetoelementconnectivity);
 
         /*All our datasets are already order by ids. Set presort flag so that later on, when sorting is requested on these 
@@ -51 +52 @@
 
 }
+                                
+