Changeset 10298

Timestamp:

10/25/11 15:42:29 (13 years ago)

Author:

seroussi

Message:

minor graounding lines

Location:

issm/trunk/src/c/objects

Files:

• ElementResults/BoolElementResult.cpp (modified) (1 diff)
• Elements/Element.h (modified) (1 diff)
• Elements/Penta.cpp (modified) (1 diff)
• Elements/Penta.h (modified) (1 diff)
• Elements/Tria.cpp (modified) (3 diffs)
• Elements/Tria.h (modified) (1 diff)

issm/trunk/src/c/objects/ElementResults/BoolElementResult.cpp

@@ -102 +102 @@
         memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
         memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value);
+        memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time);
         memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step);
-        memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time);
 
         /*return: */

issm/trunk/src/c/objects/Elements/Element.h

@@ -69 +69 @@
                 virtual void   ShelfSync()=0;
                 virtual void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding)=0;
-                virtual void   MigrateGroundingLine()=0;
+                virtual void   MigrateGroundingline()=0;
                 virtual int    UpdateShelfStatus(Vec new_shelf_nodes)=0;
                 virtual void   UpdateShelfFlags(double* new_shelf_nodes)=0;

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -2051 +2051 @@
 
 }/*}}}*/
-/*FUNCTION Penta::MigrateGroundingLine{{{1*/
-void  Penta::MigrateGroundingLine(void){
+/*FUNCTION Penta::MigrateGroundingline{{{1*/
+void  Penta::MigrateGroundingline(void){
         _error_("not supported yet!");
 }

issm/trunk/src/c/objects/Elements/Penta.h

@@ -109 +109 @@
                 void   RequestedOutput(int output_enum,int step,double time);
                 void   ListResultsEnums(int** results_enums,int* num_results);
-                void   MigrateGroundingLine();
+                void   MigrateGroundingline();
                 void   PatchFill(int* pcount, Patch* patch);
                 void   PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes);

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1453 +1453 @@
          * object out of the input, with the additional step and time information: */
         this->results->AddObject((Object*)input->SpawnResult(step,time));
+        
         #ifdef _HAVE_CONTROL_
         if(input->ObjectEnum()==ControlInputEnum) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time));
@@ -1980 +1981 @@
 
 }/*}}}*/
-/*FUNCTION Tria::MigrateGroundingLine{{{1*/
-void  Tria::MigrateGroundingLine(void){
+/*FUNCTION Tria::MigrateGroundingline{{{1*/
+void  Tria::MigrateGroundingline(void){
 
         double *values         = NULL;
@@ -1998 +1999 @@
         for(i=0;i<3;i++){
                 isonshelf[i]=nodes[i]->IsFloating();
-                if((nodes[i]->Sid()+1)==36)printf("MigrateGroundingLine: El %i Node %i shelf status %i\n",this->Id(),nodes[i]->Sid()+1,isonshelf[i]);
+                if((nodes[i]->Sid()+1)==36)printf("MigrateGroundingline: El %i Node %i shelf status %i\n",this->Id(),nodes[i]->Sid()+1,isonshelf[i]);
         }
 

issm/trunk/src/c/objects/Elements/Tria.h

@@ -108 +108 @@
                 void   ShelfSync();
                 void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding);
-                void   MigrateGroundingLine();
+                void   MigrateGroundingline();
                 
                 void   RequestedOutput(int output_enum,int step,double time);