Changeset 9211

Timestamp:

08/09/11 10:09:14 (14 years ago)

Author:

Mathieu Morlighem

Message:

cosmetics

Location:

issm/trunk/src/c

Files:

• Container/Elements.cpp (modified) (5 diffs)
• modules/GroundingLineMigrationx/GroundingLineMigrationx.cpp (modified) (2 diffs)
• modules/GroundingLineMigrationx/GroundingLineMigrationxUtils.cpp (modified) (10 diffs)
• modules/OutputResultsx/OutputResultsx.cpp (modified) (3 diffs)

issm/trunk/src/c/Container/Elements.cpp

@@ -41 +41 @@
 }
 /*}}}*/
-
-
 
 /*Object management*/
@@ -153 +151 @@
 
         return patch;
-
 }
 /*}}}*/
@@ -174 +171 @@
 void Elements::ToResults(Results* results,Parameters* parameters,int step, double time){
 
-        /*output: */
         Patch* patch=NULL;
-
-        /*I/O strategy: */
-        bool   io_gather=true; //the default
+        bool   io_gather;
 
         /*Recover parameters: */
         parameters->FindParam(&io_gather,IoGatherEnum);
-
 
         /*create patch object out of all results in this dataset: */
@@ -201 +194 @@
         /*Free ressources:*/
         delete patch;
-
 }
 /*}}}*/
@@ -222 +214 @@
 /*FUNCTION Elements::InputCopy{{{1*/
 void Elements::InputDuplicate(int input_enum,int output_enum){
-        
-        int i;
-
-        for(i=0;i<this->Size();i++){
+
+        for(int i=0;i<this->Size();i++){
                 Element* element=(Element*)this->GetObjectByOffset(i);
                 element->InputDuplicate(input_enum,output_enum);

issm/trunk/src/c/modules/GroundingLineMigrationx/GroundingLineMigrationx.cpp

@@ -14 +14 @@
 void GroundingLineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
 
-
         int migration_style;
         
@@ -27 +26 @@
         else if(migration_style==NoneEnum) _printf_(true,"%s\n","NoneEnum supplied for migration style, doing nothing!");
         else _error_("%s not supported yet!",EnumToStringx(migration_style));
-
 }

issm/trunk/src/c/modules/GroundingLineMigrationx/GroundingLineMigrationxUtils.cpp

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void       AgressiveMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ //{{{1
-
+/*FUNCTION AgressiveMigration{{{1*/
+void AgressiveMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
         /*Here, whatever nodes inside the ice sheet want to unground, we allow -> instantaneous transmission of water through the bedrock: */
 
-        int i,j;
+        int i;
         Element* element=NULL;
 
@@ -33 +33 @@
 } 
 /*}}}*/
-
-void       SoftMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ //{{{1
-
+/*FUNCTION SoftMigration {{{1*/
+void       SoftMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ 
 
         /*intermediary: */
@@ -43 +42 @@
         Element* element=NULL;
         
-        
         _printf_(VerboseModule(),"   Migrating grounding line\n");
 
@@ -71 +69 @@
 }
 /*}}}*/
-double*    PotentialSheetUngrounding(Elements* elements,Nodes* nodes,Parameters* parameters){ //{{{1
+/*FUNCTION PotentialSheetUngrounding {{{1*/
+double*    PotentialSheetUngrounding(Elements* elements,Nodes* nodes,Parameters* parameters){ 
 
         int      i;
@@ -106 +105 @@
 }
 /*}}}*/
-double*    PropagateShelfIntoConnexIceSheet(Elements* elements,Nodes* nodes,Parameters* parameters,double* potential_sheet_ungrounding){ //{{{1
+/*FUNCTION PropagateShelfIntoConnexIceSheet {{{1*/
+double*    PropagateShelfIntoConnexIceSheet(Elements* elements,Nodes* nodes,Parameters* parameters,double* potential_sheet_ungrounding){ 
 
         int      i;
@@ -166 +166 @@
 }
 /*}}}*/
-bool*      CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf){ //{{{1
+/*FUNCTION CreateElementOnGroundingLine {{{1*/
+bool*      CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf){ 
 
         int      i;
@@ -201 +202 @@
 }
 /*}}}*/
-double*    CreateElementOnIceShelf(Elements* elements){ //{{{1
+/*FUNCTION CreateElementOnIceShelf {{{1*/
+double*    CreateElementOnIceShelf(Elements* elements){ 
 
         int i;
@@ -230 +232 @@
 }
 /*}}}*/
-double*    CreateElementTouchingIceShelf(Elements* elements,Vec vec_nodes_on_iceshelf){ //{{{1
+/*FUNCTION CreateElementTouchingIceShelf {{{1*/
+double*    CreateElementTouchingIceShelf(Elements* elements,Vec vec_nodes_on_iceshelf){ 
 
         int i;
@@ -266 +269 @@
 }
 /*}}}*/
-int        UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf){//{{{1
+/*FUNCTION UpdateShelfStatus {{{1*/
+int        UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf){
 
         int i;
@@ -313 +317 @@
 }
 /*}}}*/
-Vec CreateNodesOnIceShelf(Nodes* nodes,int configuration_type){ //{{{1
+/*FUNCTION CreateNodesOnIceShelf {{{1*/
+Vec CreateNodesOnIceShelf(Nodes* nodes,int configuration_type){ 
 
         /*output: */

issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -33 +33 @@
         results=*presults;
 
-
         /*We have results inside our elements, loads, etc ... Get them out of there, into the results dataset: */
         elements->ProcessResultsUnits();
         elements->ToResults(results,parameters,step,time);
         elements->DeleteResults();
-
 
         /*Results do not include the type of solution being run . In parallel, we output results to a filename, 
@@ -47 +45 @@
                 results->AddObject(new StringExternalResult(results->Size()+1,SolutionTypeEnum,EnumToStringx(solutiontype),1,0));
         }
-
 
         /*Now, open file for writing, if not already done: */
@@ -75 +72 @@
         #endif
 
-
         /*Write results to disk (in parallel), or to memory (in serial mode): */
         #ifdef _SERIAL_