Changeset 14901

Timestamp:

05/04/13 23:07:46 (12 years ago)

Author:

adhikari

Message:

CHG: changes associated with GiaMantleViscosityEnum that accounts for varying mantle visocity in gia model

Location:

issm/trunk-jpl/src/m

Files:

• classes/gia.m (modified) (4 diffs)
• classes/gia.py (modified) (4 diffs)
• classes/matdamageice.m (modified) (5 diffs)
• classes/matice.m (modified) (5 diffs)
• classes/model/model.m (modified) (2 diffs)
• classes/model/model.py (modified) (1 diff)
• enum/EnumDefinitions.py (modified) (2 diffs)
• enum/GiaMantleViscosityEnum.m (added)
• enum/MaterialsMantleViscosityEnum.m (deleted)

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

@@ -6 +6 @@
 classdef gia
         properties (SetAccess=public) 
+                mantle_viscosity              = NaN;
                 lithosphere_thickness         = NaN;
                 output_rates                  = 0;
@@ -26 +27 @@
                  
                         if ~ismember(GiaAnalysisEnum(),analyses), return; end
+                        md = checkfield(md,'gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0);
                         md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0);
                         md = checkfield(md,'gia.output_rates','numel',[1],'values',[1,2]);
@@ -49 +51 @@
                         disp(sprintf('   gia parameters:'));
 
+                        fielddisplay(obj,'mantle_viscosity','mantle viscosity[Pa s]');
                         fielddisplay(obj,'lithosphere_thickness','lithosphere thickness[km]');
                         fielddisplay(obj,'output_rates','1: fetch w solution (m) (default). 2: fetch dw/dt (mm/yr). See irate in GiaDeflectionCore');
@@ -55 +58 @@
                 end % }}}
                 function marshall(obj,fid) % {{{
+                        WriteData(fid,'object',obj,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','output_rates','format','Integer');

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

@@ -13 +13 @@
 
         def __init__(self): # {{{
+                self.mantle_viscosity              = float('NaN');
                 self.lithosphere_thickness         = float('NaN');
                 self.output_rates                  = 0;
@@ -25 +26 @@
                 string='   gia solution parameters:' 
                 
+                string="%s\n%s"%(string,fielddisplay(self,'mantle_viscosity','mantle viscosity constraints (NaN means no constraint) [Pa s]'))
                 string="%s\n%s"%(string,fielddisplay(self,'lithosphere_thickness','lithosphere thickness constraints (NaN means no constraint) [m]'))
                 string="%s\n%s"%(string,fielddisplay(self,'output_rates','1: deflection (w) [m], 2: rate of deflection (dw/dt) [mm/yr]'))
@@ -43 +45 @@
                         return md 
                 
+                md = checkfield(md,'gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
                 md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
                 md = checkfield(md,'gia.output_rates','numel',[1],'values',[1,2])
@@ -53 +56 @@
         # }}}
         def marshall(self,fid):    # {{{
+                WriteData(fid,'object',self,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
                 WriteData(fid,'object',self,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1);
                 WriteData(fid,'object',self,'fieldname','output_rates','format','Integer');

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

@@ -26 +26 @@
                 lithosphere_density        = 0.;
                 mantle_shear_modulus       = 0.;
-                mantle_viscosity           = 0.;
                 mantle_density             = 0.;
 
@@ -93 +92 @@
                         obj.lithosphere_density        = 3.32;       % (g/cm^-3)
                         obj.mantle_shear_modulus       = 1.45*10^11; % (Pa)
-                        obj.mantle_viscosity           = 10^21;      % (Pa.s)
                         obj.mantle_density             = 3.34;       % (g/cm^-3)
 
@@ -109 +107 @@
                         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);
 
@@ -134 +131 @@
                         fielddisplay(obj,'lithosphere_density','Lithosphere density [g/cm^-3]');
                         fielddisplay(obj,'mantle_shear_modulus','Mantle shear modulus [Pa]');
-                        fielddisplay(obj,'mantle_viscosity','Mantle viscosity [Pa s]');
                         fielddisplay(obj,'mantle_density','Mantle density [g/cm^-3]');
 
@@ -159 +155 @@
                         WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double');
                         WriteData(fid,'object',obj,'class','materials','fieldname','mantle_shear_modulus','format','Double');
-                        WriteData(fid,'object',obj,'class','materials','fieldname','mantle_viscosity','format','Double');
                         WriteData(fid,'object',obj,'class','materials','fieldname','mantle_density','format','Double');
 

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

@@ -25 +25 @@
                 lithosphere_density        = 0.;
                 mantle_shear_modulus       = 0.;
-                mantle_viscosity           = 0.;
                 mantle_density             = 0.;
 
@@ -91 +90 @@
                         obj.lithosphere_density        = 3.32;       % (g/cm^-3)
                         obj.mantle_shear_modulus       = 1.45*10^11; % (Pa)
-                        obj.mantle_viscosity           = 10^21;      % (Pa.s)
                         obj.mantle_density             = 3.34;       % (g/cm^-3)
 
@@ -106 +104 @@
                         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);
 
@@ -130 +127 @@
                         fielddisplay(obj,'lithosphere_density','Lithosphere density [g/cm^-3]');
                         fielddisplay(obj,'mantle_shear_modulus','Mantle shear modulus [Pa]');
-                        fielddisplay(obj,'mantle_viscosity','Mantle viscosity [Pa s]');
                         fielddisplay(obj,'mantle_density','Mantle density [g/cm^-3]');
                 end % }}}
@@ -153 +149 @@
                         WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double');
                         WriteData(fid,'object',obj,'class','materials','fieldname','mantle_shear_modulus','format','Double');
-                        WriteData(fid,'object',obj,'class','materials','fieldname','mantle_viscosity','format','Double');
                         WriteData(fid,'object',obj,'class','materials','fieldname','mantle_density','format','Double');
                 end % }}}

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

