Changeset 16148

Timestamp:

09/17/13 13:23:47 (12 years ago)

Author:

Eric.Larour

Message:

CHG: changed field rheology_D to damage_D.

Location:

issm/trunk-jpl

Files:

• src/c/classes/Elements/Tria.cpp (modified) (13 diffs)
• src/c/classes/Materials/Matdamageice.cpp (modified) (9 diffs)
• src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp (modified) (1 diff)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• src/m/classes/inversion.m (modified) (1 diff)
• src/m/classes/inversion.py (modified) (1 diff)
• src/m/classes/matdamageice.m (modified) (4 diffs)
• src/m/classes/matdamageice.py (modified) (4 diffs)
• src/m/enum/EnumDefinitions.py (modified) (1 diff)
• src/m/enum/MaterialsDamageDEnum.m (added)
• src/m/enum/MaterialsDamageDbarEnum.m (added)
• src/m/enum/MaterialsRheologyDEnum.m (deleted)
• src/m/enum/MaterialsRheologyDbarEnum.m (deleted)
• test/NightlyRun/test270.m (modified) (1 diff)
• test/NightlyRun/test272.m (modified) (3 diffs)
• test/NightlyRun/test274.m (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -1451 +1451 @@
 
         /*Go through all the input objects, and find the one corresponding to enum_type, if it exists: */
-        if (enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyDbarEnum)
+        if (enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsDamageDbarEnum)
          input=this->material->inputs->GetInput(enum_type);
         else
@@ -1567 +1567 @@
                                         break;
                                 case MaterialsRheologyBbarEnum:
-                                case MaterialsRheologyDbarEnum:
+                                case MaterialsDamageDbarEnum:
                                         /*Material will take care of it*/ break;
                                 default:
@@ -1781 +1781 @@
                 }
                 /*update input*/
-                if (name==MaterialsRheologyBbarEnum || name==MaterialsRheologyBEnum || name==MaterialsRheologyDEnum || name==MaterialsRheologyDbarEnum){
+                if (name==MaterialsRheologyBbarEnum || name==MaterialsRheologyBEnum || name==MaterialsDamageDEnum || name==MaterialsDamageDbarEnum){
                         material->inputs->AddInput(new TriaInput(name,values,P1Enum));
                 }
@@ -1794 +1794 @@
                 }
                 /*update input*/
-                if (name==MaterialsRheologyBbarEnum || name==MaterialsRheologyBEnum || name==MaterialsRheologyDEnum || name==MaterialsRheologyDbarEnum){
+                if (name==MaterialsRheologyBbarEnum || name==MaterialsRheologyBEnum || name==MaterialsDamageDEnum || name==MaterialsDamageDbarEnum){
                         material->inputs->AddInput(new TriaInput(name,values,P1Enum));
                 }
@@ -1962 +1962 @@
                                 name==FrictionCoefficientEnum ||
                                 name==MaterialsRheologyBbarEnum ||
-                                name==MaterialsRheologyDbarEnum ||
+                                name==MaterialsDamageDbarEnum ||
                                 name==GradientEnum ||
                                 name==OldGradientEnum ||
@@ -3730 +3730 @@
         for(int i=0;i<num_controls;i++){
 
-                if(control_type[i]==MaterialsRheologyBbarEnum || control_type[i]==MaterialsRheologyDbarEnum){
+                if(control_type[i]==MaterialsRheologyBbarEnum || control_type[i]==MaterialsDamageDbarEnum){
                         input=(Input*)material->inputs->GetInput(control_type[i]); _assert_(input);
                 }
@@ -3757 +3757 @@
         Input* input=NULL;
 
-        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyDbarEnum){
+        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsDamageDbarEnum){
                 input=(Input*)material->inputs->GetInput(enum_type);
         }
@@ -3775 +3775 @@
         Input* input=NULL;
 
-        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyDbarEnum){
+        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsDamageDbarEnum){
                 input=(Input*)material->inputs->GetInput(enum_type);
         }
@@ -3794 +3794 @@
         Input* input=NULL;
 
-        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyDbarEnum){
+        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsDamageDbarEnum){
                 input=(Input*)material->inputs->GetInput(enum_type);
         }
@@ -3825 +3825 @@
                         GradjBSSA(gradient,control_index);
                         break;
-                case MaterialsRheologyDbarEnum:
+                case MaterialsDamageDbarEnum:
                         GradjDSSA(gradient,control_index);
                         break;
