Changeset 17456

Timestamp:

03/18/14 09:26:10 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added cuffey rigidity parameter

Location:

issm/trunk-jpl/src/m/classes

Files:

• matice.m (modified) (2 diffs)
• matice.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/matice.m

@@ -104 +104 @@
                         md = checkfield(md,'fieldname','materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]);
-                        md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
+                        md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'Cuffey' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
 
                         if ismember(GiaAnalysisEnum(),analyses),
@@ -131 +131 @@
                         fielddisplay(obj,'rheology_B','flow law parameter [Pa/s^(1/n)]');
                         fielddisplay(obj,'rheology_n','Glen''s flow law exponent');
-                        fielddisplay(obj,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''Paterson'',  ''Arrhenius'' or ''LliboutryDuval''']);
+                        fielddisplay(obj,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''Cuffey'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);
                         fielddisplay(obj,'lithosphere_shear_modulus','Lithosphere shear modulus [Pa]');
                         fielddisplay(obj,'lithosphere_density','Lithosphere density [g/cm^-3]');

issm/trunk-jpl/src/m/classes/matice.py

@@ -55 +55 @@
                 string="%s\n%s"%(string,fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]"))
                 string="%s\n%s"%(string,fielddisplay(self,"rheology_n","Glen's flow law exponent"))
-                string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))
+                string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Cuffey', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))
                 string="%s\n%s"%(string,fielddisplay(self,"lithosphere_shear_modulus","Lithosphere shear modulus [Pa]"))
                 string="%s\n%s"%(string,fielddisplay(self,"lithosphere_density","Lithosphere density [g/cm^-3]"))
@@ -119 +119 @@
                 md = checkfield(md,'fieldname','materials.rheology_B','>',0,'size',[md.mesh.numberofvertices])
                 md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements])
-                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Paterson','Arrhenius','LliboutryDuval'])
+                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','Paterson','Arrhenius','LliboutryDuval'])
                 md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',[1]);
                 md = checkfield(md,'fieldname','materials.lithosphere_density','>',0,'numel',[1]);