Changeset 21378

Timestamp:

11/15/16 16:38:47 (8 years ago)

Author:

felicity

Message:

NEW:added BuddJacka flow parameter

Location:

issm/trunk-jpl/src/m/classes

Files:

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

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

@@ -114 +114 @@
                         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' 'Cuffey' 'CuffeyTemperate' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
+                        md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'BuddJacka' 'Cuffey' 'CuffeyTemperate' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
 
                         if ismember('GiaAnalysis',analyses),
@@ -145 +145 @@
                         fielddisplay(self,'rheology_B','flow law parameter [Pa/s^(1/n)]');
                         fielddisplay(self,'rheology_n','Glen''s flow law exponent');
-                        fielddisplay(self,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''Cuffey'', ''CuffeyTemperate'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);
+                        fielddisplay(self,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''BuddJacka'', ''Cuffey'', ''CuffeyTemperate'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);
                         fielddisplay(self,'lithosphere_shear_modulus','Lithosphere shear modulus [Pa]');
                         fielddisplay(self,'lithosphere_density','Lithosphere density [g/cm^-3]');

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

@@ -58 +58 @@
                 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', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))
+                string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', '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]"))
@@ -133 +133 @@
                 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','Cuffey', 'CuffeyTemperate', 'Paterson','Arrhenius','LliboutryDuval'])
+                md = checkfield(md,'fieldname','materials.rheology_law','values',['None', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson','Arrhenius','LliboutryDuval'])
                 md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',[1]);
                 md = checkfield(md,'fieldname','materials.lithosphere_density','>',0,'numel',[1]);

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

@@ -76 +76 @@
                         fielddisplay(this,'rheology_B','flow law parameter [Pa/s^(1/n)]');
                         fielddisplay(this,'rheology_n',"Glen's flow law exponent");
-                        fielddisplay(this,'rheology_law',"law for the temperature dependance of the rheology: 'None', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'");
+                        fielddisplay(this,'rheology_law',"law for the temperature dependance of the rheology: 'None', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'");
                         fielddisplay(this,'lithosphere_shear_modulus','Lithosphere shear modulus [Pa]');
                         fielddisplay(this,'lithosphere_density','Lithosphere density [g/cm^-3]');
@@ -99 +99 @@
                         checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1,'Inf',1);
                         checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements,1]);
-                        checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval']);
+                        checkfield(md,'fieldname','materials.rheology_law','values',['None','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval']);
 
                         if(ArrayAnyEqual(ArrayIsMember('GiaAnalysis',analyses),1)){

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

@@ -59 +59 @@
                 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', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))
+                string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', '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]"))
@@ -134 +134 @@
                 md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1,'Inf',1)
                 md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements])
-                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval'])
+                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval'])
                 md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',[1]);
                 md = checkfield(md,'fieldname','materials.lithosphere_density','>',0,'numel',[1]);