@@ -3999 +3999 @@
         Input* adjointx_input=inputs->GetInput(AdjointxEnum);                       _assert_(adjointx_input);
         Input* adjointy_input=inputs->GetInput(AdjointyEnum);                       _assert_(adjointy_input);
-        Input* rheologyd_input=material->inputs->GetInput(MaterialsRheologyDbarEnum); _assert_(rheologyd_input);
+        Input* rheologyd_input=material->inputs->GetInput(MaterialsDamageDbarEnum); _assert_(rheologyd_input);
 
         /* Start  looping on the number of gaussian points: */
@@ -5379 +5379 @@
 
         /*Get input (either in element or material)*/
-        if(control_enum==MaterialsRheologyBbarEnum || control_enum==MaterialsRheologyDbarEnum){
+        if(control_enum==MaterialsRheologyBbarEnum || control_enum==MaterialsDamageDbarEnum){
                 input=(Input*)material->inputs->GetInput(control_enum); _assert_(input);
         }
@@ -5414 +5414 @@
         new_input = new TriaInput(control_enum,values,P1Enum);
 
-        if(control_enum==MaterialsRheologyBbarEnum || control_enum==MaterialsRheologyDbarEnum){
+        if(control_enum==MaterialsRheologyBbarEnum || control_enum==MaterialsDamageDbarEnum){
                 input=(Input*)material->inputs->GetInput(control_enum); _assert_(input);
         }

issm/trunk-jpl/src/c/classes/Materials/Matdamageice.cpp

@@ -167 +167 @@
         IssmDouble D;
 
-        inputs->GetInputAverage(&D,MaterialsRheologyDEnum);
+        inputs->GetInputAverage(&D,MaterialsDamageDEnum);
         return D;
 }
@@ -177 +177 @@
         IssmDouble D;
 
-        inputs->GetInputAverage(&D,MaterialsRheologyDEnum);
+        inputs->GetInputAverage(&D,MaterialsDamageDEnum);
         return 1/(1-D);
 }
@@ -186 +186 @@
         /*Output*/
         IssmDouble Dbar;
-        inputs->GetInputAverage(&Dbar,MaterialsRheologyDbarEnum);
+        inputs->GetInputAverage(&Dbar,MaterialsDamageDbarEnum);
         return 1/(1-Dbar);
 }
@@ -195 +195 @@
         /*Output*/
         IssmDouble Dbar;
-        inputs->GetInputAverage(&Dbar,MaterialsRheologyDbarEnum);
+        inputs->GetInputAverage(&Dbar,MaterialsDamageDbarEnum);
         return Dbar;
 }
@@ -798 +798 @@
 
                 /*Get D*/
-                if (iomodel->Data(MaterialsRheologyDEnum)) {
-                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(MaterialsRheologyDEnum)[iomodel->elements[num_vertices*index+i]-1];
-                        this->inputs->AddInput(new TriaInput(MaterialsRheologyDbarEnum,nodeinputs,P1Enum));
+                if (iomodel->Data(MaterialsDamageDEnum)) {
+                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(MaterialsDamageDEnum)[iomodel->elements[num_vertices*index+i]-1];
+                        this->inputs->AddInput(new TriaInput(MaterialsDamageDbarEnum,nodeinputs,P1Enum));
                 }
 
@@ -817 +817 @@
                                                 }
                                                 break;
-                                        case MaterialsRheologyDbarEnum:
-                                                if (iomodel->Data(MaterialsRheologyDEnum)){
-                                                        _assert_(iomodel->Data(MaterialsRheologyDEnum));_assert_(iomodel->Data(InversionMinParametersEnum)); _assert_(iomodel->Data(InversionMaxParametersEnum)); 
-                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->Data(MaterialsRheologyDEnum)[iomodel->elements[num_vertices*index+j]-1];
+                                        case MaterialsDamageDbarEnum:
+                                                if (iomodel->Data(MaterialsDamageDEnum)){
+                                                        _assert_(iomodel->Data(MaterialsDamageDEnum));_assert_(iomodel->Data(InversionMinParametersEnum)); _assert_(iomodel->Data(InversionMaxParametersEnum)); 
+                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->Data(MaterialsDamageDEnum)[iomodel->elements[num_vertices*index+j]-1];
                                                         for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i];
                                                         for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i];
-                                                        this->inputs->AddInput(new ControlInput(MaterialsRheologyDbarEnum,TriaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1));
+                                                        this->inputs->AddInput(new ControlInput(MaterialsDamageDbarEnum,TriaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1));
                                                 }
                                                 break;
