Changeset 19027


Ignore:
Timestamp:
01/20/15 15:09:59 (10 years ago)
Author:
Mathieu Morlighem
Message:

CHG: renamed 'forcing' -> 'timeseries'

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

Legend:

Unmodified
Added
Removed

  • TabularUnified issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h

    r18450 r19027  
    4242                Input* SpawnTriaInput(int index1,int index2,int index3);
    4343                Input* SpawnSegInput(int index1,int index2);
    44                 Input* PointwiseDivide(Input* forcingB){_error_("not implemented yet");};
    45                 Input* PointwiseMin(Input* forcingB){_error_("not implemented yet");};
    46                 Input* PointwiseMax(Input* forcingB){_error_("not implemented yet");};
     44                Input* PointwiseDivide(Input* input_in){_error_("not implemented yet");};
     45                Input* PointwiseMin(Input* input_in){_error_("not implemented yet");};
     46                Input* PointwiseMax(Input* input_in){_error_("not implemented yet");};
    4747                int  GetResultInterpolation(void);
    4848                int  GetResultNumberOfNodes(void);

  • TabularUnified issm/trunk-jpl/src/m/classes/SMB.m

    r17720 r19027  
    3838
    3939                        if ismember(MasstransportAnalysisEnum(),analyses),
    40                                 md = checkfield(md,'fieldname','surfaceforcings.mass_balance','forcing',1,'NaN',1);
     40                                md = checkfield(md,'fieldname','surfaceforcings.mass_balance','timeseries',1,'NaN',1);
    4141                        end
    4242                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    5353
    5454                        WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer');
    55                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
     55                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
    5656                end % }}}
    5757        end

  • TabularUnified issm/trunk-jpl/src/m/classes/SMB.py

    r17497 r19027  
    3838
    3939                if MasstransportAnalysisEnum() in analyses:
    40                         md = checkfield(md,'fieldname','surfaceforcings.mass_balance','forcing',1,'NaN',1)
     40                        md = checkfield(md,'fieldname','surfaceforcings.mass_balance','timeseries',1,'NaN',1)
    4141
    4242                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    5050
    5151                WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer');
    52                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
     52                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
    5353        # }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBcomponents.m

    r18000 r19027  
    4444
    4545                        if ismember(MasstransportAnalysisEnum(),analyses),
    46                                 md = checkfield(md,'fieldname','surfaceforcings.accumulation','forcing',1,'NaN',1);
     46                                md = checkfield(md,'fieldname','surfaceforcings.accumulation','timeseries',1,'NaN',1);
    4747                        end
    4848                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    5050                        end
    5151                        if ismember(MasstransportAnalysisEnum(),analyses),
    52                                 md = checkfield(md,'fieldname','surfaceforcings.runoff','forcing',1,'NaN',1);
     52                                md = checkfield(md,'fieldname','surfaceforcings.runoff','timeseries',1,'NaN',1);
    5353                        end
    5454                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    5656                        end
    5757                        if ismember(MasstransportAnalysisEnum(),analyses),
    58                                 md = checkfield(md,'fieldname','surfaceforcings.evaporation','forcing',1,'NaN',1);
     58                                md = checkfield(md,'fieldname','surfaceforcings.evaporation','timeseries',1,'NaN',1);
    5959                        end
    6060                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    7373
    7474                        WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBcomponentsEnum(),'format','Integer');
    75                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    76                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    77                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
     75                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     76                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     77                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
    7878                end % }}}
    7979        end

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBcomponents.py

    r18007 r19027  
    5151
    5252                if MasstransportAnalysisEnum() in analyses:
    53                         md = checkfield(md,'fieldname','surfaceforcings.accumulation','forcing',1,'NaN',1)
     53                        md = checkfield(md,'fieldname','surfaceforcings.accumulation','timeseries',1,'NaN',1)
    5454
    5555                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    5757
    5858                if MasstransportAnalysisEnum() in analyses:
    59                         md = checkfield(md,'fieldname','surfaceforcings.runoff','forcing',1,'NaN',1)
     59                        md = checkfield(md,'fieldname','surfaceforcings.runoff','timeseries',1,'NaN',1)
    6060
    6161                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    6363
    6464                if MasstransportAnalysisEnum() in analyses:
    65                         md = checkfield(md,'fieldname','surfaceforcings.evaporation','forcing',1,'NaN',1)
     65                        md = checkfield(md,'fieldname','surfaceforcings.evaporation','timeseries',1,'NaN',1)
    6666
    6767                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    7575
    7676                WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBcomponentsEnum(),'format','Integer');
    77                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    78                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    79                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
     77                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     78                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     79                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
    8080        # }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBgradients.m

    r18265 r19027  
    3838
    3939                        if ismember(MasstransportAnalysisEnum(),analyses),
    40                                 md = checkfield(md,'fieldname','surfaceforcings.href','forcing',1,'NaN',1);
    41                                 md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1);
    42                                 md = checkfield(md,'fieldname','surfaceforcings.b_pos','forcing',1,'NaN',1);
    43                                 md = checkfield(md,'fieldname','surfaceforcings.b_neg','forcing',1,'NaN',1);
     40                                md = checkfield(md,'fieldname','surfaceforcings.href','timeseries',1,'NaN',1);
     41                                md = checkfield(md,'fieldname','surfaceforcings.smbref','timeseries',1,'NaN',1);
     42                                md = checkfield(md,'fieldname','surfaceforcings.b_pos','timeseries',1,'NaN',1);
     43                                md = checkfield(md,'fieldname','surfaceforcings.b_neg','timeseries',1,'NaN',1);
    4444                        end
    4545                end % }}}
    … …  
    5959
    6060                        WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBgradientsEnum(),'format','Integer');
    61                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
    62                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    63                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    64                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
     61                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
     62                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     63                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     64                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
    6565
    6666                end % }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBgradients.py

    r17497 r19027  
    4444
    4545                if MasstransportAnalysisEnum() in analyses:
    46                         md = checkfield(md,'fieldname','surfaceforcings.href','forcing',1,'NaN',1)
    47                         md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1)
    48                         md = checkfield(md,'fieldname','surfaceforcings.b_pos','forcing',1,'NaN',1)
    49                         md = checkfield(md,'fieldname','surfaceforcings.b_neg','forcing',1,'NaN',1)
     46                        md = checkfield(md,'fieldname','surfaceforcings.href','timeseries',1,'NaN',1)
     47                        md = checkfield(md,'fieldname','surfaceforcings.smbref','timeseries',1,'NaN',1)
     48                        md = checkfield(md,'fieldname','surfaceforcings.b_pos','timeseries',1,'NaN',1)
     49                        md = checkfield(md,'fieldname','surfaceforcings.b_neg','timeseries',1,'NaN',1)
    5050
    5151                return md
    … …  
    5656
    5757                WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBgradientsEnum(),'format','Integer');
    58                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
    59                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    60                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    61                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
     58                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
     59                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     60                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     61                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
    6262        # }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBhenning.m

    r17087 r19027  
    3232
    3333                        if ismember(MasstransportAnalysisEnum(),analyses),
    34                                 md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1);
     34                                md = checkfield(md,'fieldname','surfaceforcings.smbref','timeseries',1,'NaN',1);
    3535                        end
    3636                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    4747
    4848                        WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBhenningEnum(),'format','Integer');
    49                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
     49                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
    5050                end % }}}
    5151        end

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m

    r18000 r19027  
    5050
    5151                        if ismember(MasstransportAnalysisEnum(),analyses),
    52                                 md = checkfield(md,'fieldname','surfaceforcings.accumulation','forcing',1,'NaN',1);
     52                                md = checkfield(md,'fieldname','surfaceforcings.accumulation','timeseries',1,'NaN',1);
    5353                        end
    5454                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    5656                        end
    5757                        if ismember(MasstransportAnalysisEnum(),analyses),
    58                                 md = checkfield(md,'fieldname','surfaceforcings.evaporation','forcing',1,'NaN',1);
     58                                md = checkfield(md,'fieldname','surfaceforcings.evaporation','timeseries',1,'NaN',1);
    5959                        end
    6060                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    6262                        end
    6363                        if ismember(MasstransportAnalysisEnum(),analyses),
    64                                 md = checkfield(md,'fieldname','surfaceforcings.refreeze','forcing',1,'NaN',1);
     64                                md = checkfield(md,'fieldname','surfaceforcings.refreeze','timeseries',1,'NaN',1);
    6565                        end
    6666                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    6868                        end
    6969                        if ismember(MasstransportAnalysisEnum(),analyses),
    70                                 md = checkfield(md,'fieldname','surfaceforcings.melt','forcing',1,'NaN',1);
     70                                md = checkfield(md,'fieldname','surfaceforcings.melt','timeseries',1,'NaN',1);
    7171                        end
    7272                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    8686
    8787                        WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBmeltcomponentsEnum(),'format','Integer');
    88                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    89                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    90                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','melt','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    91                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','refreeze','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
     88                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     89                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     90                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','melt','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     91                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','refreeze','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
    9292                end % }}}
    9393        end

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBmeltcomponents.py

    r18007 r19027  
    5757
    5858                if MasstransportAnalysisEnum() in analyses:
    59                         md = checkfield(md,'fieldname','surfaceforcings.accumulation','forcing',1,'NaN',1)
     59                        md = checkfield(md,'fieldname','surfaceforcings.accumulation','timeseries',1,'NaN',1)
    6060
    6161                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    6363
    6464                if MasstransportAnalysisEnum() in analyses:
    65                         md = checkfield(md,'fieldname','surfaceforcings.melt','forcing',1,'NaN',1)
     65                        md = checkfield(md,'fieldname','surfaceforcings.melt','timeseries',1,'NaN',1)
    6666
    6767                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    6969
    7070                if MasstransportAnalysisEnum() in analyses:
    71                         md = checkfield(md,'fieldname','surfaceforcings.refreeze','forcing',1,'NaN',1)
     71                        md = checkfield(md,'fieldname','surfaceforcings.refreeze','timeseries',1,'NaN',1)
    7272
    7373                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    7575
    7676                if MasstransportAnalysisEnum() in analyses:
    77                         md = checkfield(md,'fieldname','surfaceforcings.evaporation','forcing',1,'NaN',1)
     77                        md = checkfield(md,'fieldname','surfaceforcings.evaporation','timeseries',1,'NaN',1)
    7878
    7979                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    8787
    8888                WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBmeltcomponentsEnum(),'format','Integer');
    89                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    90                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    91                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','melt','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    92                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','refreeze','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
     89                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     90                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     91                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','melt','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     92                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','refreeze','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
    9393        # }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBpdd.m

    r18984 r19027  
    7575                                md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',1);
    7676                                if(obj.isdelta18o==0 & obj.ismungsm==0)
    77                                         md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','forcing',1,'NaN',1);
    78                                         md = checkfield(md,'fieldname','surfaceforcings.precipitation','forcing',1,'NaN',1);
     77                                        md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','timeseries',1,'NaN',1);
     78                                        md = checkfield(md,'fieldname','surfaceforcings.precipitation','timeseries',1,'NaN',1);
    7979                                elseif(obj.isdelta18o==1)
    8080                                        md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1);
    … …  
    146146                        if(obj.isdelta18o==0 & obj.ismungsm==0)
    147147                                %WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1);
    148                                 WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
    149                                 WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
     148                                WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
     149                                WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
    150150                        elseif obj.isdelta18o
    151151                                WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1);

  • TabularUnified issm/trunk-jpl/src/m/classes/SMBpdd.py

    r18984 r19027  
    153153                if (self.isdelta18o==0 and self.ismungsm==0):
    154154                        WriteData(fid,'object',self,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1)
    155                         WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
     155                        WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
    156156                elif self.isdelta18o:
    157157                        WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1)

  • TabularUnified issm/trunk-jpl/src/m/classes/basalforcings.m

    r18093 r19027  
    4545
    4646                        if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0),
    47                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1);
    48                                 md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1);
     47                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
     48                                md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1);
    4949                        end
    5050                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    … …  
    5353                        end
    5454                        if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0),
    55                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1);
    56                                 md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1);
    57                                 md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0);
     55                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
     56                                md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1);
     57                                md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0);
    5858                        end
    5959                end % }}}
    … …  
    7171
    7272                        WriteData(fid,'enum',BasalforcingsEnum(),'data',FloatingMeltRateEnum(),'format','Integer');
    73                         WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    74                         WriteData(fid,'object',obj,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    75                         WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     73                        WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     74                        WriteData(fid,'object',obj,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     75                        WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    7676                end % }}}
    7777        end

  • TabularUnified issm/trunk-jpl/src/m/classes/basalforcings.py

    r18093 r19027  
    4848
    4949                if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport):
    50                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1)
    51                         md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1)
     50                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
     51                        md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1)
    5252
    5353                if BalancethicknessAnalysisEnum() in analyses:
    … …  
    5656
    5757                if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal):
    58                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1)
    59                         md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1)
    60                         md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0)
     58                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
     59                        md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1)
     60                        md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0)
    6161
    6262                return md
    … …  
    6767
    6868                WriteData(fid,'enum',BasalforcingsEnum(),'data',FloatingMeltRateEnum(),'format','Integer');
    69                 WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    70                 WriteData(fid,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    71                 WriteData(fid,'object',self,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
     69                WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     70                WriteData(fid,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     71                WriteData(fid,'object',self,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
    7272        # }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/calving.m

    r19024 r19027  
    4040
    4141                        md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]);
    42                         md = checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'forcing',1,'NaN',1);
    43                         md = checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'forcing',1,'NaN',1);
     42                        md = checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1);
     43                        md = checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1);
    4444                end % }}}
    4545                function disp(obj) % {{{
    … …  
    5353                        WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
    5454                        WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer');
    55                         WriteData(fid,'object',obj,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
    56                         WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
     55                        WriteData(fid,'object',obj,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
     56                        WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
    5757                end % }}}
    5858        end

  • TabularUnified issm/trunk-jpl/src/m/classes/calving.py

    r19024 r19027  
    4545
    4646                md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
    47                 md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'forcing',1,'NaN',1);
    48                 md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'forcing',1,'NaN',1);
     47                md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'timeseries',1,'NaN',1);
     48                md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'timeseries',1,'NaN',1);
    4949
    5050                return md
    … …  
    5656                WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
    5757                WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    58                 WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts)
    59                 WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts)
     58                WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
     59                WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
    6060        # }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/calvinglevermann.m

    r19024 r19027  
    5757                        WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer');
    5858                        WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',obj.coeff,'format','DoubleMat','mattype',1);
    59                         WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
     59                        WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
    6060                end % }}}
    6161        end

  • TabularUnified issm/trunk-jpl/src/m/classes/calvinglevermann.py

    r19024 r19027  
    5454                WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    5555                WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1)
    56                 WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts)
     56                WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
    5757        # }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/calvingpi.m

    r19024 r19027  
    5757                        WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer');
    5858                        WriteData(fid,'enum',CalvingpiCoeffEnum(),'data',obj.coeff,'format','DoubleMat','mattype',1);
    59                         WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
     59                        WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
    6060                end % }}}
    6161        end

  • TabularUnified issm/trunk-jpl/src/m/classes/damage.m

    r18279 r19027  
    150150                                md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2]);
    151151                                md = checkfield(md,'fieldname','damage.D','>=',0,'<=',obj.max_damage,'size',[md.mesh.numberofvertices 1]);
    152                                 md = checkfield(md,'fieldname','damage.spcdamage','forcing',1);
     152                                md = checkfield(md,'fieldname','damage.spcdamage','timeseries',1);
    153153                                md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0);
    154154                                md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0 1 2]);
    … …  
    213213                                WriteData(fid,'object',obj,'fieldname','law','format','Integer');
    214214                                WriteData(fid,'object',obj,'fieldname','D','format','DoubleMat','mattype',1);
    215                                 WriteData(fid,'object',obj,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     215                                WriteData(fid,'object',obj,'fieldname','spcdamage','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    216216                                WriteData(fid,'object',obj,'fieldname','max_damage','format','Double');
    217217

  • TabularUnified issm/trunk-jpl/src/m/classes/damage.py

    r18278 r19027  
    131131                        md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0)
    132132                        md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2,3])
    133                         md = checkfield(md,'fieldname','damage.spcdamage','forcing',1)
     133                        md = checkfield(md,'fieldname','damage.spcdamage','timeseries',1)
    134134                        md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2])
    135135                        md = checkfield(md,'fieldname','damage.maxiter','>=0',0)
    … …  
    159159                        WriteData(fid,'object',self,'fieldname','D','format','DoubleMat','mattype',1)
    160160                        WriteData(fid,'object',self,'fieldname','law','format','Integer')
    161                         WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
     161                        WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
    162162                        WriteData(fid,'object',self,'fieldname','max_damage','format','Double')
    163163                        WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')

  • TabularUnified issm/trunk-jpl/src/m/classes/friction.m

    r17952 r19027  
    3535                        %Early return
    3636                        if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
    37                         md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1);
     37                        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1);
    3838                        md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]);
    3939                        md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]);
    … …  
    4949
    5050                        WriteData(fid,'enum',FrictionLawEnum,'data',1,'format','Integer');
    51                         WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     51                        WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    5252                        %WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1);
    5353                        WriteData(fid,'object',obj,'fieldname','p','format','DoubleMat','mattype',2);

  • TabularUnified issm/trunk-jpl/src/m/classes/friction.py

    r17952 r19027  
    3838                        return md
    3939
    40                 md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1)
     40                md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1)
    4141                md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements])
    4242                md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements])

  • TabularUnified issm/trunk-jpl/src/m/classes/frictionhydro.m

    r19001 r19027  
    4343                        WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',2);
    4444                        WriteData(fid,'class','friction','object',obj,'fieldname','As','format','DoubleMat','mattype',2);
    45                         WriteData(fid,'class','friction','object',obj,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     45                        WriteData(fid,'class','friction','object',obj,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    4646                end % }}}
    4747        end

  • TabularUnified issm/trunk-jpl/src/m/classes/frictiontemp.m

    r18732 r19027  
    3434                        if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
    3535
    36                         md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1);
     36                        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1);
    3737                        md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]);
    3838                        md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]);
    … …  
    5353                        WriteData(fid,'enum',FrictionLawEnum,'data',4,'format','Integer');
    5454                        WriteData(fid,'class','friction','object',obj,'fieldname','gamma','format','Double');
    55                         WriteData(fid,'class','friction','object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     55                        WriteData(fid,'class','friction','object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    5656                        WriteData(fid,'class','friction','object',obj,'fieldname','p','format','DoubleMat','mattype',2);
    5757                        WriteData(fid,'class','friction','object',obj,'fieldname','q','format','DoubleMat','mattype',2);

  • TabularUnified issm/trunk-jpl/src/m/classes/frictionwaterlayer.m

    r18772 r19027  
    3030                        if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
    3131
    32                         md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1);
     32                        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1);
    3333                        md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]);
    3434                        md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]);
    35                         md = checkfield(md,'fieldname','thermal.spctemperature','forcing',1,'>=',0.);
     35                        md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1,'>=',0.);
    3636
    3737                end % }}}
    … …  
    4646
    4747                        WriteData(fid,'enum',FrictionLawEnum,'data',5,'format','Integer');
    48                         WriteData(fid,'class','friction','object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     48                        WriteData(fid,'class','friction','object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    4949                        WriteData(fid,'class','friction','object',obj,'fieldname','p','format','DoubleMat','mattype',2);
    5050                        WriteData(fid,'class','friction','object',obj,'fieldname','q','format','DoubleMat','mattype',2);
    51                         WriteData(fid,'class','friction','object',obj,'fieldname','water_layer','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     51                        WriteData(fid,'class','friction','object',obj,'fieldname','water_layer','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    5252                end % }}}
    5353        end

  • TabularUnified issm/trunk-jpl/src/m/classes/frictionweertman.m

    r18800 r19027  
    3434                        %Early return
    3535                        if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
    36                         md = checkfield(md,'fieldname','friction.C','forcing',1,'NaN',1);
     36                        md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1);
    3737                        md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements 1]);
    3838                end % }}}
    … …  
    5151
    5252                        WriteData(fid,'enum',FrictionLawEnum,'data',2,'format','Integer');
    53                         WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     53                        WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    5454                        WriteData(fid,'class','friction','object',obj,'fieldname','m','format','DoubleMat','mattype',2);
    5555                       

  • TabularUnified issm/trunk-jpl/src/m/classes/frictionweertman.py

    r18800 r19027  
    3636                        return md
    3737
    38                 md = checkfield(md,'fieldname','friction.C','forcing',1,'NaN',1)
     38                md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1)
    3939                md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements])
    4040

  • TabularUnified issm/trunk-jpl/src/m/classes/frictionweertmantemp.m

    r18804 r19027  
    2626                        %Early return
    2727                        if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
    28                         md = checkfield(md,'fieldname','friction.C','forcing',1,'NaN',1);
     28                        md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1);
    2929                        md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements 1]);
    3030                end % }}}
    … …  
    4242                        WriteData(fid,'enum',FrictionLawEnum,'data',6,'format','Integer');
    4343                        WriteData(fid,'class','friction','object',obj,'fieldname','gamma','format','Double');
    44                         WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     44                        WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    4545                        WriteData(fid,'class','friction','object',obj,'fieldname','m','format','DoubleMat','mattype',2);
    4646                       

  • TabularUnified issm/trunk-jpl/src/m/classes/geometry.m

    r18492 r19027  
    6363
    6464                        if (solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum()),
    65                                 md = checkfield(md,'fieldname','geometry.thickness','forcing',1,'NaN',1,'>=',0);
     65                                md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'>=',0);
    6666                        else
    6767                                md = checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices 1]);
    … …  
    8787                function marshall(obj,md,fid) % {{{
    8888                        WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum());
    89                         WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1);
     89                        WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'timeserieslength',md.mesh.numberofvertices+1);
    9090                        WriteData(fid,'data',obj.base,'format','DoubleMat','mattype',1,'enum',BaseEnum());
    9191                        WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BedEnum());

  • TabularUnified issm/trunk-jpl/src/m/classes/geometry.py

    r17590 r19027  
    3939                md = checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices])
    4040                md = checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'size',[md.mesh.numberofvertices])
    41                 md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'forcing',1)
     41                md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'timeseries',1)
    4242                if any((self.thickness-self.surface+self.base)>10**-9):
    4343                        md.checkmessage("equality thickness=surface-base violated")
    … …  
    4949        def marshall(self,md,fid):    # {{{
    5050                WriteData(fid,'data',self.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum())
    51                 WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1)
     51                WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'timeserieslength',md.mesh.numberofvertices+1)
    5252                WriteData(fid,'data',self.base,'format','DoubleMat','mattype',1,'enum',BaseEnum())
    5353                WriteData(fid,'data',self.bed,'format','DoubleMat','mattype',1,'enum',BedEnum())

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

    r18982 r19027  
    105105                                md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0,'numel',1);
    106106            end
    107                         md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'forcing',1);
    108 
    109                         md = checkfield(md,'fieldname','hydrology.spcsediment_head','forcing',1);
     107                        md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'timeseries',1);
     108
     109                        md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1);
    110110                        md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0,'numel',1);
    111111                        md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0,'numel',1);
    … …  
    114114
    115115                        if obj.isefficientlayer==1,
    116                                 md = checkfield(md,'fieldname','hydrology.spcepl_head','forcing',1);
     116                                md = checkfield(md,'fieldname','hydrology.spcepl_head','timeseries',1);
    117117                                md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices 1],'values',[0 1]);
    118118                                md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0,'numel',1);
    … …  
    195195                                WriteData(fid,'object',obj,'fieldname','leakage_factor','format','Double');
    196196            end
    197                         WriteData(fid,'object',obj,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
    198 
    199                         WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     197                        WriteData(fid,'object',obj,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
     198
     199                        WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    200200                        WriteData(fid,'object',obj,'fieldname','sediment_compressibility','format','Double');                   
    201201                        WriteData(fid,'object',obj,'fieldname','sediment_porosity','format','Double');                 
    … …  
    204204
    205205                        if obj.isefficientlayer==1,     
    206                                 WriteData(fid,'object',obj,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);     
     206                                WriteData(fid,'object',obj,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);   
    207207                                WriteData(fid,'object',obj,'fieldname','mask_eplactive_node','format','DoubleMat','mattype',1);
    208208                                WriteData(fid,'object',obj,'fieldname','epl_compressibility','format','Double');                       

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

    r18986 r19027  
    154154                        md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0.,'numel',[1])
    155155
    156                 md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'forcing',1)
    157                 md = checkfield(md,'fieldname','hydrology.spcsediment_head','forcing',1)
     156                md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'timeseries',1)
     157                md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1)
    158158                md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0.,'numel',[1])
    159159                md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0.,'numel',[1])
    … …  
    161161                md = checkfield(md,'fieldname','hydrology.sediment_transmitivity','>=',0,'size',[md.mesh.numberofvertices,1])
    162162                if self.isefficientlayer==1:
    163                         md = checkfield(md,'fieldname','hydrology.spcepl_head','forcing',1)
     163                        md = checkfield(md,'fieldname','hydrology.spcepl_head','timeseries',1)
    164164                        md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices,1],'values',[0,1])
    165165                        md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0.,'numel',[1])
    … …  
    190190                        WriteData(fid,'object',self,'fieldname','leakage_factor','format','Double')
    191191
    192                 WriteData(fid,'object',self,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
    193                 WriteData(fid,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
     192                WriteData(fid,'object',self,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
     193                WriteData(fid,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
    194194                WriteData(fid,'object',self,'fieldname','sediment_compressibility','format','Double')
    195195                WriteData(fid,'object',self,'fieldname','sediment_porosity','format','Double')                 
    … …  
    198198
    199199                if self.isefficientlayer==1:   
    200                         WriteData(fid,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)     
     200                        WriteData(fid,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)   
    201201                        WriteData(fid,'object',self,'fieldname','mask_eplactive_node','format','DoubleMat','mattype',1)
    202202                        WriteData(fid,'object',self,'fieldname','epl_compressibility','format','Double')                       

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

    r17881 r19027  
    4343                        end
    4444
    45                         md = checkfield(md,'fieldname','hydrology.spcwatercolumn','forcing',1);
     45                        md = checkfield(md,'fieldname','hydrology.spcwatercolumn','timeseries',1);
    4646                        md = checkfield(md,'fieldname','hydrology.stabilization','>=',0);
    4747                end % }}}
    … …  
    5454                function marshall(obj,md,fid) % {{{
    5555                        WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
    56                         WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     56                        WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    5757                        WriteData(fid,'object',obj,'fieldname','stabilization','format','Double');
    5858                end % }}}

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

    r17881 r19027  
    4040                        return md
    4141
    42                 md = checkfield(md,'fieldname','hydrology.spcwatercolumn','forcing',1)
     42                md = checkfield(md,'fieldname','hydrology.spcwatercolumn','timeseries',1)
    4343                md = checkfield(md,'fieldname','hydrology.stabilization','>=',0)
    4444
    … …  
    4747        def marshall(self,md,fid):    # {{{
    4848                WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
    49                 WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
     49                WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
    5050                WriteData(fid,'object',self,'fieldname','stabilization','format','Double')
    5151        # }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/linearbasalforcings.m

    r18096 r19027  
    4949
    5050                        if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0),
    51                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1);
     51                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
    5252                                md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
    5353                                md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1);
    … …  
    6161                        end
    6262                        if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0),
    63                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1);
     63                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
    6464                                md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
    6565                                md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1);
    6666                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0,'numel',1);
    67                                 md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0);
     67                                md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0);
    6868                        end
    6969                end % }}}
    … …  
    8787                        floatingice_melting_rate(pos)=md.basalforcings.deepwater_melting_rate*(md.geometry.base(pos)-md.basalforcings.upperwater_elevation)/(md.basalforcings.deepwater_elevation-md.basalforcings.upperwater_elevation);
    8888                        WriteData(fid,'enum',BasalforcingsEnum(),'data',LinearFloatingMeltRateEnum(),'format','Integer');
    89                         WriteData(fid,'data',floatingice_melting_rate,'format','DoubleMat','enum',BasalforcingsFloatingiceMeltingRateEnum(),'mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    90                         WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','enum',BasalforcingsGroundediceMeltingRateEnum(),'mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    91                         WriteData(fid,'object',obj,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     89                        WriteData(fid,'data',floatingice_melting_rate,'format','DoubleMat','enum',BasalforcingsFloatingiceMeltingRateEnum(),'mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     90                        WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','enum',BasalforcingsGroundediceMeltingRateEnum(),'mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     91                        WriteData(fid,'object',obj,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    9292                        WriteData(fid,'object',obj,'fieldname','deepwater_melting_rate','format','Double','enum',BasalforcingsDeepwaterMeltingRateEnum(),'scale',1./yts)
    9393                        WriteData(fid,'object',obj,'fieldname','deepwater_elevation','format','Double','enum',BasalforcingsDeepwaterElevationEnum())

  • TabularUnified issm/trunk-jpl/src/m/classes/linearbasalforcings.py

    r18116 r19027  
    6969
    7070                if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport):
    71                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1)
     71                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
    7272                        md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0);
    7373                        md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<',md.basalforcings.upperwater_elevation);
    … …  
    8181
    8282                if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal):
    83                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1)
     83                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
    8484                        md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0);
    8585                        md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<',md.basalforcings.upperwater_elevation);
    8686                        md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0);
    87                         md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0)
     87                        md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0)
    8888
    8989                return md
    … …  
    100100
    101101                WriteData(fid,'enum',BasalforcingsEnum(),'data',LinearFloatingMeltRateEnum(),'format','Integer');
    102                 WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','enum',BasalforcingsGroundediceMeltingRateEnum(),'format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    103                 WriteData(fid,'data',floatingice_melting_rate,'enum',BasalforcingsFloatingiceMeltingRateEnum(),'format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    104                 WriteData(fid,'object',self,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
     102                WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','enum',BasalforcingsGroundediceMeltingRateEnum(),'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     103                WriteData(fid,'data',floatingice_melting_rate,'enum',BasalforcingsFloatingiceMeltingRateEnum(),'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     104                WriteData(fid,'object',self,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
    105105                WriteData(fid,'object',self,'fieldname','deepwater_melting_rate','enum',BasalforcingsDeepwaterMeltingRateEnum(),'format','Double','scale',1./yts)
    106106                WriteData(fid,'object',self,'fieldname','deepwater_elevation','enum',BasalforcingsDeepwaterElevationEnum(),'format','Double')

  • TabularUnified issm/trunk-jpl/src/m/classes/masscon.m

    r18881 r19027  
    4343                        md = checkfield(md,'fieldname','obj.definitionenum','field',obj.definitionenum,'values',[Outputdefinition1Enum,Outputdefinition2Enum,Outputdefinition3Enum,Outputdefinition4Enum,Outputdefinition5Enum,Outputdefinition6Enum,Outputdefinition7Enum,Outputdefinition8Enum,Outputdefinition9Enum,Outputdefinition10Enum]);
    4444
    45                         md = checkfield(md,'fieldname','obj.levelset','field',obj.levelset,'forcing',1,'NaN',1);
     45                        md = checkfield(md,'fieldname','obj.levelset','field',obj.levelset,'timeseries',1,'NaN',1);
    4646
    4747                end % }}}

  • TabularUnified issm/trunk-jpl/src/m/classes/masstransport.m

    r18757 r19027  
    8787                        if ~ismember(MasstransportAnalysisEnum(),analyses) |  (solution==TransientSolutionEnum() & md.transient.ismasstransport==0), return; end
    8888
    89                         md = checkfield(md,'fieldname','masstransport.spcthickness','forcing',1);
     89                        md = checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1);
    9090                        md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 1]);
    9191                        md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',{'Absolute' 'Incremental'});
    … …  
    113113                        yts=365.*24.*3600.;
    114114
    115                         WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     115                        WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    116116                        WriteData(fid,'object',obj,'fieldname','isfreesurface','format','Boolean');
    117117                        WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double');

  • TabularUnified issm/trunk-jpl/src/m/classes/masstransport.py

    r18756 r19027  
    6767                        return md
    6868
    69                 md = checkfield(md,'fieldname','masstransport.spcthickness','forcing',1)
     69                md = checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1)
    7070                md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0,1])
    7171                md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',['Absolute','Incremental'])
    … …  
    8080                yts=365.*24.*3600.
    8181
    82                 WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
     82                WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
    8383                WriteData(fid,'object',self,'fieldname','isfreesurface','format','Boolean')
    8484                WriteData(fid,'object',self,'fieldname','min_thickness','format','Double')

  • TabularUnified issm/trunk-jpl/src/m/classes/matice.m

    r19014 r19027  
    143143                        md = checkfield(md,'fieldname','materials.rho_freshwater','>',0);
    144144                        md = checkfield(md,'fieldname','materials.mu_water','>',0);
    145                         md = checkfield(md,'fieldname','materials.rheology_B','>',0,'forcing',1,'NaN',1);
     145                        md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1);
    146146                        md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]);
    147147                        md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'Cuffey' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
    … …  
    192192                        WriteData(fid,'object',obj,'class','materials','fieldname','mixed_layer_capacity','format','Double');
    193193                        WriteData(fid,'object',obj,'class','materials','fieldname','thermal_exchange_velocity','format','Double');
    194                         WriteData(fid,'object',obj,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     194                        WriteData(fid,'object',obj,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    195195                        WriteData(fid,'object',obj,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
    196196                        WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer');

  • TabularUnified issm/trunk-jpl/src/m/classes/matice.py

    r19014 r19027  
    117117                md = checkfield(md,'fieldname','materials.rho_freshwater','>',0)
    118118                md = checkfield(md,'fieldname','materials.mu_water','>',0)
    119                 md = checkfield(md,'fieldname','materials.rheology_B','>',0,'forcing',1,'NaN',1)
     119                md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1)
    120120                md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements])
    121121                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','Paterson','Arrhenius','LliboutryDuval'])
    … …  
    140140                WriteData(fid,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double')
    141141                WriteData(fid,'object',self,'class','materials','fieldname','thermal_exchange_velocity','format','Double')
    142                 WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
     142                WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
    143143                WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1)
    144144                WriteData(fid,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2)

  • TabularUnified issm/trunk-jpl/src/m/classes/misfit.m

    r18881 r19027  
    6060                                error('misfit error message: ''timeinterpolation'' field should be a string!');
    6161                        end
    62                         md = checkfield(md,'fieldname','obj.observation','field',obj.observation,'forcing',1,'NaN',1);
     62                        md = checkfield(md,'fieldname','obj.observation','field',obj.observation,'timeseries',1,'NaN',1);
    6363                        md = checkfield(md,'fieldname','obj.timeinterpolation','field',obj.timeinterpolation,'values',{'nearestneighbor'});
    64                         md = checkfield(md,'fieldname','obj.weights','field',obj.weights,'forcing',1,'NaN',1);
     64                        md = checkfield(md,'fieldname','obj.weights','field',obj.weights,'timeseries',1,'NaN',1);
    6565
    6666                end % }}}
    … …  
    8484                WriteData(fid,'object',obj,'fieldname','definitionenum','format','Integer');
    8585                WriteData(fid,'object',obj,'fieldname','model_enum','format','Integer');
    86                 WriteData(fid,'object',obj,'fieldname','observation','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     86                WriteData(fid,'object',obj,'fieldname','observation','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    8787                WriteData(fid,'object',obj,'fieldname','observation_enum','format','Integer');
    8888                WriteData(fid,'object',obj,'fieldname','timeinterpolation','format','String');
    89                 WriteData(fid,'object',obj,'fieldname','weights','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     89                WriteData(fid,'object',obj,'fieldname','weights','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    9090                WriteData(fid,'object',obj,'fieldname','weights_enum','format','Integer');
    9191

  • TabularUnified issm/trunk-jpl/src/m/classes/snowpack.m

    r16764 r19027  
    455455                        yts=365.0*24.0*3600.0;
    456456
    457                         WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    458                         WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    459                         WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
     457                        WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     458                        WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     459                        WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
    460460                        WriteData(fid,'object',obj,'class','snowpack','fieldname','restol','format','Double');
    461461                        WriteData(fid,'object',obj,'class','snowpack','fieldname','reltol','format','Double');

  • TabularUnified issm/trunk-jpl/src/m/classes/stressbalance.m

    r18652 r19027  
    126126                        if ~ismember(StressbalanceAnalysisEnum(),analyses), return; end
    127127
    128                         md = checkfield(md,'fieldname','stressbalance.spcvx','forcing',1);
    129                         md = checkfield(md,'fieldname','stressbalance.spcvy','forcing',1);
    130                         md = checkfield(md,'fieldname','stressbalance.spcvz','forcing',1);
     128                        md = checkfield(md,'fieldname','stressbalance.spcvx','timeseries',1);
     129                        md = checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1);
     130                        md = checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1);
    131131                        md = checkfield(md,'fieldname','stressbalance.restol','size',[1 1],'>',0,'NaN',1);
    132132                        md = checkfield(md,'fieldname','stressbalance.reltol','size',[1 1]);
    … …  
    218218                        yts=365.0*24.0*3600.0;
    219219
    220                         WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    221                         WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
    222                         WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1);
     220                        WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     221                        WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
     222                        WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
    223223                        WriteData(fid,'object',obj,'class','stressbalance','fieldname','restol','format','Double');
    224224                        WriteData(fid,'object',obj,'class','stressbalance','fieldname','reltol','format','Double');

  • TabularUnified issm/trunk-jpl/src/m/classes/stressbalance.py

    r18619 r19027  
    123123                        return md
    124124
    125                 md = checkfield(md,'fieldname','stressbalance.spcvx','forcing',1)
    126                 md = checkfield(md,'fieldname','stressbalance.spcvy','forcing',1)
     125                md = checkfield(md,'fieldname','stressbalance.spcvx','timeseries',1)
     126                md = checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1)
    127127                if m.strcmp(md.mesh.domaintype(),'3D'):
    128                         md = checkfield(md,'fieldname','stressbalance.spcvz','forcing',1)
     128                        md = checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1)
    129129                md = checkfield(md,'fieldname','stressbalance.restol','size',[1],'>',0)
    130130                md = checkfield(md,'fieldname','stressbalance.reltol','size',[1])
    … …  
    168168                yts=365.0*24.0*3600.0
    169169
    170                 WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    171                 WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    172                 WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
     170                WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     171                WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
     172                WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
    173173                WriteData(fid,'object',self,'class','stressbalance','fieldname','restol','format','Double')
    174174                WriteData(fid,'object',self,'class','stressbalance','fieldname','reltol','format','Double')

  • TabularUnified issm/trunk-jpl/src/m/classes/thermal.m

    r18754 r19027  
    9191
    9292                        md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 1 2]);
    93                         md = checkfield(md,'fieldname','thermal.spctemperature','forcing',1);
     93                        md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1);
    9494                        if (ismember(EnthalpyAnalysisEnum(),analyses) & md.thermal.isenthalpy & dimension(md.mesh)==3),
    9595                                pos=find(md.thermal.spctemperature(1:md.mesh.numberofvertices,:)~=NaN);
    … …  
    124124                end % }}}
    125125                function marshall(obj,md,fid) % {{{
    126                         WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
     126                        WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    127127                        WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer');
    128128                        WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');

  • TabularUnified issm/trunk-jpl/src/m/classes/thermal.py

    r18620 r19027  
    8686
    8787                md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0,1,2])
    88                 md = checkfield(md,'fieldname','thermal.spctemperature','forcing',1)
     88                md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1)
    8989                if EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy and md.mesh.dimension()==3:
    9090                        pos=numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[0:md.mesh.numberofvertices])))
    … …  
    102102        # }}}
    103103        def marshall(self,md,fid):    # {{{
    104                 WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
     104                WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
    105105                WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer')
    106106                WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')

  • TabularUnified issm/trunk-jpl/src/m/consistency/checkfield.m

    r18077 r19027  
    1414%      - <=: smaller or equal to provided value
    1515%      - < vec:  smallerthan provided values on each vertex
    16 %      - forcing: 1 if check forcing consistency (size and time)
     16%      - timeseries: 1 if check time series consistency (size and time)
    1717%      - values: cell of strings or vector of acceptable values
    1818%      - numel: list of acceptable number of elements
    … …  
    198198
    199199%Check forcings (size and times)
    200 if getfieldvalue(options,'forcing',0),
     200if getfieldvalue(options,'timeseries',0),
    201201        if size(field,1)==md.mesh.numberofvertices,
    202202                if ~size(field,2)==1,

  • TabularUnified issm/trunk-jpl/src/m/consistency/checkfield.py

    r18077 r19027  
    2121              - <=: smaller or equal to provided value
    2222              - < vec:  smallerthan provided values on each vertex
    23               - forcing: 1 if check forcing consistency (size and time)
     23              - timeseries: 1 if check time series consistency (size and time)
    2424              - values: cell of strings or vector of acceptable values
    2525              - numel: list of acceptable number of elements
    … …  
    151151
    152152        #Check forcings (size and times)
    153         if options.getfieldvalue('forcing',0):
     153        if options.getfieldvalue('timeseries',0):
    154154                if   numpy.size(field,0)==md.mesh.numberofvertices:
    155155                        if numpy.ndim(field)>1 and not numpy.size(field,1)==1:

  • TabularUnified issm/trunk-jpl/src/m/solve/WriteData.m

    r17945 r19027  
    2727format  = getfieldvalue(options,'format');
    2828mattype = getfieldvalue(options,'mattype',0);    %only required for matrices
    29 forcinglength = getfieldvalue(options,'forcinglength',-1);
     29timeserieslength = getfieldvalue(options,'timeserieslength',-1);
    3030
    3131%Process sparse matrices
    … …  
    3737if exist(options,'scale'),
    3838        scale = getfieldvalue(options,'scale');
    39         if size(data,1)==forcinglength,
     39        if size(data,1)==timeserieslength,
    4040                data(1:end-1,:) = scale.*data(1:end-1,:);
    4141        else
    … …  
    4343        end
    4444end
    45 if(size(data,1)==forcinglength),
     45if(size(data,1)==timeserieslength),
    4646        yts=365.0*24.0*3600.0;
    4747        data(end,:) = data(end,:)*yts;

  • TabularUnified issm/trunk-jpl/src/m/solve/WriteData.py

    r17945 r19027  
    3535        format  = options.getfieldvalue('format')
    3636        mattype = options.getfieldvalue('mattype',0)    #only required for matrices
    37         forcinglength = options.getfieldvalue('forcinglength',-1)
     37        timeserieslength = options.getfieldvalue('timeserieslength',-1)
    3838
    3939        #Process sparse matrices
    … …  
    4646                scale = options.getfieldvalue('scale')
    4747                if numpy.size(data) > 1 :
    48                         if numpy.size(data,0)==forcinglength:
     48                        if numpy.size(data,0)==timeserieslength:
    4949                                data=numpy.array(data)
    5050                                data[0:-1,:] = scale*data[0:-1,:]
    … …  
    5454                        data  = scale*data
    5555        if numpy.size(data) > 1 :
    56                 if numpy.size(data,0)==forcinglength:
     56                if numpy.size(data,0)==timeserieslength:
    5757                        yts=365.0*24.0*3600.0
    5858                        data[-1,:] = yts*data[-1,:]
Note: See TracChangeset for help on using the changeset viewer.