Changeset 23701
- Timestamp:
- 02/06/19 08:03:09 (6 years ago)
- Location:
- issm/trunk-jpl/src/m/classes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/matdamageice.py
r23699 r23701 144 144 md = checkfield(md,'fieldname','materials.mantle_density','>',0,'numel',[1]); 145 145 md = checkfield(md,'fieldname','materials.earth_density','>',0,'numel',[1]); 146 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0 12])146 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0,1,2]) 147 147 148 148 return md -
issm/trunk-jpl/src/m/classes/matenhancedice.py
r23699 r23701 140 140 md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements]) 141 141 md = checkfield(md,'fieldname','materials.rheology_law','values',['None','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval']) 142 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0 12])142 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0,1,2]) 143 143 144 144 if 'GiaAnalysis' in analyses: -
issm/trunk-jpl/src/m/classes/matestar.py
r23699 r23701 143 143 md = checkfield(md,'fieldname','materials.rheology_Es','>',0,'size',[md.mesh.numberofvertices],'NaN',1,'Inf',1) 144 144 md = checkfield(md,'fieldname','materials.rheology_law','values',['None','BuddJacka', 'Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval']) 145 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0 12])145 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0,1,2]) 146 146 147 147 if 'GiaAnalysis' in analyses: -
issm/trunk-jpl/src/m/classes/matice.py
r23699 r23701 145 145 md = checkfield(md,'fieldname','materials.mantle_density','>',0,'numel',[1]); 146 146 md = checkfield(md,'fieldname','materials.earth_density','>',0,'numel',[1]); 147 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0 12])147 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0,1,2]) 148 148 149 149 return md
Note:
See TracChangeset
for help on using the changeset viewer.