Index: /issm/trunk-jpl/src/m/classes/matdamageice.m =================================================================== --- /issm/trunk-jpl/src/m/classes/matdamageice.m (revision 14750) +++ /issm/trunk-jpl/src/m/classes/matdamageice.m (revision 14751) @@ -90,9 +90,9 @@ %GIA: - obj.lithosphere_shear_modulus = 6.7*10^10; %(Pa) - 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) + obj.lithosphere_shear_modulus = 6.7*10^10; % (Pa) + 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) end % }}} @@ -106,9 +106,9 @@ md = checkfield(md,'materials.rheology_Z','>',0,'size',[md.mesh.numberofvertices 1]); md = checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius'}); - md = checkfield(md,'materials.lithosphere_shear_modulus','>',0); - md = checkfield(md,'materials.lithosphere_density','>',0); - md = checkfield(md,'materials.mantle_shear_modulus','>',0); - md = checkfield(md,'materials.mantle_viscosity','>',0); - md = checkfield(md,'materials.mantle_density','>',0); + md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',1); + 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); end % }}} @@ -134,5 +134,5 @@ 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_viscosity','Mantle viscosity [Pa s]'); fielddisplay(obj,'mantle_density','Mantle density [g/cm^-3]'); Index: /issm/trunk-jpl/src/m/classes/matdamageice.py =================================================================== --- /issm/trunk-jpl/src/m/classes/matdamageice.py (revision 14750) +++ /issm/trunk-jpl/src/m/classes/matdamageice.py (revision 14751) @@ -30,4 +30,11 @@ self.rheology_law = '' + #gia: + self.lithosphere_shear_modulus = 0. + self.lithosphere_density = 0. + self.mantle_shear_modulus = 0. + self.mantle_viscosity = 0. + self.mantle_density = 0. + if not len(args): self.setdefaultparameters() @@ -54,4 +61,9 @@ s+="%s\n" % fielddisplay(self,"rheology_Z","rheology multiplier") s+="%s\n" % fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Paterson' or 'Arrhenius'") + s+="%s\n" % fielddisplay(self,"lithosphere_shear_modulus","Lithosphere shear modulus [Pa]") + 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]") return s @@ -95,4 +107,11 @@ #available: none, paterson and arrhenius self.rheology_law='Paterson' + + # GIA: + self.lithosphere_shear_modulus = 6.7*10**10; # (Pa) + 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) # }}} def checkconsistency(self,md,solution,analyses): # {{{ @@ -105,4 +124,9 @@ md = checkfield(md,'materials.rheology_Z','>',0,'size',[md.mesh.numberofvertices,1]) md = checkfield(md,'materials.rheology_law','values',['None','Paterson','Arrhenius']) + md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',[1]); + 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 @@ -125,3 +149,9 @@ WriteData(fid,'object',self,'class','materials','fieldname','rheology_Z','format','DoubleMat','mattype',1) WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer') + + WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double'); + 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'); # }}} Index: /issm/trunk-jpl/src/m/classes/matice.m =================================================================== --- /issm/trunk-jpl/src/m/classes/matice.m (revision 14750) +++ /issm/trunk-jpl/src/m/classes/matice.m (revision 14751) @@ -87,10 +87,10 @@ obj.rheology_law='Paterson'; - %GIA: - obj.lithosphere_shear_modulus = 6.7*10^10; %(Pa) - 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) + % GIA: + obj.lithosphere_shear_modulus = 6.7*10^10; % (Pa) + 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) end % }}} @@ -103,9 +103,9 @@ md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]); md = checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius'}); - md = checkfield(md,'materials.lithosphere_shear_modulus','>',0); - md = checkfield(md,'materials.lithosphere_density','>',0); - md = checkfield(md,'materials.mantle_shear_modulus','>',0); - md = checkfield(md,'materials.mantle_viscosity','>',0); - md = checkfield(md,'materials.mantle_density','>',0); + md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',1); + 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); end % }}} @@ -130,5 +130,5 @@ 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_viscosity','Mantle viscosity [Pa s]'); fielddisplay(obj,'mantle_density','Mantle density [g/cm^-3]'); end % }}} Index: /issm/trunk-jpl/src/m/classes/matice.py =================================================================== --- /issm/trunk-jpl/src/m/classes/matice.py (revision 14750) +++ /issm/trunk-jpl/src/m/classes/matice.py (revision 14751) @@ -14,18 +14,25 @@ def __init__(self): # {{{ - self.rho_ice = 0. - self.rho_water = 0. - self.rho_freshwater = 0. - self.mu_water = 0. - self.heatcapacity = 0. - self.latentheat = 0. - self.thermalconductivity = 0. - self.meltingpoint = 0. - self.beta = 0. - self.mixed_layer_capacity = 0. - self.thermal_exchange_velocity = 0. - self.rheology_B = float('NaN') - self.rheology_n = float('NaN') - self.rheology_law = '' + self.rho_ice = 0. + self.rho_water = 0. + self.rho_freshwater = 0. + self.mu_water = 0. + self.heatcapacity = 0. + self.latentheat = 0. + self.thermalconductivity = 0. + self.meltingpoint = 0. + self.beta = 0. + self.mixed_layer_capacity = 0. + self.thermal_exchange_velocity = 0. + self.rheology_B = float('NaN') + self.rheology_n = float('NaN') + self.rheology_law = '' + + #gia: + self.lithosphere_shear_modulus = 0. + self.lithosphere_density = 0. + self.mantle_shear_modulus = 0. + self.mantle_viscosity = 0. + self.mantle_density = 0. self.setdefaultparameters() @@ -48,4 +55,9 @@ string="%s\n%s"%(string,fielddisplay(self,"rheology_n","Glen's flow law exponent")) string="%s\n%s"%(string,fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Paterson' or 'Arrhenius'")) + string="%s\n%s"%(string,fielddisplay(self,"lithosphere_shear_modulus","Lithosphere shear modulus [Pa]")) + 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]")) return string @@ -88,4 +100,12 @@ #available: none, paterson and arrhenius self.rheology_law='Paterson' + + # GIA: + self.lithosphere_shear_modulus = 6.7*10**10 # (Pa) + 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) + return self #}}} @@ -98,4 +118,9 @@ md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements]) md = checkfield(md,'materials.rheology_law','values',['None','Paterson','Arrhenius']) + md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',[1]); + 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 # }}} @@ -116,3 +141,9 @@ WriteData(fid,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2) WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer') + + WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double'); + 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'); # }}} Index: /issm/trunk-jpl/src/m/classes/surfaceforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/surfaceforcings.py (revision 14750) +++ /issm/trunk-jpl/src/m/classes/surfaceforcings.py (revision 14751) @@ -13,18 +13,18 @@ def __init__(self): # {{{ - self.precipitation = float('NaN') - self.mass_balance = float('NaN') - self.ispdd = 0 - self.issmbgradients = 0 - self.isdelta18o = 0 - self.href = float('NaN') - self.smbref = float('NaN') - self.b_pos = float('NaN') - self.b_neg = float('NaN') - self.monthlytemperatures = float('NaN') - self.delta18o = float('NaN') - self.delta18o_surface = float('NaN') - self.temperatures_presentday = float('NaN') - self.temperatures_lgm = float('NaN') + self.precipitation = float('NaN') + self.mass_balance = float('NaN') + self.ispdd = 0 + self.issmbgradients = 0 + self.isdelta18o = 0 + self.href = float('NaN') + self.smbref = float('NaN') + self.b_pos = float('NaN') + self.b_neg = float('NaN') + self.monthlytemperatures = float('NaN') + self.delta18o = float('NaN') + self.delta18o_surface = float('NaN') + self.temperatures_presentday = float('NaN') + self.temperatures_lgm = float('NaN') self.precipitations_presentday = float('NaN')