Changeset 3107

Timestamp:

02/24/10 07:20:13 (15 years ago)

Author:

Mathieu Morlighem

Message:

fill not needed anymore in some routines

Location:

issm/trunk/src/c/objects

Files:

• Icefront.cpp (modified) (10 diffs)
• Icefront.h (modified) (1 diff)

issm/trunk/src/c/objects/Icefront.cpp

@@ -61 +61 @@
 }
 /*}}}*/
-                
+
 /*Object marshall*/
 /*FUNCTION Icefront Demarshall {{{1*/
@@ -339 +339 @@
 
         //Compute load contribution for this segment:
-        SegmentPressureLoad(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list,bed_list,normal,length,fill);
+        SegmentPressureLoad(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list,bed_list,normal,length);
                 
         #ifdef _DEBUGELEMENTS_
@@ -352 +352 @@
                 printf("normal (%g,%g)\n",normal[0],normal[1]);
                 printf("length %g\n",length);
-                printf("fill %i\n",fill);
                 printf("pe_g->terms\n");
                 for(i=0;i<numgrids*NDOF2;i++){
@@ -496 +495 @@
 
         //Compute load contribution for this quad:
-        QuadPressureLoad(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list_quad,bed_list_quad,normal1,normal2,normal3,normal4,&xyz_list_quad[0][0],fill);
+        QuadPressureLoad(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list_quad,bed_list_quad,normal1,normal2,normal3,normal4,&xyz_list_quad[0][0]);
 
 
@@ -512 +511 @@
                 printf("normal3 (%g,%g,%g)\n",normal3[0],normal3[1],normal3[2]);
                 printf("normal4 (%g,%g,%g)\n",normal4[0],normal4[1],normal4[2]);
-                printf("fill %i\n",fill);
                 printf("pe_g->terms\n");
                 for(i=0;i<numgridsload*NDOF2;i++){
@@ -656 +654 @@
 
         //Compute load contribution for this quad:
-        QuadPressureLoadStokes(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list_quad,bed_list_quad,normal1,normal2,normal3,normal4,&xyz_list_quad[0][0],fill);
+        QuadPressureLoadStokes(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list_quad,bed_list_quad,normal1,normal2,normal3,normal4,&xyz_list_quad[0][0]);
 
         #ifdef _DEBUGELEMENTS_
@@ -671 +669 @@
                 printf("normal3 (%g,%g,%g)\n",normal3[0],normal3[1],normal3[2]);
                 printf("normal4 (%g,%g,%g)\n",normal4[0],normal4[1],normal4[2]);
-                printf("fill %i\n",fill);
                 printf("pe_g->terms\n");
                 for(i=0;i<numdofloads*NDOF4;i++){
@@ -845 +842 @@
 #define __FUNCT__ "Icefront::QuadPressureLoad"
 void Icefront::QuadPressureLoad(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, 
-                                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list, int fill){
+                                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list){
         
         
@@ -1103 +1100 @@
 #define __FUNCT__ "Icefront::QuadPressureLoadStokes"
 void Icefront::QuadPressureLoadStokes(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, 
-                                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list, int fill){
+                                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list){
         
         
@@ -1361 +1358 @@
 #define __FUNCT__ "Icefront::SegmentPressureLoad"
 
-void Icefront::SegmentPressureLoad(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, double* normal,double length,int fill){
+void Icefront::SegmentPressureLoad(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, double* normal,double length){
 
         double   nx,ny;

issm/trunk/src/c/objects/Icefront.h

@@ -68 +68 @@
                 void  CreatePVectorDiagnosticStokes( Vec pg,void* inputs, int analysis_type,int sub_analysis_type);
                 void  GetDofList(int* doflist,int* pnumberofdofs);
-                void  SegmentPressureLoad(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, double* normal,double length,int fill);
+                void  SegmentPressureLoad(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, double* normal,double length);
                 void  QuadPressureLoad(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, 
-                                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list, int fill);
+                                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list);
                 void  QuadPressureLoadStokes(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, 
-                                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list, int fill);
+                                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list);
                 void  PenaltyCreateKMatrix(Mat Kgg,void* inputs,double kmax,int analysis_type,int sub_analysis_type);
                 void  PenaltyCreatePVector(Vec pg,void* inputs,double kmax,int analysis_type,int sub_analysis_type);