Changeset 21743
- Timestamp:
- 05/24/17 01:57:53 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/friction.m
r21739 r21743 9 9 p = NaN; 10 10 q = NaN; 11 coupling = 0; %Silje12 effective_pressure = NaN; %Silje11 coupling = 0; 12 effective_pressure = NaN; 13 13 end 14 14 methods … … 47 47 md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]); 48 48 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]); %Silje49 md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0 1 2]); 50 50 switch self.coupling 51 51 case 0 … … 63 63 fielddisplay(self,'p','p exponent'); 64 64 fielddisplay(self,'q','q exponent'); 65 fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]'); %Silje66 fielddisplay(self,'coupling','Coupling flag: 0 for default, 1 for forcing(provide md.friction.effective_pressure) and 2 for coupled(not implemented yet)'); %Silje65 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)'); 67 67 end % }}} 68 68 function marshall(self,prefix,md,fid) % {{{ … … 73 73 WriteData(fid,prefix,'object',self,'fieldname','p','format','DoubleMat','mattype',2); 74 74 WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2); 75 WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer'); %Silje75 WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer'); 76 76 switch self.coupling 77 77 case 0 … … 89 89 writejs1Darray(fid,[modelname '.friction.p'],self.p); 90 90 writejs1Darray(fid,[modelname '.friction.q'],self.q); 91 writejs1Darray(fid,[modelname '.friction.coupling'],self.coupling); %Silje92 writejs1Darray(fid,[modelname '.friction.effective_pressure'],self.effective_pressure); %Silje91 writejs1Darray(fid,[modelname '.friction.coupling'],self.coupling); 92 writejs1Darray(fid,[modelname '.friction.effective_pressure'],self.effective_pressure); 93 93 94 94 end % }}}
Note:
See TracChangeset
for help on using the changeset viewer.