Changeset 20917


Ignore:
Timestamp:
07/14/16 18:22:29 (9 years ago)
Author:
agscott1
Message:

CHG: Hard-coded hydrology enums and updated Marshalling

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

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/IoModel.cpp

    r20916 r20917  
    601601                                        if(strcmp(record_name,"md.basalforcings.model")==0) integer = IoCodeToEnumBasal(integer);
    602602                                        if(strcmp(record_name,"md.calving.law")==0) integer = IoCodeToEnumCalving(integer);
     603                                        if(strcmp(record_name,"md.hydrology.model")==0) integer = IoCodeToEnumHydrology(integer);
    603604
    604605                                        /*Broadcast to other cpus*/

  • issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp

    r20916 r20917  
    7373        }
    7474}/*}}}*/
     75int IoCodeToEnumHydrology(int enum_in){/*{{{*/
     76        switch(enum_in){
     77                case 1: return HydrologydcEnum;
     78                case 2: return HydrologyshreveEnum;
     79                case 3: return HydrologysommersEnum;
     80                default: _error_("Marshalled hydrology code \""<<enum_in<<"\" not supported yet");
     81        }
     82}/*}}}*/

  • issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.h

    r20916 r20917  
    77int IoCodeToEnumBasal(int enum_in);
    88int IoCodeToEnumCalving(int enum_in);
     9int IoCodeToEnumHydrology(int enum_in);
    910#endif 

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

    r20902 r20917  
    189189                % {{{ function marshall(self,prefix,md,fid)
    190190                function marshall(self,prefix,md,fid)
    191                         WriteData(fid,prefix,'name','md.hydrology.model','data',HydrologydcEnum(),'format','Integer');
     191                        WriteData(fid,prefix,'name','md.hydrology.model','data',1,'format','Integer');
    192192                        WriteData(fid,prefix,'object',self,'fieldname','water_compressibility','format','Double');
    193193                        WriteData(fid,prefix,'object',self,'fieldname','isefficientlayer','format','Boolean');

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

    r20902 r20917  
    184184        # }}}
    185185        def marshall(self,prefix,md,fid): #{{{
    186                 WriteData(fid,prefix,'name','md.hydrology.model','data',HydrologydcEnum(),'format','Integer')
     186                WriteData(fid,prefix,'name','md.hydrology.model','data',1,'format','Integer')
    187187                WriteData(fid,prefix,'object',self,'fieldname','water_compressibility','format','Double')
    188188                WriteData(fid,prefix,'object',self,'fieldname','isefficientlayer','format','Boolean')

  • issm/trunk-jpl/src/m/classes/hydrologyshreve.js

    r20902 r20917  
    4040                } // }}}
    4141                this.marshall=function(md,prefix,fid) { //{{{
    42                         WriteData(fid,prefix,'name','md.hydrology.model','data',HydrologyshreveEnum(),'format','Integer');
     42                        WriteData(fid,prefix,'name','md.hydrology.model','data',2,'format','Integer');
    4343                        WriteData(fid,prefix,'object',this,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
    4444                        WriteData(fid,prefix,'object',this,'fieldname','stabilization','format','Double');

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

    r20902 r20917  
    4444                end % }}}
    4545                function marshall(self,prefix,md,fid) % {{{
    46                         WriteData(fid,prefix,'name','md.hydrology.model','data',HydrologyshreveEnum(),'format','Integer');
     46                        WriteData(fid,prefix,'name','md.hydrology.model','data',2,'format','Integer');
    4747                        WriteData(fid,prefix,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
    4848                        WriteData(fid,prefix,'object',self,'fieldname','stabilization','format','Double');

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

    r20902 r20917  
    4949        # }}}
    5050        def marshall(self,prefix,md,fid):    # {{{
    51                 WriteData(fid,prefix,'name','md.hydrology.model','data',HydrologyshreveEnum(),'format','Integer');
     51                WriteData(fid,prefix,'name','md.hydrology.model','data',2,'format','Integer');
    5252                WriteData(fid,prefix,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
    5353                WriteData(fid,prefix,'object',self,'fieldname','stabilization','format','Double')

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

    r20902 r20917  
    6464                        yts=md.constants.yts;
    6565
    66                         WriteData(fid,prefix,'name','md.hydrology.model','data',HydrologysommersEnum(),'format','Integer');
     66                        WriteData(fid,prefix,'name','md.hydrology.model','data',3,'format','Integer');
    6767                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','head','format','DoubleMat','mattype',1);
    6868                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','gap_height','format','DoubleMat','mattype',2);
Note: See TracChangeset for help on using the changeset viewer.