Changeset 25836 for issm/trunk/src/m/classes/matdamageice.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/matdamageice.m (modified) (1 diff)

issm/trunk/src/m/classes/matdamageice.m ¶

@@ -120 +120 @@
                         md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'BuddJacka' 'Cuffey' 'CuffeyTemperate' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
                         md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0 1 2]);
-            
+                        
                         if ismember('GiaAnalysis',analyses),
                                 md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',1);