Changeset 21377

Timestamp:

11/15/16 15:44:01 (8 years ago)

Author:

felicity

Message:

NEW:added BuddJacka flow parameter

Location:

issm/trunk-jpl/src

Files:

• c/analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• c/analyses/ThermalAnalysis.cpp (modified) (1 diff)
• m/classes/matestar.m (modified) (2 diffs)
• m/classes/matice.m (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -1497 +1497 @@
                                 /*Do nothing: B is not temperature dependent*/
                                 break;
+                        case BuddJackaEnum:
+                                for(i=0;i<numnodes;i++) B[i]=BuddJacka(temperature[i]);
+                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
+                                break;
                         case CuffeyEnum:
                                 for(i=0;i<numnodes;i++) B[i]=Cuffey(temperature[i]);

issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

@@ -768 +768 @@
                                 /*Do nothing: B is not temperature dependent*/
                                 break;
+                        case BuddJackaEnum:
+                                for(i=0;i<numnodes;i++) B[i]=BuddJacka(values[i]);
+                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
+                                break;
                         case CuffeyEnum:
                                 for(i=0;i<numnodes;i++) B[i]=Cuffey(values[i]);

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

@@ -124 +124 @@
                         md = checkfield(md,'fieldname','materials.rheology_Ec','>',0,'size',[md.mesh.numberofvertices 1],'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','materials.rheology_Es','>',0,'size',[md.mesh.numberofvertices 1],'NaN',1,'Inf',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),
@@ -155 +155 @@
                         fielddisplay(self,'rheology_Ec','compressive enhancement factor');
                         fielddisplay(self,'rheology_Es','shear enhancement factor');
-                        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/matice.m

@@ -114 +114 @@
                         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 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),
@@ -144 +144 @@
                         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]');