@@ -856 +856 @@
 
                 /*Get D*/
-                if (iomodel->Data(MaterialsRheologyDEnum)) {
-                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(MaterialsRheologyDEnum)[iomodel->elements[num_vertices*index+i]-1];
-                        this->inputs->AddInput(new PentaInput(MaterialsRheologyDEnum,nodeinputs,P1Enum));
+                if (iomodel->Data(MaterialsDamageDEnum)) {
+                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(MaterialsDamageDEnum)[iomodel->elements[num_vertices*index+i]-1];
+                        this->inputs->AddInput(new PentaInput(MaterialsDamageDEnum,nodeinputs,P1Enum));
                 }
 
@@ -875 +875 @@
                                                 }
                                                 break;
-                                        case MaterialsRheologyDbarEnum:
-                                                if (iomodel->Data(MaterialsRheologyDEnum)){
-                                                        _assert_(iomodel->Data(MaterialsRheologyDEnum));_assert_(iomodel->Data(InversionMinParametersEnum)); _assert_(iomodel->Data(InversionMaxParametersEnum)); 
-                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->Data(MaterialsRheologyDEnum)[iomodel->elements[num_vertices*index+j]-1];
+                                        case MaterialsDamageDbarEnum:
+                                                if (iomodel->Data(MaterialsDamageDEnum)){
+                                                        _assert_(iomodel->Data(MaterialsDamageDEnum));_assert_(iomodel->Data(InversionMinParametersEnum)); _assert_(iomodel->Data(InversionMaxParametersEnum)); 
+                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->Data(MaterialsDamageDEnum)[iomodel->elements[num_vertices*index+j]-1];
                                                         for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i];
                                                         for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(iomodel->elements[num_vertices*index+j]-1)*num_control_type+i];
-                                                        this->inputs->AddInput(new ControlInput(MaterialsRheologyDEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1));
+                                                        this->inputs->AddInput(new ControlInput(MaterialsDamageDEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1));
                                                 }
                                                 break;
@@ -903 +903 @@
                                 name==MaterialsRheologyBbarEnum ||
                                 name==MaterialsRheologyNEnum ||
-                                name==MaterialsRheologyDEnum ||
-                                name==MaterialsRheologyDbarEnum
+                                name==MaterialsDamageDEnum ||
+                                name==MaterialsDamageDbarEnum
                 ){
                 return true;

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

@@ -40 +40 @@
                         case FrictionCoefficientEnum:   iomodel->FetchData(1,FrictionCoefficientEnum); break;
                         case MaterialsRheologyBbarEnum: iomodel->FetchData(1,MaterialsRheologyBEnum); break;
-                        case MaterialsRheologyDbarEnum: iomodel->FetchData(1,MaterialsRheologyDEnum); break;
+                        case MaterialsDamageDbarEnum: iomodel->FetchData(1,MaterialsDamageDEnum); break;
                         default: _error_("Control " << EnumToStringx(reCast<int,IssmDouble>(iomodel->Data(InversionControlParametersEnum)[i])) << " not implemented yet");
                 }
@@ -59 +59 @@
 
         /*Free data: */
-        iomodel->DeleteData(4+7,InversionControlParametersEnum,InversionCostFunctionsCoefficientsEnum,InversionMinParametersEnum,InversionMaxParametersEnum,BalancethicknessThickeningRateEnum,VxEnum,VyEnum,ThicknessEnum,FrictionCoefficientEnum,MaterialsRheologyBEnum,MaterialsRheologyDEnum);
+        iomodel->DeleteData(4+7,InversionControlParametersEnum,InversionCostFunctionsCoefficientsEnum,InversionMinParametersEnum,InversionMaxParametersEnum,BalancethicknessThickeningRateEnum,VxEnum,VyEnum,ThicknessEnum,FrictionCoefficientEnum,MaterialsRheologyBEnum,MaterialsDamageDEnum);
 }

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

@@ -64 +64 @@
                         break;
                 case MatdamageiceEnum:
-                        iomodel->FetchData(3,MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsRheologyDEnum);
+                        iomodel->FetchData(3,MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsDamageDEnum);
                         for (i=0;i<iomodel->numberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matdamageice(i+1,i,iomodel));
                         break;
@@ -73 +73 @@
         /*Free data: */
         iomodel->DeleteData(8,MeshUpperelementsEnum,MeshLowerelementsEnum,
-                                MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsRheologyDEnum,InversionControlParametersEnum,InversionMinParametersEnum,
+                                MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsDamageDEnum,InversionControlParametersEnum,InversionMinParametersEnum,
                                 InversionMaxParametersEnum);
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp

