Changeset 20622

Timestamp:

05/18/16 17:33:49 (9 years ago)

Author:

jbondzio

Message:

NEW: Cuffey rheology extended to temperate ice regions

Location:

issm/trunk-jpl/src

Files:

• c/analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• c/shared/Elements/CuffeyTemperate.cpp (added)
• c/shared/Elements/elements.h (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/matdamageice.m (modified) (2 diffs)
• m/classes/matdamageice.py (modified) (2 diffs)
• m/classes/matice.js (modified) (2 diffs)
• m/classes/matice.m (modified) (2 diffs)
• m/classes/matice.py (modified) (2 diffs)
• m/enum/CuffeyTemperateEnum.m (added)
• m/enum/EnumDefinitions.js (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/materials/cuffeytemperate.m (added)
• m/materials/cuffeytemperate.py (added)

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

@@ -1493 +1493 @@
                                 element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
                                 break;
+                        case CuffeyTemperateEnum:
+                                for(i=0;i<numnodes;i++) B[i]=CuffeyTemperate(temperature[i], waterfraction[i]);
+                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
+                                break;
                         case PatersonEnum:
                                 for(i=0;i<numnodes;i++) B[i]=Paterson(temperature[i]);

issm/trunk-jpl/src/c/shared/Elements/elements.h

@@ -9 +9 @@
 
 IssmDouble Cuffey(IssmDouble temperature);
+IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction);
 IssmDouble Paterson(IssmDouble temperature);
 IssmDouble Arrhenius(IssmDouble temperature,IssmDouble depth,IssmDouble n);

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -1037 +1037 @@
         /*Rheology law (move to Material) {{{*/
         CuffeyEnum,
+        CuffeyTemperateEnum,
         PatersonEnum,
         ArrheniusEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -993 +993 @@
                 case OptionStructEnum : return "OptionStruct";
                 case CuffeyEnum : return "Cuffey";
+                case CuffeyTemperateEnum : return "CuffeyTemperate";
                 case PatersonEnum : return "Paterson";
                 case ArrheniusEnum : return "Arrhenius";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -1017 +1017 @@
               else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
               else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
+              else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;
               else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;

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' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
+                        md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'Cuffey' 'CuffeyTemperate' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
 
                         if ismember(GiaAnalysisEnum(),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'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);
+                        fielddisplay(self,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''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

@@ -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', 'Cuffey', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))
+                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,"lithosphere_shear_modulus","Lithosphere shear modulus [Pa]"))
                 string="%s\n%s"%(string,fielddisplay(self,"lithosphere_density","Lithosphere density [g/cm^-3]"))
@@ -135 +135 @@
                 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','Paterson','Arrhenius','LliboutryDuval'])
+                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','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', 'Paterson', 'Arrhenius' or 'LliboutryDuval'");
+                        fielddisplay(this,'rheology_law',"law for the temperature dependance of the rheology: 'None', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius' or 'LliboutryDuval'");
                         fielddisplay(this,'lithosphere_shear_modulus','Lithosphere shear modulus [Pa]');
                         fielddisplay(this,'lithosphere_density','Lithosphere density [g/cm^-3]');
@@ -94 +94 @@
                         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','Paterson','Arrhenius','LliboutryDuval']);
+                        checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval']);
 
                         if(ArrayAnyEqual(ArrayIsMember(GiaAnalysisEnum(),analyses),1)){

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' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
+                        md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'Cuffey' 'CuffeyTemperate' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
 
                         if ismember(GiaAnalysisEnum(),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'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);
+                        fielddisplay(self,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''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.py

@@ -61 +61 @@
                 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', 'Paterson', 'Arrhenius' or 'LliboutryDuval'"))
+                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,"lithosphere_shear_modulus","Lithosphere shear modulus [Pa]"))
                 string="%s\n%s"%(string,fielddisplay(self,"lithosphere_density","Lithosphere density [g/cm^-3]"))
@@ -136 +136 @@
                 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','Paterson','Arrhenius','LliboutryDuval'])
+                md = checkfield(md,'fieldname','materials.rheology_law','values',['None','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/enum/EnumDefinitions.js

@@ -978 +978 @@
 function OptionStructEnum(){ return 974;}
 function CuffeyEnum(){ return 975;}
-function PatersonEnum(){ return 976;}
-function ArrheniusEnum(){ return 977;}
-function LliboutryDuvalEnum(){ return 978;}
-function SpclevelsetEnum(){ return 979;}
-function ExtrapolationVariableEnum(){ return 980;}
-function IceMaskNodeActivationEnum(){ return 981;}
-function LevelsetfunctionSlopeXEnum(){ return 982;}
-function LevelsetfunctionSlopeYEnum(){ return 983;}
-function LevelsetfunctionPicardEnum(){ return 984;}
-function LevelsetReinitFrequencyEnum(){ return 985;}
-function SealevelriseSolutionEnum(){ return 986;}
-function SealevelriseAnalysisEnum(){ return 987;}
-function SealevelEnum(){ return 988;}
-function SealevelEustaticEnum(){ return 989;}
-function SealevelriseDeltathicknessEnum(){ return 990;}
-function SealevelriseMaxiterEnum(){ return 991;}
-function SealevelriseReltolEnum(){ return 992;}
-function SealevelriseAbstolEnum(){ return 993;}
-function SealevelriseLoveHEnum(){ return 994;}
-function SealevelriseLoveKEnum(){ return 995;}
-function SealevelriseTideLoveHEnum(){ return 996;}
-function SealevelriseTideLoveKEnum(){ return 997;}
-function SealevelriseRigidEnum(){ return 998;}
-function SealevelriseElasticEnum(){ return 999;}
-function SealevelriseRotationEnum(){ return 1000;}
-function SealevelriseGElasticEnum(){ return 1001;}
-function SealevelriseDegaccEnum(){ return 1002;}
-function SealevelriseTransitionsEnum(){ return 1003;}
-function SealevelriseRequestedOutputsEnum(){ return 1004;}
-function SealevelriseNumRequestedOutputsEnum(){ return 1005;}
-function MaximumNumberOfDefinitionsEnum(){ return 1006;}
+function CuffeyTemperateEnum(){ return 976;}
+function PatersonEnum(){ return 977;}
+function ArrheniusEnum(){ return 978;}
+function LliboutryDuvalEnum(){ return 979;}
+function SpclevelsetEnum(){ return 980;}
+function ExtrapolationVariableEnum(){ return 981;}
+function IceMaskNodeActivationEnum(){ return 982;}
+function LevelsetfunctionSlopeXEnum(){ return 983;}
+function LevelsetfunctionSlopeYEnum(){ return 984;}
+function LevelsetfunctionPicardEnum(){ return 985;}
+function LevelsetReinitFrequencyEnum(){ return 986;}
+function SealevelriseSolutionEnum(){ return 987;}
+function SealevelriseAnalysisEnum(){ return 988;}
+function SealevelEnum(){ return 989;}
+function SealevelEustaticEnum(){ return 990;}
+function SealevelriseDeltathicknessEnum(){ return 991;}
+function SealevelriseMaxiterEnum(){ return 992;}
+function SealevelriseReltolEnum(){ return 993;}
+function SealevelriseAbstolEnum(){ return 994;}
+function SealevelriseLoveHEnum(){ return 995;}
+function SealevelriseLoveKEnum(){ return 996;}
+function SealevelriseTideLoveHEnum(){ return 997;}
+function SealevelriseTideLoveKEnum(){ return 998;}
+function SealevelriseRigidEnum(){ return 999;}
+function SealevelriseElasticEnum(){ return 1000;}
+function SealevelriseRotationEnum(){ return 1001;}
+function SealevelriseGElasticEnum(){ return 1002;}
+function SealevelriseDegaccEnum(){ return 1003;}
+function SealevelriseTransitionsEnum(){ return 1004;}
+function SealevelriseRequestedOutputsEnum(){ return 1005;}
+function SealevelriseNumRequestedOutputsEnum(){ return 1006;}
+function MaximumNumberOfDefinitionsEnum(){ return 1007;}

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -985 +985 @@
 def OptionStructEnum(): return StringToEnum("OptionStruct")[0]
 def CuffeyEnum(): return StringToEnum("Cuffey")[0]
+def CuffeyTemperateEnum(): return StringToEnum("CuffeyTemperate")[0]
 def PatersonEnum(): return StringToEnum("Paterson")[0]
 def ArrheniusEnum(): return StringToEnum("Arrhenius")[0]