Changeset 748

Timestamp:

06/03/09 14:56:49 (16 years ago)

Author:

seroussi

Message:

fixed diagnostic mixed Hutter/MacAyeal

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp (modified) (7 diffs)
• DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp (modified) (1 diff)

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

@@ -319 +319 @@
                                 materials->AddObject(matice);
                 
-                                #ifdef _PARALLEL_
-                                /*Now that we are here, we can also start building the list of grids belonging to this node partition: we use 
-                                 *the  element index to do this. For each element n, we know index[n][0:2] holds the indices (matlab indexing) 
-                                 into the grid coordinates. If we start plugging 1 into my_grids for each index[n][i] (i=0:2), then my_grids 
-                                 will hold which grids belong to this partition*/
-                                my_grids[(int)*(model->elements+elements_width*i+0)-1]=1;
-                                my_grids[(int)*(model->elements+elements_width*i+1)-1]=1;
-                                my_grids[(int)*(model->elements+elements_width*i+2)-1]=1;
-                                #endif
                         } //if(!HutterEnum)
+
+                        #ifdef _PARALLEL_
+                        /*Now that we are here, we can also start building the list of grids belonging to this node partition: we use 
+                         *the  element index to do this. For each element n, we know index[n][0:2] holds the indices (matlab indexing) 
+                         into the grid coordinates. If we start plugging 1 into my_grids for each index[n][i] (i=0:2), then my_grids 
+                         will hold which grids belong to this partition*/
+                        my_grids[(int)*(model->elements+elements_width*i+0)-1]=1;
+                        my_grids[(int)*(model->elements+elements_width*i+1)-1]=1;
+                        my_grids[(int)*(model->elements+elements_width*i+2)-1]=1;
+                        #endif
 
                 #ifdef _PARALLEL_
@@ -445 +446 @@
                                 materials->AddObject(matice);
                                 
-                                #ifdef _PARALLEL_
-                                /*Now that we are here, we can also start building the list of grids belonging to this node partition: we use 
-                                 *the  element index to do this. For each element n, we know index[n][0:2] holds the indices (matlab indexing) 
-                                 into the grid coordinates. If we start plugging 1 into my_grids for each index[n][i] (i=0:2), then my_grids 
-                                 will hold which grids belong to this partition*/
-                                my_grids[(int)*(model->elements+elements_width*i+0)-1]=1;
-                                my_grids[(int)*(model->elements+elements_width*i+1)-1]=1;
-                                my_grids[(int)*(model->elements+elements_width*i+2)-1]=1;
-                                my_grids[(int)*(model->elements+elements_width*i+3)-1]=1;
-                                my_grids[(int)*(model->elements+elements_width*i+4)-1]=1;
-                                my_grids[(int)*(model->elements+elements_width*i+5)-1]=1;
-                                #endif
                         }
+
+                        #ifdef _PARALLEL_
+                        /*Now that we are here, we can also start building the list of grids belonging to this node partition: we use 
+                         *the  element index to do this. For each element n, we know index[n][0:2] holds the indices (matlab indexing) 
+                         into the grid coordinates. If we start plugging 1 into my_grids for each index[n][i] (i=0:2), then my_grids 
+                         will hold which grids belong to this partition*/
+                        my_grids[(int)*(model->elements+elements_width*i+0)-1]=1;
+                        my_grids[(int)*(model->elements+elements_width*i+1)-1]=1;
+                        my_grids[(int)*(model->elements+elements_width*i+2)-1]=1;
+                        my_grids[(int)*(model->elements+elements_width*i+3)-1]=1;
+                        my_grids[(int)*(model->elements+elements_width*i+4)-1]=1;
+                        my_grids[(int)*(model->elements+elements_width*i+5)-1]=1;
+                        #endif
 
                 #ifdef _PARALLEL_
@@ -577 +579 @@
         ModelFetchData((void**)&model->gridonbed,NULL,NULL,model_handle,"gridonbed","Matrix","Mat");
         ModelFetchData((void**)&model->gridonsurface,NULL,NULL,model_handle,"gridonsurface","Matrix","Mat");
+        ModelFetchData((void**)&model->gridonhutter,NULL,NULL,model_handle,"gridonhutter","Matrix","Mat");
 
         /*Get number of dofs per node: */
@@ -583 +586 @@
         for (i=0;i<model->numberofnodes;i++){
         #ifdef _PARALLEL_
+
         /*keep only this partition's nodes:*/
         if((my_grids[i]==1)){
@@ -589 +593 @@
                 node_id=i+1; //matlab indexing
                         
-                
                 
                 #ifdef _PARALLEL_
@@ -635 +638 @@
                         }
                 }
+                if (model->gridonhutter[i]){
+                        for(k=1;k<=node_numdofs;k++){
+                                node->FreezeDof(k);
+                        }
+                }
                 /*Add node to nodes dataset: */
                 nodes->AddObject(node);
@@ -656 +664 @@
         xfree((void**)&model->gridonbed);
         xfree((void**)&model->gridonsurface);
+        xfree((void**)&model->gridonhutter);
         xfree((void**)&model->uppernodes);
                 

issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp

@@ -424 +424 @@
 
         #ifdef _PARALLEL_
-        } //if(npart[i]==my_rank)
+        } //if(my_grids[i])
         #endif
         }