Changeset 24292
- Timestamp:
- 10/30/19 09:01:20 (5 years ago)
- Location:
- issm/trunk-jpl/src/m/classes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/masstransport.m
r24192 r24292 5 5 6 6 classdef masstransport 7 properties (SetAccess=public) 7 properties (SetAccess=public) 8 8 spcthickness = NaN; 9 9 isfreesurface = 0; … … 95 95 md = checkfield(md,'fieldname','masstransport.min_thickness','>',0); 96 96 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1); 97 97 if ~any(isnan(md.stressbalance.vertex_pairing)), 98 md = checkfield(md,'fieldname','stressbalance.vertex_pairing','>',0); 99 end 98 100 end % }}} 99 101 function disp(self) % {{{ … … 122 124 WriteData(fid,prefix,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3); 123 125 WriteData(fid,prefix,'object',self,'fieldname','penalty_factor','format','Double'); 124 126 125 127 %process requested outputs 126 128 outputs = self.requested_outputs; … … 133 135 end % }}} 134 136 function savemodeljs(self,fid,modelname) % {{{ 135 137 136 138 writejs1Darray(fid,[modelname '.masstransport.spcthickness'],self.spcthickness); 137 139 writejsdouble(fid,[modelname '.masstransport.isfreesurface'],self.isfreesurface); -
issm/trunk-jpl/src/m/classes/masstransport.py
r24289 r24292 75 75 md = checkfield(md, 'fieldname', 'masstransport.min_thickness', '>', 0) 76 76 md = checkfield(md, 'fieldname', 'masstransport.requested_outputs', 'stringrow', 1) 77 if not np.any(np.isnan(self.vertex_pairing)) :78 md = checkfield(md, 'fieldname', ' masstransport.vertex_pairing', '>', 0)77 if not np.any(np.isnan(self.vertex_pairing)) and len(self.vertex_pairing) > 0: 78 md = checkfield(md, 'fieldname', 'stressbalance.vertex_pairing', '>', 0) 79 79 80 80 return md -
issm/trunk-jpl/src/m/classes/stressbalance.m
r22576 r24292 5 5 6 6 classdef stressbalance 7 properties (SetAccess=public) 7 properties (SetAccess=public) 8 8 spcvx = NaN; 9 9 spcvy = NaN; … … 57 57 58 58 %Convergence criterion: absolute, relative and residual 59 self.restol=10^-4; 59 self.restol=10^-4; 60 60 self.reltol=0.01; 61 61 self.abstol=10; … … 97 97 md = checkfield(md,'fieldname','stressbalance.loadingforce','size',[md.mesh.numberofvertices 3]); 98 98 md = checkfield(md,'fieldname','stressbalance.requested_outputs','stringrow',1); 99 99 if ~any(isnan(md.stressbalance.vertex_pairing)), 100 md = checkfield(md,'fieldname','stressbalance.vertex_pairing','>',0); 101 end 100 102 %singular solution 101 103 if ((~(any(~isnan(md.stressbalance.spcvx)) | any(~isnan(md.stressbalance.spcvy)))) & ~any(md.mask.groundedice_levelset>0)), … … 202 204 end % }}} 203 205 function savemodeljs(self,fid,modelname) % {{{ 204 206 205 207 writejs1Darray(fid,[modelname '.stressbalance.spcvx'],self.spcvx); 206 208 writejs1Darray(fid,[modelname '.stressbalance.spcvy'],self.spcvy); -
issm/trunk-jpl/src/m/classes/stressbalance.py
r24291 r24292 134 134 md = checkfield(md, 'fieldname', 'stressbalance.loadingforce', 'size', [md.mesh.numberofvertices, 3]) 135 135 md = checkfield(md, 'fieldname', 'stressbalance.requested_outputs', 'stringrow', 1) 136 if not np.any(np.isnan(self.vertex_pairing)) and len(self.vertex_pairing) >0:136 if not np.any(np.isnan(self.vertex_pairing)) and len(self.vertex_pairing) > 0: 137 137 md = checkfield(md, 'fieldname', 'stressbalance.vertex_pairing', '>', 0) 138 138 #singular solution
Note:
See TracChangeset
for help on using the changeset viewer.