@@ -102 +102 @@
         iomodel->FetchDataToInput(elements,LoadingforceYEnum);
         if(materials_type==MatdamageiceEnum){
-                iomodel->FetchDataToInput(elements,MaterialsRheologyDEnum);
+                iomodel->FetchDataToInput(elements,MaterialsDamageDEnum);
         }
         if(iomodel->dim==3){

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

@@ -154 +154 @@
         MaterialsRheologyZEnum,
         MaterialsRheologyZbarEnum,
-        MaterialsRheologyDEnum,
-        MaterialsRheologyDbarEnum,
+        MaterialsDamageDEnum,
+        MaterialsDamageDbarEnum,
         MaterialsRhoIceEnum,
         MaterialsRhoWaterEnum,

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

@@ -162 +162 @@
                 case MaterialsRheologyZEnum : return "MaterialsRheologyZ";
                 case MaterialsRheologyZbarEnum : return "MaterialsRheologyZbar";
-                case MaterialsRheologyDEnum : return "MaterialsRheologyD";
-                case MaterialsRheologyDbarEnum : return "MaterialsRheologyDbar";
+                case MaterialsDamageDEnum : return "MaterialsDamageD";
+                case MaterialsDamageDbarEnum : return "MaterialsDamageDbar";
                 case MaterialsRhoIceEnum : return "MaterialsRhoIce";
                 case MaterialsRhoWaterEnum : return "MaterialsRhoWater";

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

@@ -165 +165 @@
               else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum;
               else if (strcmp(name,"MaterialsRheologyZbar")==0) return MaterialsRheologyZbarEnum;
-              else if (strcmp(name,"MaterialsRheologyD")==0) return MaterialsRheologyDEnum;
-              else if (strcmp(name,"MaterialsRheologyDbar")==0) return MaterialsRheologyDbarEnum;
+              else if (strcmp(name,"MaterialsDamageD")==0) return MaterialsDamageDEnum;
+              else if (strcmp(name,"MaterialsDamageDbar")==0) return MaterialsDamageDbarEnum;
               else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
               else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;

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

@@ -116 +116 @@
                         md = checkfield(md,'inversion.incomplete_adjoint','values',[0 1]);
                         md = checkfield(md,'inversion.control_parameters','cell',1,'values',...
-                                {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'MaterialsRheologyDbar' 'Vx' 'Vy' 'Thickness'});
+                                {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'MaterialsDamageDbar' 'Vx' 'Vy' 'Thickness'});
                         md = checkfield(md,'inversion.nsteps','numel',1,'>=',1);
                         md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);

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

@@ -124 +124 @@
                 md = checkfield(md,'inversion.tao','values',[0,1])
                 md = checkfield(md,'inversion.incomplete_adjoint','values',[0,1])
-                md = checkfield(md,'inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','MaterialsRheologyDbar','Vx','Vy'])
+                md = checkfield(md,'inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','MaterialsDamageDbar','Vx','Vy'])
                 md = checkfield(md,'inversion.nsteps','numel',[1],'>=',1)
                 md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps],'>=',0)

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

@@ -19 +19 @@
                 rheology_B   = NaN;
                 rheology_n   = NaN;
-                rheology_D   = NaN;
+                damage_D = NaN;
+                %damage_D
+                %damage_stress_threshold
+                %damage_c1
+                %damage_c2
+                %damage_c3
+                %damage_c4
+
                 rheology_law = '';
 
@@ -101 +108 @@
                         md = checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]);
