Changeset 9211


Ignore:
Timestamp:
08/09/11 10:09:14 (14 years ago)
Author:
Mathieu Morlighem
Message:

cosmetics

Location:
issm/trunk/src/c
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/Container/Elements.cpp

    r8967 r9211  
    4141}
    4242/*}}}*/
    43 
    44 
    4543
    4644/*Object management*/
     
    153151
    154152        return patch;
    155 
    156153}
    157154/*}}}*/
     
    174171void Elements::ToResults(Results* results,Parameters* parameters,int step, double time){
    175172
    176         /*output: */
    177173        Patch* patch=NULL;
    178 
    179         /*I/O strategy: */
    180         bool   io_gather=true; //the default
     174        bool   io_gather;
    181175
    182176        /*Recover parameters: */
    183177        parameters->FindParam(&io_gather,IoGatherEnum);
    184 
    185178
    186179        /*create patch object out of all results in this dataset: */
     
    201194        /*Free ressources:*/
    202195        delete patch;
    203 
    204196}
    205197/*}}}*/
     
    222214/*FUNCTION Elements::InputCopy{{{1*/
    223215void Elements::InputDuplicate(int input_enum,int output_enum){
    224        
    225         int i;
    226 
    227         for(i=0;i<this->Size();i++){
     216
     217        for(int i=0;i<this->Size();i++){
    228218                Element* element=(Element*)this->GetObjectByOffset(i);
    229219                element->InputDuplicate(input_enum,output_enum);
  • issm/trunk/src/c/modules/GroundingLineMigrationx/GroundingLineMigrationx.cpp

    r9010 r9211  
    1414void GroundingLineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
    1515
    16 
    1716        int migration_style;
    1817       
     
    2726        else if(migration_style==NoneEnum) _printf_(true,"%s\n","NoneEnum supplied for migration style, doing nothing!");
    2827        else _error_("%s not supported yet!",EnumToStringx(migration_style));
    29 
    3028}
  • issm/trunk/src/c/modules/GroundingLineMigrationx/GroundingLineMigrationxUtils.cpp

    r8816 r9211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void       AgressiveMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ //{{{1
    13 
     12/*FUNCTION AgressiveMigration{{{1*/
     13void AgressiveMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
    1414        /*Here, whatever nodes inside the ice sheet want to unground, we allow -> instantaneous transmission of water through the bedrock: */
    1515
    16         int i,j;
     16        int i;
    1717        Element* element=NULL;
    1818
     
    3333}
    3434/*}}}*/
    35 
    36 void       SoftMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ //{{{1
    37 
     35/*FUNCTION SoftMigration {{{1*/
     36void       SoftMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
    3837
    3938        /*intermediary: */
     
    4342        Element* element=NULL;
    4443       
    45        
    4644        _printf_(VerboseModule(),"   Migrating grounding line\n");
    4745
     
    7169}
    7270/*}}}*/
    73 double*    PotentialSheetUngrounding(Elements* elements,Nodes* nodes,Parameters* parameters){ //{{{1
     71/*FUNCTION PotentialSheetUngrounding {{{1*/
     72double*    PotentialSheetUngrounding(Elements* elements,Nodes* nodes,Parameters* parameters){
    7473
    7574        int      i;
     
    106105}
    107106/*}}}*/
    108 double*    PropagateShelfIntoConnexIceSheet(Elements* elements,Nodes* nodes,Parameters* parameters,double* potential_sheet_ungrounding){ //{{{1
     107/*FUNCTION PropagateShelfIntoConnexIceSheet {{{1*/
     108double*    PropagateShelfIntoConnexIceSheet(Elements* elements,Nodes* nodes,Parameters* parameters,double* potential_sheet_ungrounding){
    109109
    110110        int      i;
     
    166166}
    167167/*}}}*/
    168 bool*      CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf){ //{{{1
     168/*FUNCTION CreateElementOnGroundingLine {{{1*/
     169bool*      CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf){
    169170
    170171        int      i;
     
    201202}
    202203/*}}}*/
    203 double*    CreateElementOnIceShelf(Elements* elements){ //{{{1
     204/*FUNCTION CreateElementOnIceShelf {{{1*/
     205double*    CreateElementOnIceShelf(Elements* elements){
    204206
    205207        int i;
     
    230232}
    231233/*}}}*/
    232 double*    CreateElementTouchingIceShelf(Elements* elements,Vec vec_nodes_on_iceshelf){ //{{{1
     234/*FUNCTION CreateElementTouchingIceShelf {{{1*/
     235double*    CreateElementTouchingIceShelf(Elements* elements,Vec vec_nodes_on_iceshelf){
    233236
    234237        int i;
     
    266269}
    267270/*}}}*/
    268 int        UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf){//{{{1
     271/*FUNCTION UpdateShelfStatus {{{1*/
     272int        UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf){
    269273
    270274        int i;
     
    313317}
    314318/*}}}*/
    315 Vec CreateNodesOnIceShelf(Nodes* nodes,int configuration_type){ //{{{1
     319/*FUNCTION CreateNodesOnIceShelf {{{1*/
     320Vec CreateNodesOnIceShelf(Nodes* nodes,int configuration_type){
    316321
    317322        /*output: */
  • issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

    r8926 r9211  
    3333        results=*presults;
    3434
    35 
    3635        /*We have results inside our elements, loads, etc ... Get them out of there, into the results dataset: */
    3736        elements->ProcessResultsUnits();
    3837        elements->ToResults(results,parameters,step,time);
    3938        elements->DeleteResults();
    40 
    4139
    4240        /*Results do not include the type of solution being run . In parallel, we output results to a filename,
     
    4745                results->AddObject(new StringExternalResult(results->Size()+1,SolutionTypeEnum,EnumToStringx(solutiontype),1,0));
    4846        }
    49 
    5047
    5148        /*Now, open file for writing, if not already done: */
     
    7572        #endif
    7673
    77 
    7874        /*Write results to disk (in parallel), or to memory (in serial mode): */
    7975        #ifdef _SERIAL_
Note: See TracChangeset for help on using the changeset viewer.