Changeset 26928

Timestamp:

03/11/22 01:19:12 (3 years ago)

Author:

bdef

Message:

CHG: some syntax fix and export gmsh py translation

Location:

issm/trunk-jpl

Files:

• src/m/classes/matdamageice.py (modified) (2 diffs)
• src/m/classes/materials.py (modified) (3 diffs)
• src/m/classes/model.py (modified) (1 diff)
• src/m/classes/solidearth.py (modified) (8 diffs)
• src/m/mesh/ExportGmsh.py (added)
• src/m/plot/applyoptions.py (modified) (1 diff)
• test/NightlyRun/runme.m (modified) (1 diff)

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

@@ -57 +57 @@
         s += '{}\n'.format(fielddisplay(self, 'rheology_law', 'law for the temperature dependance of the rheology: \'None\', \'BuddJacka\', \'Cuffey\', \'CuffeyTemperate\', \'Paterson\', \'Arrhenius\' or \'LliboutryDuval\''))
         s += '{}\n'.format(fielddisplay(self, 'earth_density', 'Mantle density [kg m^-3]'))
-        return string
+        return s
     #}}}
 
@@ -93 +93 @@
         # Thermal exchange velocity (ice-water interface) (m/s)
         self.thermal_exchange_velocity = 1.00e-4
-        # Rheology law: what is the temperature dependence of B with T 
+        # Rheology law: what is the temperature dependence of B with T
         # available: none, paterson and arrhenius
         self.rheology_law = 'Paterson'

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

@@ -1 +1 @@
 import numpy as np
-
 from checkfield import checkfield
 from fielddisplay import fielddisplay
@@ -173 +172 @@
                 self.rheology_n = 3
             elif nat == 'litho':
-                # We default to a configuration that enables running GIA 
+                # We default to a configuration that enables running GIA
                 # solutions using giacaron and/or giaivins
                 self.numlayers = 2
 
-                # Center of the earth (approximation, must not be 0), then the 
+                # Center of the earth (approximation, must not be 0), then the
                 # lab (lithosphere/asthenosphere boundary) then the surface
                 # (with 1d3 to avoid numerical singularities)
@@ -295 +294 @@
                 WriteData(fid, prefix, 'object', self, 'class', 'materials', 'fieldname', 'density', 'format', 'DoubleMat', 'mattype', 3)
                 WriteData(fid, prefix, 'object', self, 'class', 'materials', 'fieldname', 'viscosity', 'format', 'DoubleMat', 'mattype', 3)
-                WriteData(fid, prefix, 'object', self, 'class', 'materials', 'fieldname', 'rheologymodel', 'format', 'DoubleMat', 'mattype', 3) 
+                WriteData(fid, prefix, 'object', self, 'class', 'materials', 'fieldname', 'rheologymodel', 'format', 'DoubleMat', 'mattype', 3)
                 WriteData(fid, prefix, 'object', self, 'class', 'materials', 'fieldname', 'burgers_viscosity', 'format', 'DoubleMat', 'mattype', 3)
                 WriteData(fid, prefix, 'object', self, 'class', 'materials', 'fieldname', 'burgers_mu', 'format', 'DoubleMat', 'mattype', 3)

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

@@ -823 +823 @@
             md.inversion.max_parameters = project2d(md, md.inversion.max_parameters, md.mesh.numberoflayers)
         if md.smb.__class__.__name__ == 'SMBforcing' and not np.isnan(md.smb.mass_balance).all():
-                md.smb.mass_balance = project2d(md, md.smb.mass_balance, md.mesh.numberoflayers)
+            md.smb.mass_balance = project2d(md, md.smb.mass_balance, md.mesh.numberoflayers)
         elif md.smb.__class__.__name__ == 'SMBhenning' and not np.isnan(md.smb.smbref).all():
-                md.smb.smbref = project2d(md, md.smb.smbref, md.mesh.numberoflayers)
+            md.smb.smbref = project2d(md, md.smb.smbref, md.mesh.numberoflayers)
 
         # Results

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

@@ -1 +1 @@
 import numpy as np
-
 from checkfield import checkfield
 from fielddisplay import fielddisplay
@@ -6 +5 @@
 from MatlabFuncs import *
 from planetradius import planetradius
-from project3d import project3d
 from rotational import rotational
 from solidearthsettings import solidearthsettings
@@ -25 +23 @@
 
     def __init__(self, *args):  # {{{
-        self.settings           = solidearthsettings()
-        self.external           = None
-        self.lovenumbers        = lovenumbers()
-        self.rotational         = rotational()
-        self.planetradius       = planetradius('earth')
-        self.requested_outputs  = []
-        self.transitions        = []
-        self.partitionice       = []
-        self.partitionhydro     = []
-        self.partitionocean     = []
+        self.settings  = solidearthsettings()
+        self.external  = None
+        self.lovenumbers = lovenumbers()
+        self.rotational = rotational()
+        self.planetradius = planetradius('earth')
+        self.requested_outputs = []
+        self.transitions = []
+        self.partitionice = []
+        self.partitionhydro = []
+        self.partitionocean = []
 
         nargs = len(args)
@@ -44 +42 @@
             raise Exception('solidearth constructor error message: zero or one argument only!')
     # }}}
+
     def __repr__(self):  # {{{
         s = '   solidearthinputs, forcings and settings:\n'
@@ -57 +56 @@
         print(self.lovenumbers)
         print(self.rotational)
-        if len(self.external):
+        try:
             print(self.external)
+        except TypeError:
+            pass
         return s
     # }}}
+
     def setdefaultparameters(self, planet):  # {{{
         # Output default
@@ -79 +81 @@
         self.planetradius = planetradius(planet)
     # }}}
+
     def checkconsistency(self, md, solution, analyses):  # {{{
         if ('SealevelchangeAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
@@ -94 +97 @@
         return md
     # }}}
+
     def defaultoutputs(self, md):  # {{{
         return ['Sealevel']
     # }}}
+
     def marshall(self, prefix, md, fid):  # {{{
         WriteData(fid, prefix, 'object', self, 'fieldname', 'planetradius', 'format', 'Double')
@@ -140 +145 @@
         WriteData(fid, prefix, 'data', outputs, 'name', 'md.solidearth.requested_outputs', 'format', 'StringArray')
     # }}}
+
     def extrude(self, md):  # {{{
         return self

issm/trunk-jpl/src/m/plot/applyoptions.py

@@ -53 +53 @@
     #title font
         titlefont = font.copy()
-        titlefont['size'] = titlefontsize
-        titlefont['weight'] = titlefontweight
+        titlefont['fontsize'] = titlefontsize
+        titlefont['fontweight'] = titlefontweight
         ax.set_title(title, **titlefont)
     # }}}

issm/trunk-jpl/test/NightlyRun/runme.m

@@ -218 +218 @@
                         end
 
-                %CHECK for memory leaks?
+                %PRODUCE nc files?
                 elseif strcmpi(procedure,'ncExport'),
                         export_netCDF(md, ['test' num2str(id) 'ma.nc'])