Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 16156) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 16157) @@ -156,4 +156,10 @@ MaterialsDamageDEnum, MaterialsDamageDbarEnum, + MaterialsDamageLawEnum, + MaterialsDamageC1Enum, + MaterialsDamageC2Enum, + MaterialsDamageC3Enum, + MaterialsDamageC4Enum, + MaterialsDamageStressThresholdEnum, MaterialsRhoIceEnum, MaterialsRhoWaterEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 16156) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 16157) @@ -164,4 +164,10 @@ case MaterialsDamageDEnum : return "MaterialsDamageD"; case MaterialsDamageDbarEnum : return "MaterialsDamageDbar"; + case MaterialsDamageLawEnum : return "MaterialsDamageLaw"; + case MaterialsDamageC1Enum : return "MaterialsDamageC1"; + case MaterialsDamageC2Enum : return "MaterialsDamageC2"; + case MaterialsDamageC3Enum : return "MaterialsDamageC3"; + case MaterialsDamageC4Enum : return "MaterialsDamageC4"; + case MaterialsDamageStressThresholdEnum : return "MaterialsDamageStressThreshold"; case MaterialsRhoIceEnum : return "MaterialsRhoIce"; case MaterialsRhoWaterEnum : return "MaterialsRhoWater"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 16156) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 16157) @@ -167,4 +167,10 @@ else if (strcmp(name,"MaterialsDamageD")==0) return MaterialsDamageDEnum; else if (strcmp(name,"MaterialsDamageDbar")==0) return MaterialsDamageDbarEnum; + else if (strcmp(name,"MaterialsDamageLaw")==0) return MaterialsDamageLawEnum; + else if (strcmp(name,"MaterialsDamageC1")==0) return MaterialsDamageC1Enum; + else if (strcmp(name,"MaterialsDamageC2")==0) return MaterialsDamageC2Enum; + else if (strcmp(name,"MaterialsDamageC3")==0) return MaterialsDamageC3Enum; + else if (strcmp(name,"MaterialsDamageC4")==0) return MaterialsDamageC4Enum; + else if (strcmp(name,"MaterialsDamageStressThreshold")==0) return MaterialsDamageStressThresholdEnum; else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum; @@ -254,5 +260,8 @@ else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum; - else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; + else stage=3; + } + if(stage==3){ + if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum; @@ -260,8 +269,5 @@ else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum; else if (strcmp(name,"Thickness")==0) return ThicknessEnum; - else stage=3; - } - if(stage==3){ - if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; + else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; @@ -377,5 +383,8 @@ else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum; - else if (strcmp(name,"Param")==0) return ParamEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"Param")==0) return ParamEnum; else if (strcmp(name,"L1L2IceFront")==0) return L1L2IceFrontEnum; else if (strcmp(name,"HOIceFront")==0) return HOIceFrontEnum; @@ -383,8 +392,5 @@ else if (strcmp(name,"Penpair")==0) return PenpairEnum; else if (strcmp(name,"Penta")==0) return PentaEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"PentaInput")==0) return PentaInputEnum; + else if (strcmp(name,"PentaInput")==0) return PentaInputEnum; else if (strcmp(name,"Profiler")==0) return ProfilerEnum; else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum; @@ -500,5 +506,8 @@ else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; - else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum; else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; @@ -506,8 +515,5 @@ else if (strcmp(name,"P0")==0) return P0Enum; else if (strcmp(name,"P1")==0) return P1Enum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"P1DG")==0) return P1DGEnum; + else if (strcmp(name,"P1DG")==0) return P1DGEnum; else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; Index: /issm/trunk-jpl/src/m/classes/matdamageice.m =================================================================== --- /issm/trunk-jpl/src/m/classes/matdamageice.m (revision 16156) +++ /issm/trunk-jpl/src/m/classes/matdamageice.m (revision 16157) @@ -5,5 +5,6 @@ classdef matdamageice - properties (SetAccess=public) + properties (SetAccess=public) + % {{{ rho_ice = 0.; rho_water = 0.; @@ -17,15 +18,18 @@ mixed_layer_capacity = 0.; thermal_exchange_velocity = 0.; - rheology_B = NaN; - rheology_n = NaN; - damage_D = NaN; - %damage_D - %damage_stress_threshold - %damage_c1 - %damage_c2 - %damage_c3 - %damage_c4 - + rheology_B = NaN; + rheology_n = NaN; rheology_law = ''; + + %damage + damage_D = NaN; + damage_law = ''; + + %parameters for law 'initial': + damage_stress_threshold = NaN; + damage_c1 = NaN; + damage_c2 = NaN; + damage_c3 = NaN; + damage_c4 = NaN; %gia: @@ -35,5 +39,5 @@ mantle_density = 0.; - end + end % }}} methods function obj = matdamageice(varargin) % {{{ @@ -94,4 +98,12 @@ obj.rheology_law='Paterson'; + %damage parameters: + obj.damage_law='initial'; + obj.damage_stress_threshold=0; + obj.damage_c1=0; + obj.damage_c2=0; + obj.damage_c3=0; + obj.damage_c4=0; + %GIA: obj.lithosphere_shear_modulus = 6.7*10^10; % (Pa) @@ -108,6 +120,15 @@ 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_law','values',{'None' 'Paterson' 'Arrhenius' 'LliboutryDuval'}); + md = checkfield(md,'materials.damage_D','>',0,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius' 'LliboutryDuval'}); + md = checkfield(md,'materials.damage_law','values',{'initial'}); + if strcmpi(obj.damage_law,'initial'), + md = checkfield(md,'materials.damage_c1','>=',0); + md = checkfield(md,'materials.damage_c2','>=',0); + md = checkfield(md,'materials.damage_c3','>=',0); + md = checkfield(md,'materials.damage_c4','>=',0); + md = checkfield(md,'materials.damage_stress_threshold','>=',0); + end if ismember(GiaAnalysisEnum(),analyses), @@ -135,5 +156,4 @@ fielddisplay(obj,'rheology_B','flow law parameter [Pa/s^(1/n)]'); fielddisplay(obj,'rheology_n','Glen''s flow law exponent'); - 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]'); @@ -141,4 +161,13 @@ fielddisplay(obj,'mantle_shear_modulus','Mantle shear modulus [Pa]'); fielddisplay(obj,'mantle_density','Mantle density [g/cm^-3]'); + fielddisplay(obj,'damage_D','damage tensor (scalar)'); + fielddisplay(obj,'damage_law','damage law (string) from {''initial''}'); + if strcmpi(obj.damage_law), + fielddisplay(obj,'damage_c1','damage parameter 1'); + fielddisplay(obj,'damage_c2','damage parameter 2'); + fielddisplay(obj,'damage_c3','damage parameter 3'); + fielddisplay(obj,'damage_c4','damage parameter 4'); + fielddisplay(obj,'damage_stress_threshold','damage stress threshold [Pa]'); + end end % }}} @@ -158,5 +187,4 @@ 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','damage_D','format','DoubleMat','mattype',1); WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer'); @@ -165,4 +193,15 @@ WriteData(fid,'object',obj,'class','materials','fieldname','mantle_shear_modulus','format','Double'); WriteData(fid,'object',obj,'class','materials','fieldname','mantle_density','format','Double','scale',10^3); + + %damage: + WriteData(fid,'object',obj,'class','materials','fieldname','damage_D','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'class','materials','fieldname','damage_law','format','String'); + if strcmpi(obj.damage_law,'initial'), + WriteData(fid,'object',obj,'class','materials','fieldname','damage_c1','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','damage_c2','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','damage_c3','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','damage_c4','format','Double'); + WriteData(fid,'object',obj,'class','materials','fieldname','damage_stress_threshold','format','Double'); + end end % }}} Index: /issm/trunk-jpl/src/m/classes/matdamageice.py =================================================================== --- /issm/trunk-jpl/src/m/classes/matdamageice.py (revision 16156) +++ /issm/trunk-jpl/src/m/classes/matdamageice.py (revision 16157) @@ -27,6 +27,16 @@ self.rheology_B = float('NaN') self.rheology_n = float('NaN') + self.rheology_law = '' + + #damage: self.damage_D = float('NaN') - self.rheology_law = '' + self.damage_law = '' + + #parameters for law 'initial': + self.damage_c1 = float('NaN') + self.damage_c2 = float('NaN') + self.damage_c3 = float('NaN') + self.damage_c4 = float('NaN') + self.damage_stress_threshold = float('NaN') #gia: @@ -58,5 +68,4 @@ 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,"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]") @@ -64,4 +73,12 @@ s+="%s\n" % fielddisplay(self,"mantle_shear_modulus","Mantle shear modulus [Pa]") s+="%s\n" % fielddisplay(self,"mantle_density","Mantle density [g/cm^-3]") + s+="%s\n" % fielddisplay(self,"damage_D","damage tensor (scalar for now)") + + if (obj.damage_law=='initial'): + s+="%s\n" % fielddisplay(self,"damage_c1","damage parameter 1 ") + s+="%s\n" % fielddisplay(self,"damage_c2","damage parameter 2 ") + s+="%s\n" % fielddisplay(self,"damage_c3","damage parameter 3 ") + s+="%s\n" % fielddisplay(self,"damage_c4","damage parameter 4 ") + s+="%s\n" % fielddisplay(self,"damage_stress_threshold","damage stress threshold [Pa]") return s @@ -105,4 +122,12 @@ #available: none, paterson and arrhenius self.rheology_law='Paterson' + + #damage parameters: + self.damage_law='initial' + self.damage_stress_threshold=0 + self.damage_c1=0 + self.damage_c2=0 + self.damage_c3=0 + self.damage_c4=0 # GIA: @@ -119,5 +144,4 @@ 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.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]); @@ -125,4 +149,13 @@ md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',[1]); md = checkfield(md,'materials.mantle_density','>',0,'numel',[1]); + + md = checkfield(md,'materials.damage_D','>',0,'size',[md.mesh.numberofvertices]) + md = checkfield(md,'materials.damage_law','values',['initial']) + if self.damage_law == 'initial': + md = checkfield(md,'materials.damage_c1','>=',0) + md = checkfield(md,'materials.damage_c2','>=',0) + md = checkfield(md,'materials.damage_c3','>=',0) + md = checkfield(md,'materials.damage_c4','>=',0) + md = checkfield(md,'materials.damage_stress_threshold','>=',0) return md @@ -143,5 +176,4 @@ 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','damage_D','format','DoubleMat','mattype',1) WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer') @@ -150,3 +182,12 @@ WriteData(fid,'object',self,'class','materials','fieldname','mantle_shear_modulus','format','Double'); WriteData(fid,'object',self,'class','materials','fieldname','mantle_density','format','Double','scale',10.**3.); + + WriteData(fid,'object',self,'class','materials','fieldname','damage_D','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'class','materials','fieldname','damage_law','format','String') + if self.damage_law=='initial': + WriteData(fid,'object',self,'class','materials','fieldname','damage_c1','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','damage_c2','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','damage_c3','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','damage_c4','format','Double') + WriteData(fid,'object',self,'class','materials','fieldname','damage_stress_threshold','format','Double') # }}} Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 16156) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 16157) @@ -156,4 +156,10 @@ def MaterialsDamageDEnum(): return StringToEnum("MaterialsDamageD")[0] def MaterialsDamageDbarEnum(): return StringToEnum("MaterialsDamageDbar")[0] +def MaterialsDamageLawEnum(): return StringToEnum("MaterialsDamageLaw")[0] +def MaterialsDamageC1Enum(): return StringToEnum("MaterialsDamageC1")[0] +def MaterialsDamageC2Enum(): return StringToEnum("MaterialsDamageC2")[0] +def MaterialsDamageC3Enum(): return StringToEnum("MaterialsDamageC3")[0] +def MaterialsDamageC4Enum(): return StringToEnum("MaterialsDamageC4")[0] +def MaterialsDamageStressThresholdEnum(): return StringToEnum("MaterialsDamageStressThreshold")[0] def MaterialsRhoIceEnum(): return StringToEnum("MaterialsRhoIce")[0] def MaterialsRhoWaterEnum(): return StringToEnum("MaterialsRhoWater")[0] Index: /issm/trunk-jpl/src/m/enum/MaterialsDamageC1Enum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaterialsDamageC1Enum.m (revision 16157) +++ /issm/trunk-jpl/src/m/enum/MaterialsDamageC1Enum.m (revision 16157) @@ -0,0 +1,11 @@ +function macro=MaterialsDamageC1Enum() +%MATERIALSDAMAGEC1ENUM - Enum of MaterialsDamageC1 +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MaterialsDamageC1Enum() + +macro=StringToEnum('MaterialsDamageC1'); Index: /issm/trunk-jpl/src/m/enum/MaterialsDamageC2Enum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaterialsDamageC2Enum.m (revision 16157) +++ /issm/trunk-jpl/src/m/enum/MaterialsDamageC2Enum.m (revision 16157) @@ -0,0 +1,11 @@ +function macro=MaterialsDamageC2Enum() +%MATERIALSDAMAGEC2ENUM - Enum of MaterialsDamageC2 +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MaterialsDamageC2Enum() + +macro=StringToEnum('MaterialsDamageC2'); Index: /issm/trunk-jpl/src/m/enum/MaterialsDamageC3Enum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaterialsDamageC3Enum.m (revision 16157) +++ /issm/trunk-jpl/src/m/enum/MaterialsDamageC3Enum.m (revision 16157) @@ -0,0 +1,11 @@ +function macro=MaterialsDamageC3Enum() +%MATERIALSDAMAGEC3ENUM - Enum of MaterialsDamageC3 +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MaterialsDamageC3Enum() + +macro=StringToEnum('MaterialsDamageC3'); Index: /issm/trunk-jpl/src/m/enum/MaterialsDamageC4Enum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaterialsDamageC4Enum.m (revision 16157) +++ /issm/trunk-jpl/src/m/enum/MaterialsDamageC4Enum.m (revision 16157) @@ -0,0 +1,11 @@ +function macro=MaterialsDamageC4Enum() +%MATERIALSDAMAGEC4ENUM - Enum of MaterialsDamageC4 +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MaterialsDamageC4Enum() + +macro=StringToEnum('MaterialsDamageC4'); Index: /issm/trunk-jpl/src/m/enum/MaterialsDamageLawEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaterialsDamageLawEnum.m (revision 16157) +++ /issm/trunk-jpl/src/m/enum/MaterialsDamageLawEnum.m (revision 16157) @@ -0,0 +1,11 @@ +function macro=MaterialsDamageLawEnum() +%MATERIALSDAMAGELAWENUM - Enum of MaterialsDamageLaw +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MaterialsDamageLawEnum() + +macro=StringToEnum('MaterialsDamageLaw'); Index: /issm/trunk-jpl/src/m/enum/MaterialsDamageStressThresholdEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaterialsDamageStressThresholdEnum.m (revision 16157) +++ /issm/trunk-jpl/src/m/enum/MaterialsDamageStressThresholdEnum.m (revision 16157) @@ -0,0 +1,11 @@ +function macro=MaterialsDamageStressThresholdEnum() +%MATERIALSDAMAGESTRESSTHRESHOLDENUM - Enum of MaterialsDamageStressThreshold +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MaterialsDamageStressThresholdEnum() + +macro=StringToEnum('MaterialsDamageStressThreshold');