Changeset 26358 for issm/trunk-jpl/src/m/classes/materials.py

Timestamp:

07/24/21 17:33:34 (4 years ago)

Author:

jdquinn

Message:

CHG: Completed MATLAB -> Python updates for SE; archive updates now that GMSH can be used on macOS and Linux; various minor bug fixes; formatting; cleanup

File:

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

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

@@ -76 +76 @@
             nat = self.nature[i]
             if nat == 'ice':
-                s += 'Ice:\n'
+                s += '\n      Ice:\n'
                 s += '{}\n'.format(fielddisplay(self, 'rho_ice', 'ice density [kg/m^3]'))
                 s += '{}\n'.format(fielddisplay(self, 'rho_water', 'ocean water density [kg/m^3]'))
@@ -93 +93 @@
                 s += '{}\n'.format(fielddisplay(self, 'rheology_law', 'law for the temperature dependance of the rheology: \'None\', \'BuddJacka\', \'Cuffey\', \'CuffeyTemperate\', \'Paterson\', \'Arrhenius\', \'LliboutryDuval\', \'NyeCO2\', or \'NyeH2O\''))
             elif nat == 'litho':
-                s += 'Litho:\n'
+                s += '\n      Litho:\n'
                 s += '{}\n'.format(fielddisplay(self, 'numlayers', 'number of layers (default: 2)'))
                 s += '{}\n'.format(fielddisplay(self, 'radius', 'array describing the radius for each interface (numlayers + 1) [m]'))
@@ -111 +111 @@
                 s += '{}\n'.format(fielddisplay(self, 'issolid', 'array describing whether the layer is solid or liquid (default: 1) (numlayers)'))
             elif nat == 'hydro':
-                s += 'Hydro:\n'
+                s += '\n      Hydro:\n'
                 s += '{}\n'.format(fielddisplay(self, 'rho_ice', 'ice density [kg/m^3]'))
                 s += '{}\n'.format(fielddisplay(self, 'rho_water', 'ocean water density [kg/m^3]'))
@@ -127 +127 @@
             if nat == 'ice':
                 # Ice density (kg/m^3)
-                self.rho_ice = 917
+                self.rho_ice = 917.0
 
                 # Ocean water density (kg/m^3)
-                self.rho_water = 1023
+                self.rho_water = 1023.0
 
                 # Fresh water density (kg/m^3)
-                self.rho_freshwater = 1000
+                self.rho_freshwater = 1000.0
 
                 # Water viscosity (N.s/m^2)
@@ -139 +139 @@
 
                 # Ice heat capacity cp (J/kg/K)
-                self.heatcapacity = 2093
+                self.heatcapacity = 2093.0
 
                 # Ice latent heat of fusion L (J/kg)
@@ -160 +160 @@
 
                 # Mixed layer (ice-water interface) heat capacity (J/kg/K)
-                self.mixed_layer_capacity = 3974
+                self.mixed_layer_capacity = 3974.0
 
                 # Thermal exchange velocity (ice-water interface) (m/s)
@@ -193 +193 @@
                 self.ebm_tauh = [np.nan, np.nan]
                 self.rheologymodel = [0, 0]
-                self.density = [5.51e3, 5.50e3] # (Pa) # Mantle and lithosphere density [kg/m^3]
+                self.density = [5.51 * 1e3, 5.50 * 1e3] # (Pa) # Mantle and lithosphere density [kg/m^3]
                 self.issolid = [1, 1] # Is layer solid or liquid?
             elif nat == 'hydro':
                 # Ice density (kg/m^3)
-                self.rho_ice = 917
+                self.rho_ice = 917.0
 
                 # Ocean water density (kg/m^3)
-                self.rho_water = 1023
+                self.rho_water = 1023.0
 
                 # Fresh water density (kg/m^3)
-                self.rho_freshwater = 1000
+                self.rho_freshwater = 1000.0
             else:
                 raise RuntimeError("materials setdefaultparameters error message: nature of the material not supported yet! ('ice' or 'litho' or 'hydro')")