-                        md = checkfield(md,'materials.rheology_D','>',0,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'materials.damage_D','>',0,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
 
@@ -128 +135 @@
                         fielddisplay(obj,'rheology_B','flow law parameter [Pa/s^(1/n)]');
                         fielddisplay(obj,'rheology_n','Glen''s flow law exponent');
-                        fielddisplay(obj,'rheology_D','damage tensor (scalar)');
+                        fielddisplay(obj,'damage_D','damage tensor (scalar)');
                         fielddisplay(obj,'rheology_law',['law for the temperature dependance of the rheology: ''None'', ''Paterson'', ''Arrhenius'' or ''LliboutryDuval''']);
                         fielddisplay(obj,'lithosphere_shear_modulus','Lithosphere shear modulus [Pa]');
@@ -151 +158 @@
                         WriteData(fid,'object',obj,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
-                        WriteData(fid,'object',obj,'class','materials','fieldname','rheology_D','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'class','materials','fieldname','damage_D','format','DoubleMat','mattype',1);
                         WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer');
 

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

@@ -27 +27 @@
                 self.rheology_B   = float('NaN')
                 self.rheology_n   = float('NaN')
-                self.rheology_D   = float('NaN')
+                self.damage_D   = float('NaN')
                 self.rheology_law = ''
 
@@ -58 +58 @@
                 s+="%s\n" % fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]")
                 s+="%s\n" % fielddisplay(self,"rheology_n","Glen's flow law exponent")
-                s+="%s\n" % fielddisplay(self,"rheology_D","damage tensor (scalar for now)")
+                s+="%s\n" % fielddisplay(self,"damage_D","damage tensor (scalar for now)")
                 s+="%s\n" % fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Paterson', 'Arrhenius' or 'LliboutryDuval'")
                 s+="%s\n" % fielddisplay(self,"lithosphere_shear_modulus","Lithosphere shear modulus [Pa]")
@@ -119 +119 @@
                 md = checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices])
                 md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements])
-                md = checkfield(md,'materials.rheology_D','>',0,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'materials.damage_D','>',0,'size',[md.mesh.numberofvertices])
                 md = checkfield(md,'materials.rheology_law','values',['None','Paterson','Arrhenius','LliboutryDuval'])
                 md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',[1]);
@@ -143 +143 @@
                 WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2)
-                WriteData(fid,'object',self,'class','materials','fieldname','rheology_D','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'class','materials','fieldname','damage_D','format','DoubleMat','mattype',1)
                 WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer')
 

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

@@ -154 +154 @@
 def MaterialsRheologyZEnum(): return StringToEnum("MaterialsRheologyZ")[0]
 def MaterialsRheologyZbarEnum(): return StringToEnum("MaterialsRheologyZbar")[0]
-def MaterialsRheologyDEnum(): return StringToEnum("MaterialsRheologyD")[0]
-def MaterialsRheologyDbarEnum(): return StringToEnum("MaterialsRheologyDbar")[0]
+def MaterialsDamageDEnum(): return StringToEnum("MaterialsDamageD")[0]
+def MaterialsDamageDbarEnum(): return StringToEnum("MaterialsDamageDbar")[0]
 def MaterialsRhoIceEnum(): return StringToEnum("MaterialsRhoIce")[0]
 def MaterialsRhoWaterEnum(): return StringToEnum("MaterialsRhoWater")[0]

issm/trunk-jpl/test/NightlyRun/test270.m

@@ -5 +5 @@
 md.materials.rheology_B=paterson(md.initialization.temperature);
 md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
-md.materials.rheology_D=0.5*ones(md.mesh.numberofvertices,1);
+md.materials.damage_D=0.5*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);

issm/trunk-jpl/test/NightlyRun/test272.m

@@ -5 +5 @@
 md.materials.rheology_B=paterson(md.initialization.temperature);
 md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
-md.materials.rheology_D=0.5*ones(md.mesh.numberofvertices,1);
+md.materials.damage_D=0.5*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'SSA','all');
 md.verbose=verbose('control',true);
@@ -11 +11 @@
 %control parameters
 md.inversion.iscontrol=1;
-md.inversion.control_parameters={'MaterialsRheologyDbar'};
+md.inversion.control_parameters={'MaterialsDamageDbar'};
 md.inversion.min_parameters=zeros(md.mesh.numberofvertices,1);
 md.inversion.max_parameters=(1-10^-13)*ones(md.mesh.numberofvertices,1);
@@ -27 +27 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient','Misfits','MaterialsRheologyDbar','Pressure','Vel','Vx','Vy'};
+field_names     ={'Gradient','Misfits','MaterialsDamageDbar','Pressure','Vel','Vx','Vy'};
 field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
 field_values={...
    (md.results.StressbalanceSolution.Gradient1),...
    (md.results.StressbalanceSolution.J),...
-   (md.results.StressbalanceSolution.MaterialsRheologyDbar),...
+   (md.results.StressbalanceSolution.MaterialsDamageDbar),...
    (md.results.StressbalanceSolution.Pressure),...
    (md.results.StressbalanceSolution.Vel),...

issm/trunk-jpl/test/NightlyRun/test274.m

@@ -6 +6 @@
 md.materials.rheology_B=paterson(md.initialization.temperature);
 md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
-md.materials.rheology_D=0.5*ones(md.mesh.numberofvertices,1);
+md.materials.damage_D=0.5*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'SSA','all');