Changeset 23005

Timestamp:

07/25/18 11:29:45 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing wrong unit for rheology_B

Location:

issm/trunk-jpl/src/m/classes

Files:

• matdamageice.m (modified) (1 diff)
• matdamageice.py (modified) (1 diff)
• matenhancedice.m (modified) (1 diff)
• matenhancedice.py (modified) (1 diff)
• materials.m (modified) (1 diff)
• materials.py (modified) (1 diff)
• matestar.m (modified) (1 diff)
• matestar.py (modified) (1 diff)
• matice.js (modified) (1 diff)
• matice.m (modified) (1 diff)
• matice.py (modified) (1 diff)

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

@@ -143 +143 @@
                         fielddisplay(self,'mixed_layer_capacity','mixed layer capacity [W/kg/K]');
                         fielddisplay(self,'thermal_exchange_velocity','thermal exchange velocity [m/s]');
-                        fielddisplay(self,'rheology_B','flow law parameter [Pa/s^(1/n)]');
+                        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'', ''BuddJacka'', ''Cuffey'', ''CuffeyTemperate'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);

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

@@ -56 +56 @@
                 string="%s\n%s"%(string,fielddisplay(self,"mixed_layer_capacity","mixed layer capacity [W/kg/K]"))
                 string="%s\n%s"%(string,fielddisplay(self,"thermal_exchange_velocity","thermal exchange velocity [m/s]"))
-                string="%s\n%s"%(string,fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]"))
+                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', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))

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

@@ -146 +146 @@
                         fielddisplay(self,'thermal_exchange_velocity','thermal exchange velocity [m/s]');
                         fielddisplay(self,'rheology_E','enhancement factor');
-                        fielddisplay(self,'rheology_B','flow law parameter [Pa/s^(1/n)]');
+                        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'', ''BuddJacka'', Cuffey'', ''CuffeyTemperate'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);

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

@@ -57 +57 @@
                 string="%s\n%s"%(string,fielddisplay(self,"thermal_exchange_velocity","thermal exchange velocity [m/s]"))
                 string="%s\n%s"%(string,fielddisplay(self,"rheology_E","enhancement factor"))
-                string="%s\n%s"%(string,fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]"))
+                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', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))

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

@@ -151 +151 @@
                                         fielddisplay(self,'mixed_layer_capacity','mixed layer capacity [W/kg/K]');
                                         fielddisplay(self,'thermal_exchange_velocity','thermal exchange velocity [m/s]');
-                                        fielddisplay(self,'rheology_B','flow law parameter [Pa/s^(1/n)]');
+                                        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'', ''BuddJacka'', Cuffey'', ''CuffeyTemperate'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);

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

@@ -99 +99 @@
                         string="%s\n%s"%(string,fielddisplay(self,"mixed_layer_capacity","mixed layer capacity [W/kg/K]"))
                         string="%s\n%s"%(string,fielddisplay(self,"thermal_exchange_velocity","thermal exchange velocity [m/s]"))
-                        string="%s\n%s"%(string,fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]"))
+                        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', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))

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

@@ -152 +152 @@
                         fielddisplay(self,'mixed_layer_capacity','mixed layer capacity [W/kg/K]');
                         fielddisplay(self,'thermal_exchange_velocity','thermal exchange velocity [m/s]');
-                        fielddisplay(self,'rheology_B','flow law parameter [Pa/s^(1/3)]');
+                        fielddisplay(self,'rheology_B','flow law parameter [Pa s^(1/3)]');
                         fielddisplay(self,'rheology_Ec','compressive enhancement factor');
                         fielddisplay(self,'rheology_Es','shear enhancement factor');

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

@@ -59 +59 @@
                 string="%s\n%s"%(string,fielddisplay(self,'mixed_layer_capacity','mixed layer capacity [W/kg/K]'))
                 string="%s\n%s"%(string,fielddisplay(self,'thermal_exchange_velocity','thermal exchange velocity [m/s]'))
-                string="%s\n%s"%(string,fielddisplay(self,'rheology_B','flow law parameter [Pa/s^(1/3)]'))
+                string="%s\n%s"%(string,fielddisplay(self,'rheology_B','flow law parameter [Pa s^(1/3)]'))
                 string="%s\n%s"%(string,fielddisplay(self,'rheology_Ec','compressive enhancement factor'))
                 string="%s\n%s"%(string,fielddisplay(self,'rheology_Es','shear enhancement factor'))

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

@@ -74 +74 @@
                 fielddisplay(this,'mixed_layer_capacity','mixed layer capacity [W/kg/K]');
                 fielddisplay(this,'thermal_exchange_velocity','thermal exchange velocity [m/s]');
-                fielddisplay(this,'rheology_B','flow law parameter [Pa/s^(1/n)]');
+                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', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'");

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

@@ -142 +142 @@
                         fielddisplay(self,'mixed_layer_capacity','mixed layer capacity [W/kg/K]');
                         fielddisplay(self,'thermal_exchange_velocity','thermal exchange velocity [m/s]');
-                        fielddisplay(self,'rheology_B','flow law parameter [Pa/s^(1/n)]');
+                        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'', ''BuddJacka'', Cuffey'', ''CuffeyTemperate'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);

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

@@ -57 +57 @@
                 string="%s\n%s"%(string,fielddisplay(self,"mixed_layer_capacity","mixed layer capacity [W/kg/K]"))
                 string="%s\n%s"%(string,fielddisplay(self,"thermal_exchange_velocity","thermal exchange velocity [m/s]"))
-                string="%s\n%s"%(string,fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]"))
+                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', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))