Changeset 23716 for issm/trunk-jpl/src/m/classes/matice.py

Timestamp:

02/12/19 06:10:51 (6 years ago)

Author:

bdef

Message:

CHG: shifting to py3 version of python interface (py2 compatible)

File:

• issm/trunk-jpl/src/m/classes/matice.py (modified) (7 diffs)

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

@@ -30 +30 @@
                 self.rheology_law              = ''
 
-                #giaivins: 
+                #giaivins:
                 self.lithosphere_shear_modulus  = 0.
                 self.lithosphere_density        = 0.
                 self.mantle_shear_modulus       = 0.
-                self.mantle_density             = 0.  
-                
+                self.mantle_density             = 0.
+
                 #SLR
-                self.earth_density= 5512;  
-
-
+                self.earth_density= 5512;
 
                 self.setdefaultparameters()
                 #}}}
+
         def __repr__(self): # {{{
                 string="   Materials:"
@@ -53 +52 @@
                 string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]"))
                 string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]"))
-                string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)"))
+                string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effectiveconductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)"))
                 string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K"))
                 string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]"))
@@ -67 +66 @@
                 string="%s\n%s"%(string,fielddisplay(self,"mantle_density","Mantle density [g/cm^-3]"))
                 string="%s\n%s"%(string,fielddisplay(self,"earth_density","Mantle density [kg/m^-3]"))
-
-
                 return string
                 #}}}
+
         def extrude(self,md): # {{{
                 self.rheology_B=project3d(md,'vector',self.rheology_B,'type','node')
@@ -76 +74 @@
                 return self
         #}}}
+
         def setdefaultparameters(self): # {{{
                 #ice density (kg/m^3)
                 self.rho_ice=917.
-
                 #ocean water density (kg/m^3)
                 self.rho_water=1023.
-
                 #fresh water density (kg/m^3)
                 self.rho_freshwater=1000.
-
                 #water viscosity (N.s/m^2)
-                self.mu_water=0.001787  
-
+                self.mu_water=0.001787
                 #ice heat capacity cp (J/kg/K)
                 self.heatcapacity=2093.
-
                 #ice latent heat of fusion L (J/kg)
                 self.latentheat=3.34*10**5
-
                 #ice thermal conductivity (W/m/K)
                 self.thermalconductivity=2.4
-
+    #computation of effective conductivity
+                self.effectiveconductivity_averaging=1
                 #temperate ice thermal conductivity (W/m/K)
                 self.temperateiceconductivity=0.24
-
-                #computation of effective conductivity
-                self.effectiveconductivity_averaging=1
-
                 #the melting point of ice at 1 atmosphere of pressure in K
                 self.meltingpoint=273.15
-
                 #rate of change of melting point with pressure (K/Pa)
                 self.beta=9.8*10**-8
-
                 #mixed layer (ice-water interface) heat capacity (J/kg/K)
                 self.mixed_layer_capacity=3974.
-
                 #thermal exchange velocity (ice-water interface) (m/s)
                 self.thermal_exchange_velocity=1.00*10**-4
-
                 #Rheology law: what is the temperature dependence of B with T
                 #available: none, paterson and arrhenius
@@ -125 +111 @@
                 self.mantle_shear_modulus       = 1.45*10**11 # (Pa)
                 self.mantle_density             = 3.34        # (g/cm^-3)
-                
+
                 #SLR
                 self.earth_density= 5512;  # average density of the Earth, (kg/m^3)
-
-
                 return self
                 #}}}
+
         def checkconsistency(self,md,solution,analyses):    # {{{
                 md = checkfield(md,'fieldname','materials.rho_ice','>',0)
@@ -140 +125 @@
                 md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements])
                 md = checkfield(md,'fieldname','materials.rheology_law','values',['None','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval'])
+                md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0,1,2])
                 md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',[1]);
                 md = checkfield(md,'fieldname','materials.lithosphere_density','>',0,'numel',[1]);
@@ -145 +131 @@
                 md = checkfield(md,'fieldname','materials.mantle_density','>',0,'numel',[1]);
                 md = checkfield(md,'fieldname','materials.earth_density','>',0,'numel',[1]);
-                md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0,1,2])
-
                 return md
         # }}}
+
         def marshall(self,prefix,md,fid):    # {{{
                 WriteData(fid,prefix,'name','md.materials.type','data',3,'format','Integer');