Changeset 20460


Ignore:
Timestamp:
04/07/16 13:21:07 (9 years ago)
Author:
jbondzio
Message:

ADD: adding levelset class to model, in which options for levelset method can be stored. The class 'calving' now contains fields specific to the calving law used.

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

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r20459 r20460  
    10491049        LevelsetfunctionSlopeYEnum,
    10501050        LevelsetfunctionPicardEnum,
     1051        LevelsetReinitFrequencyEnum,
    10511052        /*}}}*/
    10521053        /*Sea Level Rise{{{*/
  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r20459 r20460  
    10031003                case LevelsetfunctionSlopeYEnum : return "LevelsetfunctionSlopeY";
    10041004                case LevelsetfunctionPicardEnum : return "LevelsetfunctionPicard";
     1005                case LevelsetReinitFrequencyEnum : return "LevelsetReinitFrequency";
    10051006                case SealevelriseSolutionEnum : return "SealevelriseSolution";
    10061007                case SealevelriseAnalysisEnum : return "SealevelriseAnalysis";
  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r20459 r20460  
    10271027              else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    10281028              else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
     1029              else if (strcmp(name,"LevelsetReinitFrequency")==0) return LevelsetReinitFrequencyEnum;
    10291030              else if (strcmp(name,"SealevelriseSolution")==0) return SealevelriseSolutionEnum;
    10301031              else if (strcmp(name,"SealevelriseAnalysis")==0) return SealevelriseAnalysisEnum;
  • issm/trunk-jpl/src/m/classes/calving.js

    r20452 r20460  
    88        this.setdefaultparameters = function(){// {{{
    99
    10                 //stabilization = 2 by default
    11                 this.stabilization = 2;
    12        
    1310        }// }}}
    1411        this.disp= function(){// {{{
    1512
    1613                console.log(sprintf('   Calving parameters:'));
    17                 fielddisplay(this,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
    18                 fielddisplay(this,'spclevelset','Levelset constraints (NaN means no constraint)');
    1914                fielddisplay(this,'calvingrate','calving rate at given location [m/a]');
    2015                fielddisplay(this,'meltingrate','melting rate at given location [m/a]');
     
    2823                if (solution!=TransientSolutionEnum() | md.trans.ismovingfront==0) return;
    2924
    30                 checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1);
    31                 checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
    3225                checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
    3326                checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
     
    3629                        var yts=365.0*24.0*3600.0;
    3730                        WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
    38                         WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',this.stabilization,'format','Integer');
    39                         WriteData(fid,'enum',SpcLevelsetEnum(),'data',this.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    4031                        WriteData(fid,'object',this,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
    4132                        WriteData(fid,'object',this,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
    4233                }//}}}
    4334                this.fix=function() { //{{{
    44                         this.spclevelset=NullFix(this.spclevelset,NaN);
    4535                        this.calvingrate=NullFix(this.calvingrate,NaN);
    4636                        this.meltingrate=NullFix(this.meltingrate,NaN);
     
    4939        // {{{
    5040
    51         this.stabilization = 0;
    52         this.spclevelset   = NaN;
    5341        this.calvingrate   = NaN;
    5442        this.meltingrate   = NaN;
  • issm/trunk-jpl/src/m/classes/calving.m

    r20452 r20460  
    66classdef calving
    77        properties (SetAccess=public)
    8                 stabilization = 0;
    9                 spclevelset   = NaN;
    108                calvingrate   = NaN;
    119                meltingrate   = NaN;
     
    3129                end % }}}
    3230                function self = extrude(self,md) % {{{
    33                         self.spclevelset=project3d(md,'vector',self.spclevelset,'type','node');
    3431                        self.calvingrate=project3d(md,'vector',self.calvingrate,'type','node');
    3532                        self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node');
    3633                end % }}}
    3734                function self = setdefaultparameters(self) % {{{
    38 
    39                         %stabilization = 2 by default
    40                         self.stabilization = 2;
    4135
    4236                end % }}}
     
    4539                        if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end
    4640
    47                         md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1);
    48                         md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]);
    4941                        md = checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
    5042                        md = checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
     
    5244                function disp(self) % {{{
    5345                        disp(sprintf('   Calving parameters:'));
    54                         fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
    55                         fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)');
    5646                        fielddisplay(self,'calvingrate','calving rate at given location [m/a]');
    5747                        fielddisplay(self,'meltingrate','melting rate at given location [m/a]');
     
    6050                        yts=365.0*24.0*3600.0;
    6151                        WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
    62                         WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    63                         WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    6452                        WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
    6553                        WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
     
    6755                function savemodeljs(self,fid,modelname) % {{{
    6856               
    69                         writejsdouble(fid,[modelname '.calving.stabilization'],self.stabilization);
    70                         writejs1Darray(fid,[modelname '.calving.spclevelset'],self.spclevelset);
    7157                        writejs1Darray(fid,[modelname '.calving.calvingrate'],self.calvingrate);
    7258                        writejs1Darray(fid,[modelname '.calving.meltingrate'],self.meltingrate);
  • issm/trunk-jpl/src/m/classes/calving.py

    r20452 r20460  
    1616        def __init__(self): # {{{
    1717
    18                 self.stabilization = 0
    19                 self.spclevelset   = float('NaN')
    2018                self.calvingrate   = float('NaN')
    2119                self.meltingrate   = float('NaN')
     
    2725        def __repr__(self): # {{{
    2826                string='   Calving parameters:'
    29                 string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'))
    30                 string="%s\n%s"%(string,fielddisplay(self,'spclevelset','levelset constraints (NaN means no constraint)'))
    3127                string="%s\n%s"%(string,fielddisplay(self,'calvingrate','calving rate at given location [m/a]'))
    3228                string="%s\n%s"%(string,fielddisplay(self,'meltingrate','melting rate at given location [m/a]'))
     
    3531                #}}}
    3632        def extrude(self,md): # {{{
    37                 self.spclevelset=project3d(md,'vector',self.spclevelset,'type','node')
    3833                self.calvingrate=project3d(md,'vector',self.calvingrate,'type','node')
    3934                self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node')
     
    4136        #}}}
    4237        def setdefaultparameters(self): # {{{
    43 
    44                 #stabilization = 2 by default
    45                 self.stabilization = 2
    4638
    4739                return self
     
    5345                        return md
    5446
    55                 md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1)
    56                 md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
    5747                md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'timeseries',1,'NaN',1,'Inf',1);
    5848                md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'timeseries',1,'NaN',1,'Inf',1);
     
    6555
    6656                WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
    67                 WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    68                 WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    6957                WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
    7058                WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
  • issm/trunk-jpl/src/m/classes/calvingdev.m

    r20452 r20460  
    66classdef calvingdev
    77        properties (SetAccess=public)
    8                 stabilization = 0;
    9                 spclevelset   = NaN;
    108                coeff         = NaN;
    119                meltingrate   = NaN;
     
    3129                end % }}}
    3230                function self = extrude(self,md) % {{{
    33                         self.spclevelset=project3d(md,'vector',self.spclevelset,'type','node');
    3431                        self.coeff=project3d(md,'vector',self.coeff,'type','node');
    3532                        self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node');
    3633                end % }}}
    3734                function self = setdefaultparameters(self) % {{{
    38 
    39                         %stabilization = 2 by default
    40                         self.stabilization = 2;
    4135
    4236                        %Proportionality coefficient in Pi model
     
    4741                        if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end
    4842
    49                         md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1);
    50                         md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]);
    5143                        md = checkfield(md,'fieldname','calving.coeff','>',0,'size',[md.mesh.numberofvertices 1]);
    5244                        md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>=',0);
     
    5446                function disp(self) % {{{
    5547                        disp(sprintf('   Calving Pi parameters:'));
    56                         fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
    57                         fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)');
    5848                        fielddisplay(self,'coeff','proportionality coefficient in Pi model');
    5949                        fielddisplay(self,'meltingrate','melting rate at given location [m/a]');
     
    6353                        yts=365.0*24.0*3600.0;
    6454                        WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingDevEnum(),'format','Integer');
    65                         WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    66                         WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    6755                        WriteData(fid,'enum',CalvingpiCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1);
    6856                        WriteData(fid,'class','calving','object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
  • issm/trunk-jpl/src/m/classes/calvinglevermann.m

    r20452 r20460  
    66classdef calvinglevermann
    77        properties (SetAccess=public)
    8                 stabilization = 0;
    9                 spclevelset   = NaN;
    108                coeff         = NaN;
    119                meltingrate   = NaN;
     
    3129                end % }}}
    3230                function self = extrude(self,md) % {{{
    33                         self.spclevelset=project3d(md,'vector',self.spclevelset,'type','node');
    3431                        self.coeff=project3d(md,'vector',self.coeff,'type','node');
    3532                        self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node');
    3633                end % }}}
    3734                function self = setdefaultparameters(self) % {{{
    38 
    39                         %stabilization = 2 by default
    40                         self.stabilization = 2;
    4135
    4236                        %Proportionality coefficient in Levermann model
     
    4741                        if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end
    4842
    49                         md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1);
    50                         md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]);
    5143                        md = checkfield(md,'fieldname','calving.coeff','>',0,'size',[md.mesh.numberofvertices 1]);
    5244                        md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>=',0);
     
    5446                function disp(self) % {{{
    5547                        disp(sprintf('   Calving Levermann parameters:'));
    56                         fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
    57                         fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)');
    5848                        fielddisplay(self,'coeff','proportionality coefficient in Levermann model');
    5949                        fielddisplay(self,'meltingrate','melting rate at given location [m/a]');
     
    6353                        yts=365.0*24.0*3600.0;
    6454                        WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
    65                         WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    66                         WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    6755                        WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1);
    6856                        WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
  • issm/trunk-jpl/src/m/classes/calvinglevermann.py

    r20452 r20460  
    1515        def __init__(self): # {{{
    1616
    17                 self.stabilization = 0
    18                 self.spclevelset   = float('NaN')
    1917                self.coeff         = float('NaN')
    2018                self.meltingrate   = float('NaN')
     
    2624        def __repr__(self): # {{{
    2725                string='   Calving Levermann parameters:'
    28                 string="%s\n%s"%(string,fielddisplay(self,'spclevelset','levelset constraints (NaN means no constraint)'))
    29                 string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'))
    3026                string="%s\n%s"%(string,fielddisplay(self,'coeff','proportionality coefficient in Levermann model'))
    3127                string="%s\n%s"%(string,fielddisplay(self,'meltingrate','melting rate at given location [m/a]'))
     
    3430                #}}}
    3531        def extrude(self,md): # {{{
    36                 self.spclevelset=project3d(md,'vector',self.spclevelset,'type','node')
    3732                self.coeff=project3d(md,'vector',self.coeff,'type','node')
    3833                self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node')
     
    4035        #}}}
    4136        def setdefaultparameters(self): # {{{
    42 
    43                 #stabilization = 2 by default
    44                 self.stabilization = 2
    4537
    4638                #Proportionality coefficient in Levermann model
     
    5345                        return md
    5446
    55                 md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1)
    56                 md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
    5747                md = checkfield(md,'fieldname','calving.coeff','size',[md.mesh.numberofvertices],'>',0)
    5848                md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>=',0)
     
    6252                yts=365.*24.*3600.
    6353                WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
    64                 WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    65                 WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    6654                WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1)
    6755                WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
  • issm/trunk-jpl/src/m/classes/model.js

    r20181 r20460  
    3535                        console.log(sprintf("%19s: %-22s -- %s","steadystate"     ,"[1x1 " + typeof(this.steadystate) + "]","parameters for steadystate solution"));
    3636                        console.log(sprintf("%19s: %-22s -- %s","trans"       ,"[1x1 " + typeof(this.trans) + "]","parameters for trans solution"));
     37                        console.log(sprintf("%19s: %-22s -- %s","levelset"        ,"[1x1 " + typeof(this.levelset) + "]","parameters for moving boundaries (level-set method)"));
    3738                        console.log(sprintf("%19s: %-22s -- %s","calving"         ,"[1x1 " + typeof(this.calving) + "]","parameters for calving"));
    3839                        console.log(sprintf("%19s: %-22s -- %s","gia"             ,"[1x1 " + typeof(this.gia) + "]","parameters for gia solution"));
     
    7677                        this.steadystate      = new steadystate();
    7778                        this.trans            = new trans();
     79                        this.levelset                    = new levelset();
    7880                        this.calving          = new calving();
    7981                        this.gia              = new gia();
     
    142144                this.steadystate      = 0;
    143145                this.trans            = 0;
     146                this.levelset= 0;
    144147                this.calving          = 0;
    145148                this.gia              = 0;
  • issm/trunk-jpl/src/m/classes/model.m

    r20322 r20460  
    3838                steadystate      = 0;
    3939                transient        = 0;
     40                levelset                          = 0;
    4041                calving          = 0;
    4142                gia              = 0;
     
    127128                                md.slr=slr();
    128129                        end
     130
    129131                end% }}}
    130132        end
     
    752754                        md.thermal=md.thermal.extrude(md);
    753755                        md.masstransport=md.masstransport.extrude(md);
     756                        md.levelset=extrude(md.levelset,md);
    754757                        md.calving=extrude(md.calving,md);
    755758                        md.hydrology = extrude(md.hydrology,md);
     
    10871090                        md.steadystate      = steadystate();
    10881091                        md.transient        = transient();
     1092                        md.levelset                       = levelset();
    10891093                        md.calving          = calving();
    10901094                        md.gia              = gia();
     
    12581262                        disp(sprintf('%19s: %-22s -- %s','steadystate'     ,['[1x1 ' class(self.steadystate) ']'],'parameters for steadystate solution'));
    12591263                        disp(sprintf('%19s: %-22s -- %s','transient'       ,['[1x1 ' class(self.transient) ']'],'parameters for transient solution'));
     1264                        disp(sprintf('%19s: %-22s -- %s','levelset'         ,['[1x1 ' class(self.levelset) ']'],'parameters for moving boundaries (level-set method)'));
    12601265                        disp(sprintf('%19s: %-22s -- %s','calving'         ,['[1x1 ' class(self.calving) ']'],'parameters for calving'));
    12611266                        disp(sprintf('%19s: %-22s -- %s','gia'             ,['[1x1 ' class(self.gia) ']'],'parameters for gia solution'));
  • issm/trunk-jpl/src/m/classes/model.py

    r20302 r20460  
    1616from basalforcings import basalforcings
    1717from matice import matice
     18from levelset import levelset
    1819from calving import calving
    1920from calvinglevermann import calvinglevermann
     
    103104                self.steadystate      = steadystate()
    104105                self.transient        = transient()
     106                self.levelset         = levelset()
    105107                self.calving          = calving()
    106108                self.gia              = gia()
     
    146148                        'steadystate',\
    147149                        'transient',\
     150                        'levelset',\
    148151                        'calving',\
    149152                                                'gia',\
     
    187190                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("steadystate","[%s,%s]" % ("1x1",obj.steadystate.__class__.__name__),"parameters for steadystate solution"))
    188191                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("transient","[%s,%s]" % ("1x1",obj.transient.__class__.__name__),"parameters for transient solution"))
     192                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("levelset","[%s,%s]" % ("1x1",obj.levelset.__class__.__name__),"parameters for moving boundaries (level-set method)"))
    189193                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("calving","[%s,%s]" % ("1x1",obj.calving.__class__.__name__),"parameters for calving"))
    190194                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("autodiff","[%s,%s]" % ("1x1",obj.autodiff.__class__.__name__),"automatic differentiation parameters"))
     
    624628                # Calving variables
    625629                md.hydrology.extrude(md)
     630                md.levelset.extrude(md)
    626631                md.calving.extrude(md)
    627632
  • issm/trunk-jpl/src/m/enum/EnumDefinitions.js

    r20459 r20460  
    988988function LevelsetfunctionSlopeYEnum(){ return 984;}
    989989function LevelsetfunctionPicardEnum(){ return 985;}
    990 function SealevelriseSolutionEnum(){ return 986;}
    991 function SealevelriseAnalysisEnum(){ return 987;}
    992 function SealevelEnum(){ return 988;}
    993 function SealevelEustaticEnum(){ return 989;}
    994 function SealevelriseDeltathicknessEnum(){ return 990;}
    995 function SealevelriseMaxiterEnum(){ return 991;}
    996 function SealevelriseReltolEnum(){ return 992;}
    997 function SealevelriseAbstolEnum(){ return 993;}
    998 function SealevelriseLoveHEnum(){ return 994;}
    999 function SealevelriseLoveKEnum(){ return 995;}
    1000 function SealevelriseTideLoveHEnum(){ return 996;}
    1001 function SealevelriseTideLoveKEnum(){ return 997;}
    1002 function SealevelriseRigidEnum(){ return 998;}
    1003 function SealevelriseElasticEnum(){ return 999;}
    1004 function SealevelriseRotationEnum(){ return 1000;}
    1005 function SealevelriseGElasticEnum(){ return 1001;}
    1006 function SealevelriseDegaccEnum(){ return 1002;}
    1007 function SealevelriseTransitionsEnum(){ return 1003;}
    1008 function SealevelriseRequestedOutputsEnum(){ return 1004;}
    1009 function SealevelriseNumRequestedOutputsEnum(){ return 1005;}
    1010 function MaximumNumberOfDefinitionsEnum(){ return 1006;}
     990function LevelsetReinitFrequencyEnum(){ return 986;}
     991function SealevelriseSolutionEnum(){ return 987;}
     992function SealevelriseAnalysisEnum(){ return 988;}
     993function SealevelEnum(){ return 989;}
     994function SealevelEustaticEnum(){ return 990;}
     995function SealevelriseDeltathicknessEnum(){ return 991;}
     996function SealevelriseMaxiterEnum(){ return 992;}
     997function SealevelriseReltolEnum(){ return 993;}
     998function SealevelriseAbstolEnum(){ return 994;}
     999function SealevelriseLoveHEnum(){ return 995;}
     1000function SealevelriseLoveKEnum(){ return 996;}
     1001function SealevelriseTideLoveHEnum(){ return 997;}
     1002function SealevelriseTideLoveKEnum(){ return 998;}
     1003function SealevelriseRigidEnum(){ return 999;}
     1004function SealevelriseElasticEnum(){ return 1000;}
     1005function SealevelriseRotationEnum(){ return 1001;}
     1006function SealevelriseGElasticEnum(){ return 1002;}
     1007function SealevelriseDegaccEnum(){ return 1003;}
     1008function SealevelriseTransitionsEnum(){ return 1004;}
     1009function SealevelriseRequestedOutputsEnum(){ return 1005;}
     1010function SealevelriseNumRequestedOutputsEnum(){ return 1006;}
     1011function MaximumNumberOfDefinitionsEnum(){ return 1007;}
  • issm/trunk-jpl/src/m/enum/EnumDefinitions.py

    r20459 r20460  
    995995def LevelsetfunctionSlopeYEnum(): return StringToEnum("LevelsetfunctionSlopeY")[0]
    996996def LevelsetfunctionPicardEnum(): return StringToEnum("LevelsetfunctionPicard")[0]
     997def LevelsetReinitFrequencyEnum(): return StringToEnum("LevelsetReinitFrequency")[0]
    997998def SealevelriseSolutionEnum(): return StringToEnum("SealevelriseSolution")[0]
    998999def SealevelriseAnalysisEnum(): return StringToEnum("SealevelriseAnalysis")[0]
Note: See TracChangeset for help on using the changeset viewer.