Changeset 27926


Ignore:
Timestamp:
09/28/23 12:04:23 (18 months ago)
Author:
koitf1
Message:

CHG: islaminar flag in GlaDS has been changed from type int to type bool

Location:
issm/trunk-jpl/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp

    r27925 r27926  
    242242
    243243        /*Get all inputs and parameters*/
    244         int islaminar;
     244        bool islaminar;
    245245        element->FindParam(&islaminar,HydrologyIsLaminarEnum);
    246246        IssmDouble dt        = element->FindParam(TimesteppingTimeStepEnum);
    … …  
    495495
    496496        /*Retrieve all inputs and parameters*/
    497         int islaminar;
     497        bool islaminar;
    498498        element->FindParam(&islaminar,HydrologyIsLaminarEnum);
    499499        element->GetVerticesCoordinates(&xyz_list);

  • issm/trunk-jpl/src/c/classes/Loads/Channel.cpp

    r27925 r27926  
    383383        GetVerticesCoordinates(&xyz_list_tria[0][0],tria->vertices,3);
    384384
    385         int islaminar;
     385        bool islaminar;
    386386        element->FindParam(&islaminar,HydrologyIsLaminarEnum);
    387387        IssmDouble L         = element->FindParam(MaterialsLatentheatEnum);
    … …  
    542542        GetVerticesCoordinates(&xyz_list_tria[0][0],tria->vertices,3);
    543543
    544         int islaminar;
     544        bool islaminar;
    545545        element->FindParam(&islaminar,HydrologyIsLaminarEnum);
    546546        IssmDouble L         = element->FindParam(MaterialsLatentheatEnum);
    … …  
    692692        GetVerticesCoordinates(&xyz_list_tria[0][0],tria->vertices,3);
    693693
    694         int islaminar;
     694        bool islaminar;
    695695        element->FindParam(&islaminar,HydrologyIsLaminarEnum);
    696696        IssmDouble L         = element->FindParam(MaterialsLatentheatEnum);

  • issm/trunk-jpl/src/m/classes/hydrologyglads.m

    r27925 r27926  
    153153                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','englacial_void_ratio','format','Double');
    154154                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','melt_flag','format','Integer');
    155                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','islaminar','format','Integer');
     155                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','islaminar','format','Boolean');
    156156                        outputs = self.requested_outputs;
    157157                        pos  = find(ismember(outputs,'default'));

  • issm/trunk-jpl/src/m/classes/hydrologyglads.py

    r27925 r27926  
    173173        WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'englacial_void_ratio', 'format', 'Double')
    174174        WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'melt_flag', 'format', 'Integer')
    175         WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'islaminar', 'format', 'Integer')
     175        WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'islaminar', 'format', 'Boolean')
    176176
    177177        outputs = self.requested_outputs
Note: See TracChangeset for help on using the changeset viewer.