Index: /issm/trunk-jpl/src/m/classes/gia.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/gia.m	(revision 14900)
+++ /issm/trunk-jpl/src/m/classes/gia.m	(revision 14901)
@@ -6,4 +6,5 @@
 classdef gia
 	properties (SetAccess=public) 
+		mantle_viscosity              = NaN;
 		lithosphere_thickness         = NaN;
 		output_rates                  = 0;
@@ -26,4 +27,5 @@
 		 
 			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,4 +51,5 @@
 			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,4 +58,5 @@
 		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');
Index: /issm/trunk-jpl/src/m/classes/gia.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/gia.py	(revision 14900)
+++ /issm/trunk-jpl/src/m/classes/gia.py	(revision 14901)
@@ -13,4 +13,5 @@
 
 	def __init__(self): # {{{
+		self.mantle_viscosity              = float('NaN');
 		self.lithosphere_thickness         = float('NaN');
 		self.output_rates                  = 0;
@@ -25,4 +26,5 @@
 		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,4 +45,5 @@
 			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,4 +56,5 @@
 	# }}}
 	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');
Index: /issm/trunk-jpl/src/m/classes/matdamageice.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/matdamageice.m	(revision 14900)
+++ /issm/trunk-jpl/src/m/classes/matdamageice.m	(revision 14901)
@@ -26,5 +26,4 @@
 		lithosphere_density        = 0.;
 		mantle_shear_modulus       = 0.;
-		mantle_viscosity           = 0.;
 		mantle_density             = 0.;
 
@@ -93,5 +92,4 @@
 			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,5 +107,4 @@
 			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,5 +131,4 @@
 			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,5 +155,4 @@
 			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');
 
Index: /issm/trunk-jpl/src/m/classes/matice.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/matice.m	(revision 14900)
+++ /issm/trunk-jpl/src/m/classes/matice.m	(revision 14901)
@@ -25,5 +25,4 @@
 		lithosphere_density        = 0.;
 		mantle_shear_modulus       = 0.;
-		mantle_viscosity           = 0.;
 		mantle_density             = 0.;
 
@@ -91,5 +90,4 @@
 			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,5 +104,4 @@
 			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,5 +127,4 @@
 			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,5 +149,4 @@
 			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 % }}}
Index: /issm/trunk-jpl/src/m/classes/model/model.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/model/model.m	(revision 14900)
+++ /issm/trunk-jpl/src/m/classes/model/model.m	(revision 14901)
@@ -209,4 +209,5 @@
 			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,4 +756,5 @@
 			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');
Index: /issm/trunk-jpl/src/m/classes/model/model.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/model/model.py	(revision 14900)
+++ /issm/trunk-jpl/src/m/classes/model/model.py	(revision 14901)
@@ -649,4 +649,5 @@
 		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')
Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py
===================================================================
--- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 14900)
+++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 14901)
@@ -1469,14 +1469,4 @@
 	return StringToEnum('MaterialsMantleShearModulus')[0]
 
-def MaterialsMantleViscosityEnum():
-	"""
-	MATERIALSMANTLEVISCOSITYENUM - Enum of MaterialsMantleViscosity
-
-	   Usage:
-	      macro=MaterialsMantleViscosityEnum()
-	"""
-
-	return StringToEnum('MaterialsMantleViscosity')[0]
-
 def MaterialsMantleDensityEnum():
 	"""
@@ -2289,4 +2279,14 @@
 	return StringToEnum('ThermalIsenthalpy')[0]
 
+def GiaMantleViscosityEnum():
+	"""
+	GIAMANTLEVISCOSITYENUM - Enum of GiaMantleViscosity
+
+	   Usage:
+	      macro=GiaMantleViscosityEnum()
+	"""
+
+	return StringToEnum('GiaMantleViscosity')[0]
+
 def GiaLithosphereThicknessEnum():
 	"""
Index: /issm/trunk-jpl/src/m/enum/GiaMantleViscosityEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/GiaMantleViscosityEnum.m	(revision 14901)
+++ /issm/trunk-jpl/src/m/enum/GiaMantleViscosityEnum.m	(revision 14901)
@@ -0,0 +1,11 @@
+function macro=GiaMantleViscosityEnum()
+%GIAMANTLEVISCOSITYENUM - Enum of GiaMantleViscosity
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=GiaMantleViscosityEnum()
+
+macro=StringToEnum('GiaMantleViscosity');
Index: sm/trunk-jpl/src/m/enum/MaterialsMantleViscosityEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/MaterialsMantleViscosityEnum.m	(revision 14900)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=MaterialsMantleViscosityEnum()
-%MATERIALSMANTLEVISCOSITYENUM - Enum of MaterialsMantleViscosity
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=MaterialsMantleViscosityEnum()
-
-macro=StringToEnum('MaterialsMantleViscosity');