Changeset 7097


Ignore:
Timestamp:
01/14/11 10:11:53 (14 years ago)
Author:
Mathieu Morlighem
Message:

use only gl_migration: more consistent. Tis fixes Serial runs

Location:
issm/trunk/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

    r7089 r7097  
    7575        parameters->AddObject(new BoolParam(KffEnum,iomodel->kff));
    7676        parameters->AddObject(new BoolParam(IoGatherEnum,iomodel->io_gather));
    77         parameters->AddObject(new BoolParam(GroundingLineMigrationEnum,iomodel->grounding_line_migration));
     77        parameters->AddObject(new BoolParam(GroundingLineMigrationEnum,iomodel->gl_migration));
    7878
    7979        /*Deal with more complex parameters*/
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

    r7089 r7097  
    3939        IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
    4040        IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
    41         if(iomodel->grounding_line_migration) IoModelFetchData(&iomodel->bathymetry,NULL,NULL,iomodel_handle,"bathymetry");
     41        if(iomodel->gl_migration) IoModelFetchData(&iomodel->bathymetry,NULL,NULL,iomodel_handle,"bathymetry");
    4242        if (iomodel->dim==3){
    4343                IoModelFetchData(&iomodel->elementonbed,NULL,NULL,iomodel_handle,"elementonbed");
  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r7091 r7097  
    35943594                this->inputs->AddInput(new TriaVertexInput(BedEnum,nodeinputs));
    35953595        }
    3596         if(iomodel->grounding_line_migration){
     3596        if(iomodel->gl_migration){
    35973597                for(i=0;i<3;i++)nodeinputs[i]=iomodel->bathymetry[tria_vertex_ids[i]-1];
    35983598                this->inputs->AddInput(new TriaVertexInput(BathymetryEnum,nodeinputs));
  • issm/trunk/src/c/objects/IoModel.cpp

    r7089 r7097  
    193193        IoModelFetchData(&this->waitonlock,iomodel_handle,"waitonlock");
    194194        IoModelFetchData(&this->kff,iomodel_handle,"kff");
    195         IoModelFetchData(&this->grounding_line_migration,iomodel_handle,"grounding_line_migration");
     195        IoModelFetchData(&this->gl_migration,iomodel_handle,"gl_migration");
    196196
    197197        /*!Get thermal parameters: */
  • issm/trunk/src/c/objects/IoModel.h

    r7089 r7097  
    192192
    193193                /*grounding line migration: */
    194                 int      grounding_line_migration;
     194                int      gl_migration;
    195195
    196196                /*exterior partitioning data, to be carried around: */
  • issm/trunk/src/c/solutions/transient2d_core.cpp

    r7089 r7097  
    2222        bool   time_adapt=false;
    2323        int    output_frequency;
    24         bool   grounding_line_migration;
     24        bool   gl_migration;
    2525
    2626        /*intermediary: */
     
    3636        femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum);
    3737        femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum);
    38         femmodel->parameters->FindParam(&grounding_line_migration,GroundingLineMigrationEnum);
     38        femmodel->parameters->FindParam(&gl_migration,GroundingLineMigrationEnum);
    3939
    4040        /*initialize: */
     
    6161                prognostic_core(femmodel);
    6262
    63                 if (grounding_line_migration){
     63                if (gl_migration){
    6464                        _printf_(VerboseSolution(),"%s\n","   computing new grounding line position");
    6565                        GroundingLineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
     
    7575                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum,step,time);
    7676                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time);
    77                         if(grounding_line_migration)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);
     77                        if(gl_migration)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);
    7878
    7979                        /*unload results*/
  • issm/trunk/src/m/model/marshall.m

    r7083 r7097  
    163163
    164164%grounding line migration:
    165 WriteData(fid,md.gl_migration,'Integer','grounding_line_migration');
     165WriteData(fid,md.gl_migration,'Integer','gl_migration');
    166166if(md.gl_migration),
    167167        WriteData(fid,md.bathymetry,'Mat','bathymetry');
Note: See TracChangeset for help on using the changeset viewer.