Changeset 24668 for issm/trunk-jpl/src/m/classes/friction.py

Timestamp:

03/17/20 06:04:30 (5 years ago)

Author:

bdef

Message:

BUG: fix in NeffLim and py syntax

File:

• issm/trunk-jpl/src/m/classes/friction.py (modified) (5 diffs)

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

@@ -19 +19 @@
         self.coupling = 0
         self.effective_pressure = float('NaN')
-        self.effective_pressure_limit = 0
-    #set defaults
+        self.effective_pressure_limit = 0
+        #set defaults
         self.setdefaultparameters()
         self.requested_outputs = []
@@ -33 +33 @@
         string = "%s\n%s" % (string, fielddisplay(self, 'coupling', 'Coupling flag 0: uniform sheet (negative pressure ok, default), 1: ice pressure only, 2: water pressure assuming uniform sheet (no negative pressure), 3: use provided effective_pressure, 4: used coupled model (not implemented yet)'))
         string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure', 'Effective Pressure for the forcing if not coupled [Pa]'))
-        string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure_limit','Neff do not allow to fall below a certain limit: effective_pressure_limit*rho_ice*g*thickness (default 0)'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure_limit', 'Neff do not allow to fall below a certain limit: effective_pressure_limit * rho_ice * g * thickness (default 0)'))
         string = "%s\n%s" % (string, fielddisplay(self, 'requested_outputs', 'additional outputs requested'))
         return string
@@ -52 +52 @@
     def setdefaultparameters(self):  # {{{
         self.requested_outputs = ['default']
-        self.effective_pressure_limit = 0
+        self.effective_pressure_limit = 0
         return self
     #}}}
@@ -71 +71 @@
         md = checkfield(md, 'fieldname', 'friction.p', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofelements])
         md = checkfield(md, 'fieldname', 'friction.coupling', 'numel', [1], 'values', [0, 1, 2, 3, 4])
-        md = checkfield(md, 'fieldname', 'friction.effective_pressure_limit','numel',[1],'>=',0)
+        md = checkfield(md, 'fieldname', 'friction.effective_pressure_limit', 'numel', [1], '>=', 0)
         if self.coupling == 3:
             md = checkfield(md, 'fieldname', 'friction.effective_pressure', 'NaN', 1, 'Inf', 1, 'timeseries', 1)
@@ -86 +86 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'q', 'format', 'DoubleMat', 'mattype', 2)
         WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'coupling', 'format', 'Integer')
-        WriteData(fid, prefix, 'object', self,'class','friction','fieldname','effective_pressure_limit','format','Double')
+        WriteData(fid, prefix, 'object', self, 'class', 'friction', 'fieldname', 'effective_pressure_limit', 'format', 'Double')
         if self.coupling == 3:
             WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'effective_pressure', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts)