Changeset 16211


Ignore:
Timestamp:
09/20/13 11:37:28 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: bathymtry only required in transients of isgrounding line. Meltrate correction defaults is 0

Location:
issm/trunk-jpl/src/c
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r16208 r16211  
    27162716                                name==SurfaceEnum ||
    27172717                                name==BedEnum ||
     2718                                name==BathymetryEnum ||
    27182719                                name==SurfaceSlopeXEnum ||
    27192720                                name==SurfaceSlopeYEnum ||
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceBase/UpdateElementsFreeSurfaceBase.cpp

    r16200 r16211  
    3131        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
    3232        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    33         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum);
     33        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum,0.);
    3434        iomodel->FetchDataToInput(elements,VxEnum);
    3535        iomodel->FetchDataToInput(elements,VyEnum);
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceTop/UpdateElementsFreeSurfaceTop.cpp

    r16200 r16211  
    3030        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
    3131        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    32         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum);
     32        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum,0.);
    3333        iomodel->FetchDataToInput(elements,VxEnum);
    3434        iomodel->FetchDataToInput(elements,VyEnum);
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Masstransport/UpdateElementsMasstransport.cpp

    r15986 r16211  
    4343        iomodel->FetchDataToInput(elements,SurfaceEnum);
    4444        iomodel->FetchDataToInput(elements,BedEnum);
    45         iomodel->FetchDataToInput(elements,BathymetryEnum);
    4645        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    4746        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
    4847        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    49         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum);
     48        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum,0.);
    5049        iomodel->FetchDataToInput(elements,VxEnum);
    5150        iomodel->FetchDataToInput(elements,VyEnum);
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

    r15952 r16211  
    1010
    1111void    UpdateElementsTransient(Elements* elements, Parameters* parameters,IoModel* iomodel,int analysis_counter,int analysis_type){
     12
     13        bool isgroundingline;
     14        parameters->FindParam(&isgroundingline,TransientIsgroundinglineEnum);
     15
     16        if(isgroundingline){
     17                iomodel->FetchDataToInput(elements,BathymetryEnum);
     18        }
    1219}
Note: See TracChangeset for help on using the changeset viewer.