Changeset 21743


Ignore:
Timestamp:
05/24/17 01:57:53 (8 years ago)
Author:
sjohnsen
Message:

CHG: removed comments

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/classes/friction.m

    r21739 r21743  
    99                p           = NaN;
    1010                q           = NaN;
    11                 coupling    = 0;        %Silje
    12                 effective_pressure = NaN;       %Silje
     11                coupling    = 0;
     12                effective_pressure = NaN;
    1313        end
    1414        methods
     
    4747                        md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
    4848                        md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
    49                         md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0 1 2]);%Silje
     49                        md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0 1 2]);
    5050                        switch self.coupling
    5151                                case 0
     
    6363                        fielddisplay(self,'p','p exponent');
    6464                        fielddisplay(self,'q','q exponent');
    65                         fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]');%Silje
    66                         fielddisplay(self,'coupling','Coupling flag: 0 for default, 1 for forcing(provide md.friction.effective_pressure)  and 2 for coupled(not implemented yet)');%Silje
     65                        fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]');
     66                        fielddisplay(self,'coupling','Coupling flag: 0 for default, 1 for forcing(provide md.friction.effective_pressure)  and 2 for coupled(not implemented yet)');
    6767                end % }}}
    6868                function marshall(self,prefix,md,fid) % {{{
     
    7373                        WriteData(fid,prefix,'object',self,'fieldname','p','format','DoubleMat','mattype',2);
    7474                        WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2);
    75                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer'); %Silje
     75                        WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer');
    7676                        switch self.coupling
    7777                                case 0
     
    8989                        writejs1Darray(fid,[modelname '.friction.p'],self.p);
    9090                        writejs1Darray(fid,[modelname '.friction.q'],self.q);
    91                         writejs1Darray(fid,[modelname '.friction.coupling'],self.coupling);%Silje
    92                         writejs1Darray(fid,[modelname '.friction.effective_pressure'],self.effective_pressure);%Silje
     91                        writejs1Darray(fid,[modelname '.friction.coupling'],self.coupling);
     92                        writejs1Darray(fid,[modelname '.friction.effective_pressure'],self.effective_pressure);
    9393
    9494                end % }}}
Note: See TracChangeset for help on using the changeset viewer.