Changeset 11368

Timestamp:

02/08/12 15:42:50 (13 years ago)

Author:

cborstad

Message:

model setup for new damage effect variable Z

Location:

issm/trunk-jpl-damage/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/EnumDefinitions/EnumToModelField.cpp (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• m/classes/materials.m (modified) (5 diffs)
• m/classes/model/model.m (modified) (1 diff)
• m/enum/EnumToModelField.m (modified) (1 diff)
• m/enum/MaterialsRheologyZEnum.m (added)
• m/enum/MaterialsRheologyZbarEnum.m (added)
• m/enum/PentaP1ElementResultEnum.m (added)
• m/enum/PentaP1InputEnum.m (added)
• m/enum/TriaP1ElementResultEnum.m (added)
• m/enum/TriaP1InputEnum.m (added)
• m/model/collapse.m (modified) (1 diff)
• m/model/extrude.m (modified) (1 diff)
• m/model/mechanicalproperties.m (modified) (2 diffs)

issm/trunk-jpl-damage/src/c/EnumDefinitions/EnumDefinitions.h

@@ -99 +99 @@
         MaterialsRheologyLawEnum,
         MaterialsRheologyNEnum,
+        MaterialsRheologyZEnum,
+        MaterialsRheologyZbarEnum,
         MaterialsRhoIceEnum,
         MaterialsRhoWaterEnum,

issm/trunk-jpl-damage/src/c/EnumDefinitions/EnumToModelField.cpp

@@ -17 +17 @@
                 case MaterialsRheologyBEnum : return "rheology_B";
                 case MaterialsRheologyBbarEnum : return "rheology_B";
+                case MaterialsRheologyZEnum : return "rheology_Z";
+                case MaterialsRheologyZbarEnum : return "rheology_Z";
                 case BalancethicknessThickeningRateEnum: return "dhdt";
                 case VxEnum : return "vx";

issm/trunk-jpl-damage/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -103 +103 @@
                 case MaterialsRheologyLawEnum : return "MaterialsRheologyLaw";
                 case MaterialsRheologyNEnum : return "MaterialsRheologyN";
+                case MaterialsRheologyZEnum : return "MaterialsRheologyZ";
+                case MaterialsRheologyZbarEnum : return "MaterialsRheologyZbar";
                 case MaterialsRhoIceEnum : return "MaterialsRhoIce";
                 case MaterialsRhoWaterEnum : return "MaterialsRhoWater";

issm/trunk-jpl-damage/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -101 +101 @@
         else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
         else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
+        else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum;
+        else if (strcmp(name,"MaterialsRheologyZbar")==0) return MaterialsRheologyZbarEnum;
         else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
         else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;

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

@@ -17 +17 @@
                 thermal_exchange_velocity  = 0;
                 rheology_B   = NaN;
+                rheology_Z   = NaN;
                 rheology_n   = NaN;
                 rheology_law = '';
@@ -68 +69 @@
                         obj.thermal_exchange_velocity=1.00*10^-4;
 
+                        %damage effect variable is 1 by default (no damage mechanics)
+                        obj.rheology_Z=1;
+
                         %Rheology law: what is the temperature dependence of B with T
                         %available: none, paterson and arrhenius
@@ -77 +81 @@
                         checkfield(md,'materials.mu_water','>',0);
                         checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]);
+                        checkfield(md,'materials.rheology_Z','>',0,'size',[md.mesh.numberofvertices 1]);
                         checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]);
                         checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius'});
@@ -94 +99 @@
                         fielddisplay(obj,'thermal_exchange_velocity','thermal exchange velocity [m/s]');
                         fielddisplay(obj,'rheology_B','flow law parameter [Pa/s^(1/n)]');
+                        fielddisplay(obj,'rheology_Z','dimensionless damage effect variable, equal to (1-D), Z=1 turns damage mechanics off');
                         fielddisplay(obj,'rheology_n','Glen''s flow law exponent');
                         fielddisplay(obj,'rheology_law','law for the temperature dependance of the rheology: ''None'', ''Paterson'' or ''Arrhenius''');
@@ -109 +115 @@
                         WriteData(fid,'object',obj,'fieldname','thermal_exchange_velocity','format','Double');
                         WriteData(fid,'object',obj,'fieldname','rheology_B','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','rheology_Z','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','rheology_n','format','DoubleMat','mattype',2);
                         WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum,'format','Integer');

issm/trunk-jpl-damage/src/m/classes/model/model.m

@@ -192 +192 @@
                          if isfield(structmd,'B'), md.materials.rheology_B=structmd.B; end
                          if isfield(structmd,'n'), md.materials.rheology_n=structmd.n; end
+                         if isfield(structmd,'Z'), md.materials.rheology_Z=structmd.Z; end
                          if isfield(structmd,'rheology_B'), md.materials.rheology_B=structmd.rheology_B; end
                          if isfield(structmd,'rheology_n'), md.materials.rheology_n=structmd.rheology_n; end
+                         if isfield(structmd,'rheology_Z'), md.materials.rheology_Z=structmd.rheology_Z; end
                          if isfield(structmd,'elementoniceshelf'), md.mask.elementonfloatingice=structmd.elementoniceshelf; end
                          if isfield(structmd,'elementonicesheet'), md.mask.elementongroundedice=structmd.elementonicesheet; end

issm/trunk-jpl-damage/src/m/enum/EnumToModelField.m

@@ -15 +15 @@
                 case MaterialsRheologyBEnum(), string='rheology_B'; return
                 case MaterialsRheologyBbarEnum(), string='rheology_B'; return
+                case MaterialsRheologyZEnum(), string='rheology_Z'; return
+                case MaterialsRheologyZbarEnum(), string='rheology_Z'; return
                 case BalancethicknessThickeningRateEnum: string='dhdt'; return
                 case VxEnum(), string='vx'; return

issm/trunk-jpl-damage/src/m/model/collapse.m

@@ -66 +66 @@
 %materials
 md.materials.rheology_B=DepthAverage(md,md.materials.rheology_B);
+md.materials.rheology_Z=DepthAverage(md,md.materials.rheology_Z);
 md.materials.rheology_n=project2d(md,md.materials.rheology_n,1);
 

issm/trunk-jpl-damage/src/m/model/extrude.m

@@ -200 +200 @@
 %materials
 md.materials.rheology_B=project3d(md,'vector',md.materials.rheology_B,'type','node');
+md.materials.rheology_Z=project3d(md,'vector',md.materials.rheology_Z,'type','node');
 md.materials.rheology_n=project3d(md,'vector',md.materials.rheology_n,'type','element');
 

issm/trunk-jpl-damage/src/m/model/mechanicalproperties.m

@@ -1 +1 @@
 function md=mechanicalproperties(md,vx,vy)
-%MECHANICALPROPERTIES - compute stress and strain rate for a goven velocity
+%MECHANICALPROPERTIES - compute stress and strain rate for a given velocity
 %
 %   this routine computes the components of the stress tensor
@@ -48 +48 @@
 %compute viscosity
 nu=zeros(numberofelements,1);
-B_bar=md.materials.rheology_B(index)*summation/3;
+B_bar=md.materials.rheology_Z(index).*md.materials.rheology_B(index)*summation/3;
 power=(md.materials.rheology_n-1)./(2*md.materials.rheology_n);
 second_inv=(ux.^2+vy.^2+((uy+vx).^2)/4+ux.*vy);