Changeset 24092

Timestamp:

07/15/19 16:40:10 (6 years ago)

Author:

schlegel

Message:

CHG: minor error in nye check for temp out of range

Location:

issm/trunk-jpl/src/m

Files:

• classes/materials.py (modified) (2 diffs)
• classes/matice.js (modified) (2 diffs)
• classes/matice.py (modified) (2 diffs)
• materials/nye.m (modified) (1 diff)

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

@@ -101 +101 @@
                                 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'"))
+                                string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius', 'LliboutryDuval', 'NyeCO2', or 'NyeH2O'"))
                         elif nat=='litho':
                                 string="%s\n%s"%(string,'Litho:');
@@ -192 +192 @@
                                 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','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval'])
+                                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval','NyeCO2','NyeH2O'])
 
                         elif nat=='litho':

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', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'");
+                fielddisplay(this,'rheology_law',"law for the temperature dependance of the rheology: 'None', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius','LliboutryDuval','NyeH2O', or 'NyeCO2'");
                 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','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval']);
+                checkfield(md,'fieldname','materials.rheology_law','values',['None','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval','NyeH2O','NyeCO2']);
 
                 if(ArrayAnyEqual(ArrayIsMember('GiaAnalysis',analyses),1)){

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

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

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

@@ -8 +8 @@
 %   Usage:
 %      rigidity=nye(temperature,ice_type) % ice_type = 1: CO2 ice // ice_type = 2: H2O ice
-        if ((ice_type == 2) && (any(temperature > 195)))
+        if ((ice_type == 1) && (any(temperature > 195)))
                 error('Input temperature for CO2 ice out of bounds (T>195)');
         elseif ((ice_type == 2) && (any(temperature > 273.15)))