@@ -209 +209 @@
                         md.geometry.surface=project2d(md,md.geometry.surface,1);
                         md.geometry.thickness=project2d(md,md.geometry.thickness,1);
+                        md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1);
                         md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1);
                         md.geometry.bed=project2d(md,md.geometry.bed,1);
@@ -755 +756 @@
                         md.geometry.surface=project3d(md,'vector',md.geometry.surface,'type','node');
                         md.geometry.thickness=project3d(md,'vector',md.geometry.thickness,'type','node');
+                        md.gia.mantle_viscosity=project3d(md,'vector',md.gia.mantle_viscosity,'type','node');
                         md.gia.lithosphere_thickness=project3d(md,'vector',md.gia.lithosphere_thickness,'type','node');
                         md.geometry.hydrostatic_ratio=project3d(md,'vector',md.geometry.hydrostatic_ratio,'type','node');

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

@@ -649 +649 @@
                 md.geometry.surface=project3d(md,'vector',md.geometry.surface,'type','node')
                 md.geometry.thickness=project3d(md,'vector',md.geometry.thickness,'type','node')
+                md.gia.mantle_viscosity=project3d(md,'vector',md.gia.mantle_viscosity,'type','node')
                 md.gia.lithosphere_thickness=project3d(md,'vector',md.gia.lithosphere_thickness,'type','node')
                 md.geometry.hydrostatic_ratio=project3d(md,'vector',md.geometry.hydrostatic_ratio,'type','node')

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

@@ -1469 +1469 @@
         return StringToEnum('MaterialsMantleShearModulus')[0]
 
-def MaterialsMantleViscosityEnum():
-        """
-        MATERIALSMANTLEVISCOSITYENUM - Enum of MaterialsMantleViscosity
-
-           Usage:
-              macro=MaterialsMantleViscosityEnum()
-        """
-
-        return StringToEnum('MaterialsMantleViscosity')[0]
-
 def MaterialsMantleDensityEnum():
         """
@@ -2289 +2279 @@
         return StringToEnum('ThermalIsenthalpy')[0]
 
+def GiaMantleViscosityEnum():
+        """
+        GIAMANTLEVISCOSITYENUM - Enum of GiaMantleViscosity
+
+           Usage:
+              macro=GiaMantleViscosityEnum()
+        """
+
+        return StringToEnum('GiaMantleViscosity')[0]
+
 def GiaLithosphereThicknessEnum():
         """