Changeset 19898


Ignore:
Timestamp:
12/16/15 14:34:56 (9 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added check on Inf values in checkconsistency

Location:
issm/trunk-jpl/src/py3/classes
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/py3/classes/SMBcomponents.py

    r19895 r19898  
    5656
    5757                if MasstransportAnalysisEnum() in analyses:
    58                         md = checkfield(md,'fieldname','smb.accumulation','timeseries',1,'NaN',1)
     58                        md = checkfield(md,'fieldname','smb.accumulation','timeseries',1,'NaN',1,'Inf',1)
    5959
    6060                if BalancethicknessAnalysisEnum() in analyses:
    61                         md = checkfield(md,'fieldname','smb.accumulation','size',[md.mesh.numberofvertices],'NaN',1)
     61                        md = checkfield(md,'fieldname','smb.accumulation','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    6262
    6363                if MasstransportAnalysisEnum() in analyses:
    64                         md = checkfield(md,'fieldname','smb.runoff','timeseries',1,'NaN',1)
     64                        md = checkfield(md,'fieldname','smb.runoff','timeseries',1,'NaN',1,'Inf',1)
    6565
    6666                if BalancethicknessAnalysisEnum() in analyses:
    67                         md = checkfield(md,'fieldname','smb.runoff','size',[md.mesh.numberofvertices],'NaN',1)
     67                        md = checkfield(md,'fieldname','smb.runoff','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    6868
    6969                if MasstransportAnalysisEnum() in analyses:
    70                         md = checkfield(md,'fieldname','smb.evaporation','timeseries',1,'NaN',1)
     70                        md = checkfield(md,'fieldname','smb.evaporation','timeseries',1,'NaN',1,'Inf',1)
    7171
    7272                if BalancethicknessAnalysisEnum() in analyses:
    73                         md = checkfield(md,'fieldname','smb.evaporation','size',[md.mesh.numberofvertices],'NaN',1)
     73                        md = checkfield(md,'fieldname','smb.evaporation','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    7474               
    7575                md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)

  • issm/trunk-jpl/src/py3/classes/SMBd18opdd.py

    r19895 r19898  
    9191                if MasstransportAnalysisEnum() in analyses:
    9292                        md = checkfield(md,'fieldname','smb.desfac','<=',1,'numel',[1])
    93                         md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'size',[md.mesh.numberofvertices,1])
    94                         md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'size',[md.mesh.numberofvertices,1])
     93                        md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
     94                        md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
    9595                        md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',[1])
    9696                        md = checkfield(md,'fieldname','smb.rlapslgm','>=',0,'numel',[1])
    9797
    9898                        if self.isd18opd:
    99                                 md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
    100                                 md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
    101                                 md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
     99                                md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
     100                                md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
     101                                md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
    102102                                md = checkfield(md,'fieldname','smb.dpermil','>=',0,'numel',[1])
    103103               

  • issm/trunk-jpl/src/py3/classes/SMBforcing.py

    r19895 r19898  
    4343
    4444                if MasstransportAnalysisEnum() in analyses:
    45                         md = checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1)
     45                        md = checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1,'Inf',1)
    4646
    4747                if BalancethicknessAnalysisEnum() in analyses:
    48                         md = checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices],'NaN',1)
     48                        md = checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    4949
    5050                md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)

  • issm/trunk-jpl/src/py3/classes/SMBgradients.py

    r19895 r19898  
    4949
    5050                if MasstransportAnalysisEnum() in analyses:
    51                         md = checkfield(md,'fieldname','smb.href','timeseries',1,'NaN',1)
    52                         md = checkfield(md,'fieldname','smb.smbref','timeseries',1,'NaN',1)
    53                         md = checkfield(md,'fieldname','smb.b_pos','timeseries',1,'NaN',1)
    54                         md = checkfield(md,'fieldname','smb.b_neg','timeseries',1,'NaN',1)
     51                        md = checkfield(md,'fieldname','smb.href','timeseries',1,'NaN',1,'Inf',1)
     52                        md = checkfield(md,'fieldname','smb.smbref','timeseries',1,'NaN',1,'Inf',1)
     53                        md = checkfield(md,'fieldname','smb.b_pos','timeseries',1,'NaN',1,'Inf',1)
     54                        md = checkfield(md,'fieldname','smb.b_neg','timeseries',1,'NaN',1,'Inf',1)
    5555
    5656                md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)

  • issm/trunk-jpl/src/py3/classes/SMBmeltcomponents.py

    r19895 r19898  
    6262
    6363                if MasstransportAnalysisEnum() in analyses:
    64                         md = checkfield(md,'fieldname','smb.accumulation','timeseries',1,'NaN',1)
     64                        md = checkfield(md,'fieldname','smb.accumulation','timeseries',1,'NaN',1,'Inf',1)
    6565
    6666                if BalancethicknessAnalysisEnum() in analyses:
    67                         md = checkfield(md,'fieldname','smb.accumulation','size',[md.mesh.numberofvertices],'NaN',1)
     67                        md = checkfield(md,'fieldname','smb.accumulation','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    6868
    6969                if MasstransportAnalysisEnum() in analyses:
    70                         md = checkfield(md,'fieldname','smb.melt','timeseries',1,'NaN',1)
     70                        md = checkfield(md,'fieldname','smb.melt','timeseries',1,'NaN',1,'Inf',1)
    7171
    7272                if BalancethicknessAnalysisEnum() in analyses:
    73                         md = checkfield(md,'fieldname','smb.melt','size',[md.mesh.numberofvertices],'NaN',1)
     73                        md = checkfield(md,'fieldname','smb.melt','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    7474
    7575                if MasstransportAnalysisEnum() in analyses:
    76                         md = checkfield(md,'fieldname','smb.refreeze','timeseries',1,'NaN',1)
     76                        md = checkfield(md,'fieldname','smb.refreeze','timeseries',1,'NaN',1,'Inf',1)
    7777
    7878                if BalancethicknessAnalysisEnum() in analyses:
    79                         md = checkfield(md,'fieldname','smb.refreeze','size',[md.mesh.numberofvertices],'NaN',1)
     79                        md = checkfield(md,'fieldname','smb.refreeze','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    8080
    8181                if MasstransportAnalysisEnum() in analyses:
    82                         md = checkfield(md,'fieldname','smb.evaporation','timeseries',1,'NaN',1)
     82                        md = checkfield(md,'fieldname','smb.evaporation','timeseries',1,'NaN',1,'Inf',1)
    8383
    8484                if BalancethicknessAnalysisEnum() in analyses:
    85                         md = checkfield(md,'fieldname','smb.evaporation','size',[md.mesh.numberofvertices],'NaN',1)
     85                        md = checkfield(md,'fieldname','smb.evaporation','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    8686
    8787                md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)

  • issm/trunk-jpl/src/py3/classes/SMBpdd.py

    r19895 r19898  
    120120                if MasstransportAnalysisEnum() in analyses:
    121121                        md = checkfield(md,'fieldname','smb.desfac','<=',1,'numel',[1])
    122                         md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'size',[md.mesh.numberofvertices,1])
    123                         md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'size',[md.mesh.numberofvertices,1])
     122                        md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
     123                        md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
    124124                        md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',[1])
    125125                        md = checkfield(md,'fieldname','smb.rlapslgm','>=',0,'numel',[1])
    126126
    127127                        if (self.isdelta18o==0 and self.ismungsm==0):
    128                                 md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'timeseries',1)
    129                                 md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'timeseries',1)
     128                                md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'Inf',1,'timeseries',1)
     129                                md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'Inf',1,'timeseries',1)
    130130                        elif self.isdelta18o:
    131                                 md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
    132                                 md = checkfield(md,'fieldname','smb.delta18o_surface','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
    133                                 md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
    134                                 md = checkfield(md,'fieldname','smb.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
    135                                 md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
    136                                 md = checkfield(md,'fieldname','smb.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)                                       
    137                                 md = checkfield(md,'fieldname','smb.Tdiff','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
    138                                 md = checkfield(md,'fieldname','smb.sealev','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
     131                                md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
     132                                md = checkfield(md,'fieldname','smb.delta18o_surface','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
     133                                md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
     134                                md = checkfield(md,'fieldname','smb.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
     135                                md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
     136                                md = checkfield(md,'fieldname','smb.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)                                       
     137                                md = checkfield(md,'fieldname','smb.Tdiff','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
     138                                md = checkfield(md,'fieldname','smb.sealev','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
    139139                        elif self.ismungsm:
    140                                 md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
    141                                 md = checkfield(md,'fieldname','smb.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
    142                                 md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
    143                                 md = checkfield(md,'fieldname','smb.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)                                       
    144                                 md = checkfield(md,'fieldname','smb.Pfac','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
    145                                 md = checkfield(md,'fieldname','smb.Tdiff','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
    146                                 md = checkfield(md,'fieldname','smb.sealev','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
     140                                md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
     141                                md = checkfield(md,'fieldname','smb.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
     142                                md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
     143                                md = checkfield(md,'fieldname','smb.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)                                       
     144                                md = checkfield(md,'fieldname','smb.Pfac','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
     145                                md = checkfield(md,'fieldname','smb.Tdiff','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
     146                                md = checkfield(md,'fieldname','smb.sealev','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
    147147
    148148                md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)

  • issm/trunk-jpl/src/py3/classes/balancethickness.py

    r19895 r19898  
    4343
    4444                md = checkfield(md,'fieldname','balancethickness.spcthickness')
    45                 md = checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices],'NaN',1)
     45                md = checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    4646                md = checkfield(md,'fieldname','balancethickness.stabilization','size',[1],'values',[0,1,2,3])
    4747

  • issm/trunk-jpl/src/py3/classes/basalforcings.py

    r19895 r19898  
    5555
    5656                if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport):
    57                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
    58                         md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1)
     57                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
     58                        md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
    5959
    6060                if BalancethicknessAnalysisEnum() in analyses:
    61                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
    62                         md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
     61                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     62                        md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    6363
    6464                if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal):
    65                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
    66                         md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1)
    67                         md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0)
     65                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
     66                        md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
     67                        md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0)
    6868
    6969                return md

  • issm/trunk-jpl/src/py3/classes/calving.py

    r19895 r19898  
    5555                md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1)
    5656                md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
    57                 md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'timeseries',1,'NaN',1);
    58                 md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'timeseries',1,'NaN',1);
     57                md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'timeseries',1,'NaN',1,'Inf',1);
     58                md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'timeseries',1,'NaN',1,'Inf',1);
    5959
    6060                return md

  • issm/trunk-jpl/src/py3/classes/calvinglevermann.py

    r19895 r19898  
    5656                md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
    5757                md = checkfield(md,'fieldname','calving.coeff','size',[md.mesh.numberofvertices],'>',0)
    58                 md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices],'>=',0)
     58                md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>=',0)
    5959                return md
    6060        # }}}

  • issm/trunk-jpl/src/py3/classes/friction.py

    r19895 r19898  
    4545                        return md
    4646
    47                 md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1)
    48                 md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements])
    49                 md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements])
     47                md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',1)
     48                md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
     49                md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
    5050
    5151                return md

  • issm/trunk-jpl/src/py3/classes/frictioncoulomb.py

    r19895 r19898  
    4848            return md
    4949
    50         md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1)
    51         md = checkfield(md,'fieldname','friction.coefficientcoulomb','timeseries',1,'NaN',1)
    52         md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements])
    53         md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements])
     50        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',1)
     51        md = checkfield(md,'fieldname','friction.coefficientcoulomb','timeseries',1,'NaN',1,'Inf',1)
     52        md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
     53        md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
    5454
    5555        return md

  • issm/trunk-jpl/src/py3/classes/frictionweertman.py

    r19895 r19898  
    3737                        return md
    3838
    39                 md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1)
    40                 md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements])
     39                md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1,'Inf',1)
     40                md = checkfield(md,'fieldname','friction.m','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
    4141
    4242                return md

  • issm/trunk-jpl/src/py3/classes/geometry.py

    r19895 r19898  
    4646        def checkconsistency(self,md,solution,analyses):    # {{{
    4747
    48                 md = checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices])
    49                 md = checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'size',[md.mesh.numberofvertices])
    50                 md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'timeseries',1)
     48                md = checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     49                md = checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     50                md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0,'timeseries',1)
    5151                if any(abs(self.thickness-self.surface+self.base)>10**-9):
    5252                        md.checkmessage("equality thickness=surface-base violated")
    5353                if solution==TransientSolutionEnum() and md.transient.isgroundingline:
    54                         md = checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices])
     54                        md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    5555
    5656                return md

  • issm/trunk-jpl/src/py3/classes/gia.py

    r19895 r19898  
    4848                        return md
    4949               
    50                 md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
    51                 md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
     50                md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0)
     51                md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0)
    5252                md = checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2])
    5353

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

    r19895 r19898  
    163163                        md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0.,'numel',[1])
    164164
    165                 md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'timeseries',1)
     165                md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'Inf',1,'timeseries',1)
    166166                md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1)
    167167                md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0.,'numel',[1])

  • issm/trunk-jpl/src/py3/classes/initialization.py

    r19895 r19898  
    7171                if StressbalanceAnalysisEnum() in analyses:
    7272                        if not numpy.any(numpy.logical_or(numpy.isnan(md.initialization.vx),numpy.isnan(md.initialization.vy))):
    73                                 md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
    74                                 md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
     73                                md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     74                                md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    7575                if MasstransportAnalysisEnum() in analyses:
    76                         md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
    77                         md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
     76                        md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     77                        md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    7878                if BalancethicknessAnalysisEnum() in analyses:
    79                         md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
    80                         md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
     79                        md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     80                        md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    8181                        #Triangle with zero velocity
    8282                        if numpy.any(numpy.logical_and(numpy.sum(numpy.abs(md.initialization.vx[md.mesh.elements-1]),axis=1)==0,\
    … …  
    8484                                md.checkmessage("at least one triangle has all its vertices with a zero velocity")
    8585                if ThermalAnalysisEnum() in analyses:
    86                         md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
    87                         md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
    88                         md = checkfield(md,'fieldname','initialization.temperature','NaN',1,'size',[md.mesh.numberofvertices])
     86                        md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     87                        md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     88                        md = checkfield(md,'fieldname','initialization.temperature','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    8989                        if md.mesh.dimension()==3:
    90                                 md = checkfield(md,'fieldname','initialization.vz','NaN',1,'size',[md.mesh.numberofvertices])
    91                         md = checkfield(md,'fieldname','initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices])
     90                                md = checkfield(md,'fieldname','initialization.vz','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     91                        md = checkfield(md,'fieldname','initialization.pressure','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    9292                        if (EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy):
    9393                                md = checkfield(md,'fieldname','initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices])
    … …  
    9595                if HydrologyShreveAnalysisEnum() in analyses:
    9696                        if hasattr(md.hydrology,'hydrologyshreve'):
    97                                 md = checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices])
     97                                md = checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    9898                if HydrologyDCInefficientAnalysisEnum() in analyses:
    9999                        if hasattr(md.hydrology,'hydrologydc'):
    100                                 md = checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices,1])
     100                                md = checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
    101101                if HydrologyDCEfficientAnalysisEnum() in analyses:
    102102                        if hasattr(md.hydrology,'hydrologydc'):
    103103                                if md.hydrology.isefficientlayer==1:
    104                                         md = checkfield(md,'fieldname','initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices,1])
    105                                         md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'size',[md.mesh.numberofvertices,1])
     104                                        md = checkfield(md,'fieldname','initialization.epl_head','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
     105                                        md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
    106106
    107107                return md

  • issm/trunk-jpl/src/py3/classes/inversion.py

    r19895 r19898  
    151151
    152152                if solution==BalancethicknessSolutionEnum():
    153                         md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1)
     153                        md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    154154                else:
    155                         md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1)
    156                         md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1)
     155                        md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
     156                        md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    157157
    158158                return md

  • issm/trunk-jpl/src/py3/classes/linearbasalforcings.py

    r19895 r19898  
    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,'timeseries',1)
     71                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',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);
    … …  
    7575
    7676                if BalancethicknessAnalysisEnum() in analyses:
    77                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
     77                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    7878                        md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0);
    7979                        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,'timeseries',1)
     83                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',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,'timeseries',1,'>=',0)
     87                        md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0)
    8888
    8989                return md

  • issm/trunk-jpl/src/py3/classes/m1qn3inversion.py

    r19895 r19898  
    145145                md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0,1])
    146146                md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',supportedcontrols())
    147                 md = checkfield(md,'fieldname','inversion.control_scaling_factors','size',[num_controls],'>',0,'NaN',1)
     147                md = checkfield(md,'fieldname','inversion.control_scaling_factors','size',[num_controls],'>',0,'NaN',1,'Inf',1)
    148148                md = checkfield(md,'fieldname','inversion.maxsteps','numel',[1],'>=',0)
    149149                md = checkfield(md,'fieldname','inversion.maxiter','numel',[1],'>=',0)
    … …  
    156156
    157157                if solution==BalancethicknessSolutionEnum():
    158                         md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1)
     158                        md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    159159                else:
    160                         md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1)
    161                         md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1)
     160                        md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
     161                        md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
    162162
    163163                return md

  • issm/trunk-jpl/src/py3/classes/matice.py

    r19895 r19898  
    123123                md = checkfield(md,'fieldname','materials.rho_freshwater','>',0)
    124124                md = checkfield(md,'fieldname','materials.mu_water','>',0)
    125                 md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1)
     125                md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1,'Inf',1)
    126126                md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements])
    127127                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','Paterson','Arrhenius','LliboutryDuval'])

  • issm/trunk-jpl/src/py3/classes/mesh2d.py

    r19895 r19898  
    8484        def checkconsistency(self,md,solution,analyses):    # {{{
    8585
    86                 md = checkfield(md,'fieldname','mesh.x','NaN',1,'size',[md.mesh.numberofvertices])
    87                 md = checkfield(md,'fieldname','mesh.y','NaN',1,'size',[md.mesh.numberofvertices])
    88                 md = checkfield(md,'fieldname','mesh.elements','NaN',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
     86                md = checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     87                md = checkfield(md,'fieldname','mesh.y','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     88                md = checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
    8989                md = checkfield(md,'fieldname','mesh.elements','size',[md.mesh.numberofelements,3])
    9090#               if numpy.any(numpy.logical_not(m.ismember(numpy.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))):

  • issm/trunk-jpl/src/py3/classes/mesh3dprisms.py

    r19895 r19898  
    106106        def checkconsistency(self,md,solution,analyses):    # {{{
    107107
    108                 md = checkfield(md,'fieldname','mesh.x','NaN',1,'size',[md.mesh.numberofvertices])
    109                 md = checkfield(md,'fieldname','mesh.y','NaN',1,'size',[md.mesh.numberofvertices])
    110                 md = checkfield(md,'fieldname','mesh.z','NaN',1,'size',[md.mesh.numberofvertices])
    111                 md = checkfield(md,'fieldname','mesh.elements','NaN',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
     108                md = checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     109                md = checkfield(md,'fieldname','mesh.y','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     110                md = checkfield(md,'fieldname','mesh.z','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
     111                md = checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
    112112                md = checkfield(md,'fieldname','mesh.elements','size',[md.mesh.numberofelements,6])
    113113                if numpy.any(numpy.logical_not(m.ismember(numpy.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))):

  • issm/trunk-jpl/src/py3/classes/mismipbasalforcings.py

    r19895 r19898  
    5858        if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and md.transient.ismasstransport==0):
    5959
    60             md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
     60            md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
    6161            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
    6262            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
    … …  
    6565        if BalancethicknessAnalysisEnum() in analyses:
    6666
    67             md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
     67            md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
    6868            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
    6969            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
    … …  
    7272        if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and md.transient.isthermal==0):
    7373
    74             md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
     74            md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
    7575            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
    7676            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
    7777            md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',[1])
    78             md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0)
     78            md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0)
    7979        return md
    8080    # }}}

  • issm/trunk-jpl/src/py3/classes/stressbalance.py

    r19895 r19898  
    141141                md = checkfield(md,'fieldname','stressbalance.abstol','size',[1])
    142142                md = checkfield(md,'fieldname','stressbalance.isnewton','numel',[1],'values',[0,1,2])
    143                 md = checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1],'NaN',1)
    144                 md = checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1],'NaN',1)
     143                md = checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1],'NaN',1,'Inf',1)
     144                md = checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1],'NaN',1,'Inf',1)
    145145                md = checkfield(md,'fieldname','stressbalance.maxiter','size',[1],'>=',1)
    146146                md = checkfield(md,'fieldname','stressbalance.referential','size',[md.mesh.numberofvertices,6])

  • issm/trunk-jpl/src/py3/classes/taoinversion.py

    r19895 r19898  
    156156
    157157                if solution==BalancethicknessSolutionEnum():
    158                         md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1)
     158                        md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1)
    159159                elif solution==BalancethicknessSoftSolutionEnum():
    160                         md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1)
     160                        md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1)
    161161                else:
    162                         md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices, 1],'NaN',1)
    163                         md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices, 1],'NaN',1)
     162                        md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1)
     163                        md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1)
    164164
    165165                def marshall(self, md, fid):

  • issm/trunk-jpl/src/py3/classes/timestepping.py

    r19895 r19898  
    5353        def checkconsistency(self,md,solution,analyses):    # {{{
    5454
    55                 md = checkfield(md,'fieldname','timestepping.start_time','numel',[1],'NaN',1)
    56                 md = checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1)
    57                 md = checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1)
     55                md = checkfield(md,'fieldname','timestepping.start_time','numel',[1],'NaN',1,'Inf',1)
     56                md = checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1,'Inf',1)
     57                md = checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1,'Inf',1)
    5858                md = checkfield(md,'fieldname','timestepping.time_adapt','numel',[1],'values',[0,1])
    5959                md = checkfield(md,'fieldname','timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1)
Note: See TracChangeset for help on using the changeset viewer.