Changeset 27326

Timestamp:

10/24/22 16:47:14 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: python translation

Location:

issm/trunk-jpl/src/m/classes

Files:

• solidearth.m (modified) (3 diffs)
• solidearth.py (modified) (4 diffs)

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

@@ -7 +7 @@
 classdef solidearth
         properties (SetAccess=public) 
-                settings               = solidearthsettings(); 
-                external               = [];
-                lovenumbers            = lovenumbers();
-                rotational             = rotational();
-                planetradius           = planetradius('earth');
-                requested_outputs      = {};
-                transitions            = {};
-                transfercount           = [];
-                partitionice           = [];
-                partitionhydro         = [];
-                partitionocean         = [];
+                settings          = solidearthsettings();
+                external          = [];
+                lovenumbers       = lovenumbers();
+                rotational        = rotational();
+                planetradius      = planetradius('earth');
+                requested_outputs = {};
+                transitions       = {};
+                transfercount     = [];
+                partitionice      = [];
+                partitionhydro    = [];
+                partitionocean    = [];
         end
         methods (Static)
@@ -85 +85 @@
                         %planet radius
                         self.planetradius= planetradius(planet);
-
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -113 +112 @@
                         WriteData(fid,prefix,'object',self,'fieldname','planetradius','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray');
-                        %WriteData(fid,prefix,'object',self,'fieldname','transfercount','data',self.transfercount,'format','DoubleMat','name', 'md.solidearth.transfercount','mattype',1);
-                        %WriteData(fid,prefix,'data',self.transfercount,'format','DoubleMat','name', 'md.solidearth.transfercount');
                         WriteData(fid,prefix,'object',self,'fieldname','transfercount','format','DoubleMat','mattype',1);
 

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

@@ -23 +23 @@
 
     def __init__(self, *args):  # {{{
-        self.settings  = solidearthsettings()
-        self.external  = None
-        self.lovenumbers = lovenumbers()
-        self.rotational = rotational()
-        self.planetradius = planetradius('earth')
+        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.transfercount     = []
+        self.transitions       = []
+        self.partitionice      = []
+        self.partitionhydro    = []
+        self.partitionocean    = []
 
         nargs = len(args)
@@ -47 +48 @@
         s += '{}\n'.format(fielddisplay(self, 'planetradius', 'planet radius [m]'))
         s += '{}\n'.format(fielddisplay(self, 'transitions', 'indices into parts of the mesh that will be icecaps'))
+        s += '{}\n'.format(fielddisplay(self, 'transfercount', 'number of icecaps vertices are part of'))
         s += '{}\n'.format(fielddisplay(self, 'requested_outputs', 'additional outputs requested'))
         s += '{}\n'.format(fielddisplay(self, 'partitionice', 'ice partition vector for barystatic contribution'))
@@ -69 +71 @@
         # Transitions should be a list
         self.transitions = []
+        self.transfercount = [0]
 
         # No partitions requested for barystatic contribution
@@ -105 +108 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'planetradius', 'format', 'Double')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'transitions', 'format', 'MatArray')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'transfercount', 'format', 'DoubleMat', 'mattype', 1)
 
         if len(self.partitionice):