Changeset 1764

Timestamp:

08/18/09 15:55:14 (16 years ago)

Author:

Mathieu Morlighem

Message:

some renaming again

File:

• issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp (modified) (4 diffs)

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

@@ -62 +62 @@
         /*Create pressure loads as boundary conditions. Pay attention to the partitioning if we are running in parallel (the grids
          * referenced by a certain load must belong to the cluster node): */
-        ModelFetchData((void**)&model->segmentonneumann_diag_stokes,&numberofsegs_diag_stokes,NULL,model_handle,"segmentonneumann_diag_stokes","Matrix","Mat");
+        ModelFetchData((void**)&model->pressureloads_stokes,&numberofpressureloads_stokes,NULL,model_handle,"pressureload_stokes","Matrix","Mat");
         ModelFetchData((void**)&model->elements_type,NULL,NULL,model_handle,"elements_type","Matrix","Mat");
         ModelFetchData((void**)&model->thickness,NULL,NULL,model_handle,"thickness","Matrix","Mat");
@@ -70 +70 @@
 
         /*First load data:*/
-        for (i=0;i<numberofsegs_diag_stokes;i++){
+        for (i=0;i<numberofpressureloads_stokes;i++){
                 
                 segment_width=5;
 
-                element=(int)(*(model->segmentonneumann_diag_stokes+segment_width*i+segment_width-1)-1); //element is in the last column
+                element=(int)(*(model->pressureload_stokes+segment_width*i+segment_width-1)-1); //element is in the last column
 
                 #ifdef _PARALLEL_
@@ -86 +86 @@
                 icefront_mparid=model->numberofelements+1; //matlab indexing
                 icefront_sid=count+1; //matlab indexing
-                icefront_eid=(int)*(model->segmentonneumann_diag_stokes+segment_width*i+segment_width-1); //matlab indexing
+                icefront_eid=(int)*(model->pressureload_stokes+segment_width*i+segment_width-1); //matlab indexing
                 icefront_element_type=PentaEnum();
 
-                i1=(int)*(model->segmentonneumann_diag_stokes+segment_width*i+0);
-                i2=(int)*(model->segmentonneumann_diag_stokes+segment_width*i+1);
-                i3=(int)*(model->segmentonneumann_diag_stokes+segment_width*i+2);
-                i4=(int)*(model->segmentonneumann_diag_stokes+segment_width*i+3);
+                i1=(int)*(model->pressureload_stokes+segment_width*i+0);
+                i2=(int)*(model->pressureload_stokes+segment_width*i+1);
+                i3=(int)*(model->pressureload_stokes+segment_width*i+2);
+                i4=(int)*(model->pressureload_stokes+segment_width*i+3);
         
                 icefront_node_ids[0]=i1;
@@ -116 +116 @@
         }
         /*Free data: */
-        xfree((void**)&model->segmentonneumann_diag_stokes);
+        xfree((void**)&model->pressureload_stokes);
         xfree((void**)&model->elements_type);
         xfree((void**)&model->thickness);