Changeset 25519

Timestamp:

09/02/20 19:30:52 (5 years ago)

Author:

jdquinn

Message:

CHG: MATLAB -> Python; formatting

Location:

issm/trunk-jpl/src/m/classes

Files:

• flowequation.m (modified) (1 diff)
• flowequation.py (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/flowequation.m

@@ -143 +143 @@
                         disp(sprintf('   flow equation parameters:'));
 
-                        fielddisplay(self,'isSIA','is the Shallow Ice Approximation (SIA) used ?');
-                        fielddisplay(self,'isSSA','is the Shelfy-Stream Approximation (SSA) used ?');
-                        fielddisplay(self,'isL1L2','is the L1L2 approximation used ?');
-                        fielddisplay(self,'isHO','is the Higher-Order (HO) approximation used ?');
-                        fielddisplay(self,'isFS','are the Full-FS (FS) equations used ?');
+                        fielddisplay(self,'isSIA','is the Shallow Ice Approximation (SIA) used?');
+                        fielddisplay(self,'isSSA','is the Shelfy-Stream Approximation (SSA) used?');
+                        fielddisplay(self,'isL1L2','is the L1L2 approximation used?');
+                        fielddisplay(self,'isHO','is the Higher-Order (HO) approximation used?');
+                        fielddisplay(self,'isFS','are the Full-FS (FS) equations used?');
                         fielddisplay(self,'isNitscheBC','is weakly imposed condition used?');
-                        fielddisplay(self,'FSNitscheGamma','Gamma value for the Nitsche term, by default gamma=1e6?');
+                        fielddisplay(self,'FSNitscheGamma','Gamma value for the Nitsche term (default: 1e6)');
                         fielddisplay(self,'fe_SSA','Finite Element for SSA  ''P1'', ''P1bubble'' ''P1bubblecondensed'' ''P2''');
                         fielddisplay(self,'fe_HO', 'Finite Element for HO   ''P1'' ''P1bubble'' ''P1bubblecondensed'' ''P1xP2'' ''P2xP1'' ''P2''');

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

@@ -1 +1 @@
 import numpy as np
+
+from checkfield import checkfield
+from fielddisplay import fielddisplay
+import MatlabFuncs as m
 from project3d import project3d
-from fielddisplay import fielddisplay
-from checkfield import checkfield
 from WriteData import WriteData
-import MatlabFuncs as m
 
 
 class flowequation(object):
-    """
-    FLOWEQUATION class definition
+    """FLOWEQUATION class definition
 
-       Usage:
-          flowequation = flowequation()
+    Usage:
+        flowequation = flowequation()
     """
 
     def __init__(self):  # {{{
-
         self.isSIA = 0
         self.isSSA = 0
@@ -22 +21 @@
         self.isHO = 0
         self.isFS = 0
+        self.isNitscheBC = 0
+        self.FSNitscheGamma = 1e-6
         self.fe_SSA = ''
         self.fe_HO = ''
@@ -42 +43 @@
 
     def __repr__(self):  # {{{
-        string = '   flow equation parameters:'
+        s = '   flow equation parameters:\n'
+        s += "{}\n".format(fielddisplay(self, 'isSIA', "is the Shallow Ice Approximation (SIA) used?"))
+        s += "{}\n".format(fielddisplay(self, 'isSSA', "is the Shelfy-Stream Approximation (SSA) used?"))
+        s += "{}\n".format(fielddisplay(self, 'isL1L2', "are L1L2 equations used?"))
+        s += "{}\n".format(fielddisplay(self, 'isHO', "is the Higher-Order (HO) approximation used?"))
+        s += "{}\n".format(fielddisplay(self, 'isFS', "are the Full-FS (FS) equations used?"))
+        s += "{}\n".format(fielddisplay(self, 'isNitscheBC', "is weakly imposed condition used?"))
+        s += "{}\n".format(fielddisplay(self, 'FSNitscheGamma', "Gamma value for the Nitsche term (default: 1e6)"))
+        s += "{}\n".format(fielddisplay(self, 'fe_SSA', "Finite Element for SSA: 'P1', 'P1bubble' 'P1bubblecondensed' 'P2'"))
+        s += "{}\n".format(fielddisplay(self, 'fe_HO', "Finite Element for HO:  'P1', 'P1bubble', 'P1bubblecondensed', 'P1xP2', 'P2xP1', 'P2', 'P2bubble', 'P1xP3', 'P2xP4'"))
+        s += "{}\n".format(fielddisplay(self, 'fe_FS', "Finite Element for FS:  'P1P1' (debugging only) 'P1P1GLS' 'MINIcondensed' 'MINI' 'TaylorHood' 'LATaylorHood' 'XTaylorHood'"))
+        s += "{}\n".format(fielddisplay(self, 'vertex_equation', "flow equation for each vertex"))
+        s += "{}\n".format(fielddisplay(self, 'element_equation', "flow equation for each element"))
+        s += "{}\n".format(fielddisplay(self, 'borderSSA', "vertices on SSA's border (for tiling)"))
+        s += "{}\n".format(fielddisplay(self, 'borderHO', "vertices on HO's border (for tiling)"))
+        s += "{}".format(fielddisplay(self, 'borderFS', "vertices on FS' border (for tiling)"))
 
-        string = "%s\n%s" % (string, fielddisplay(self, 'isSIA', "is the Shallow Ice Approximation (SIA) used ?"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'isSSA', "is the Shelfy - Stream Approximation (SSA) used ?"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'isL1L2', "are L1L2 equations used ?"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'isHO', "is the Higher - Order (HO) approximation used ?"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'isFS', "are the Full - FS (FS) equations used ?"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'fe_SSA', "Finite Element for SSA: 'P1', 'P1bubble' 'P1bubblecondensed' 'P2'"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'fe_HO', "Finite Element for HO:  'P1', 'P1bubble', 'P1bubblecondensed', 'P1xP2', 'P2xP1', 'P2', 'P2bubble', 'P1xP3', 'P2xP4'"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'fe_FS', "Finite Element for FS:  'P1P1' (debugging only) 'P1P1GLS' 'MINIcondensed' 'MINI' 'TaylorHood' 'LATaylorHood' 'XTaylorHood'"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'vertex_equation', "flow equation for each vertex"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'element_equation', "flow equation for each element"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'borderSSA', "vertices on SSA's border (for tiling)"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'borderHO', "vertices on HO's border (for tiling)"))
-        string = "%s\n%s" % (string, fielddisplay(self, 'borderFS', "vertices on FS' border (for tiling)"))
-        return string
+        return s
     #}}}
 
@@ -93 +96 @@
         md = checkfield(md, 'fieldname', 'flowequation.isHO', 'numel', [1], 'values', [0, 1])
         md = checkfield(md, 'fieldname', 'flowequation.isFS', 'numel', [1], 'values', [0, 1])
+        md = checkfield(md, 'fieldname', 'flowequation.isNitscheBC', 'numel', [1], 'values', [0, 1])
+        md = checkfield(md, 'fieldname', 'flowequation.FSNitscheGamma', 'numel', [1], '>=', 0.)
         md = checkfield(md, 'fieldname', 'flowequation.fe_SSA', 'values', ['P1', 'P1bubble', 'P1bubblecondensed', 'P2', 'P2bubble'])
         md = checkfield(md, 'fieldname', 'flowequation.fe_HO', 'values', ['P1', 'P1bubble', 'P1bubblecondensed', 'P1xP2', 'P2xP1', 'P2', 'P2bubble', 'P1xP3', 'P2xP4'])
@@ -132 +137 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'isHO', 'format', 'Boolean')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'isFS', 'format', 'Boolean')
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'fe_SSA', 'data', self.fe_SSA, 'format', 'String')
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'fe_HO', 'data', self.fe_HO, 'format', 'String')
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'fe_FS', 'data', self.fe_FS, 'format', 'String')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'isNitscheBC', 'format', 'Boolean')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'FSNitscheGamma', 'format', 'Double')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'fe_SSA', 'data', self.fe_SSA, 'format', 's')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'fe_HO', 'data', self.fe_HO, 'format', 's')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'fe_FS', 'data', self.fe_FS, 'format', 's')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'augmented_lagrangian_r', 'format', 'Double')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'augmented_lagrangian_rhop', 'format', 'Double')