Changeset 14936

Timestamp:

05/06/13 16:18:51 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: syncing python and matlab's materials

Location:

issm/trunk-jpl/src/m/classes

Files:

• matdamageice.py (modified) (5 diffs)
• matice.py (modified) (5 diffs)

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

@@ -34 +34 @@
                 self.lithosphere_density        = 0.
                 self.mantle_shear_modulus       = 0.
-                self.mantle_viscosity           = 0.
                 self.mantle_density             = 0.
 
@@ -64 +63 @@
                 s+="%s\n" % fielddisplay(self,"lithosphere_density","Lithosphere density [g/cm^-3]")
                 s+="%s\n" % fielddisplay(self,"mantle_shear_modulus","Mantle shear modulus [Pa]")
-                s+="%s\n" % fielddisplay(self,"mantle_viscosity","Mantle viscosity [Pa s]")
                 s+="%s\n" % fielddisplay(self,"mantle_density","Mantle density [g/cm^-3]")
 
@@ -112 +110 @@
                 self.lithosphere_density        = 3.32;       # (g/cm^-3)
                 self.mantle_shear_modulus       = 1.45*10**11; # (Pa)
-                self.mantle_viscosity           = 10**21;      # (Pa.s)
                 self.mantle_density             = 3.34;       # (g/cm^-3)
         # }}}
@@ -127 +124 @@
                 md = checkfield(md,'materials.lithosphere_density','>',0,'numel',[1]);
                 md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',[1]);
-                md = checkfield(md,'materials.mantle_viscosity','>',0,'numel',[1]);
                 md = checkfield(md,'materials.mantle_density','>',0,'numel',[1]);
 
@@ -153 +149 @@
                 WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_density','format','Double');
                 WriteData(fid,'object',self,'class','materials','fieldname','mantle_shear_modulus','format','Double');
-                WriteData(fid,'object',self,'class','materials','fieldname','mantle_viscosity','format','Double');
                 WriteData(fid,'object',self,'class','materials','fieldname','mantle_density','format','Double');
         # }}}

issm/trunk-jpl/src/m/classes/matice.py ¶

@@ -33 +33 @@
                 self.lithosphere_density        = 0.
                 self.mantle_shear_modulus       = 0.
-                self.mantle_viscosity           = 0.
                 self.mantle_density             = 0.
 
@@ -58 +57 @@
                 string="%s\n%s"%(string,fielddisplay(self,"lithosphere_density","Lithosphere density [g/cm^-3]"))
                 string="%s\n%s"%(string,fielddisplay(self,"mantle_shear_modulus","Mantle shear modulus [Pa]"))
-                string="%s\n%s"%(string,fielddisplay(self,"mantle_viscosity","Mantle viscosity [Pa s]"))
                 string="%s\n%s"%(string,fielddisplay(self,"mantle_density","Mantle density [g/cm^-3]"))
 
@@ -105 +103 @@
                 self.lithosphere_density        = 3.32        # (g/cm^-3)
                 self.mantle_shear_modulus       = 1.45*10**11 # (Pa)
-                self.mantle_viscosity           = 10**21      # (Pa.s)
                 self.mantle_density             = 3.34        # (g/cm^-3)
 
@@ -121 +118 @@
                 md = checkfield(md,'materials.lithosphere_density','>',0,'numel',[1]);
                 md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',[1]);
-                md = checkfield(md,'materials.mantle_viscosity','>',0,'numel',[1]);
                 md = checkfield(md,'materials.mantle_density','>',0,'numel',[1]);
                 return md
@@ -145 +141 @@
                 WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_density','format','Double');
                 WriteData(fid,'object',self,'class','materials','fieldname','mantle_shear_modulus','format','Double');
-                WriteData(fid,'object',self,'class','materials','fieldname','mantle_viscosity','format','Double');
                 WriteData(fid,'object',self,'class','materials','fieldname','mantle_density','format','Double');
         # }}}