Changeset 21676

Timestamp:

04/18/17 10:08:39 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing amr indentation

Location:

issm/trunk-jpl/src/m/classes

Files:

• amr.py (modified) (1 diff)
• bamgmesh.m (modified) (1 diff)
• bamgmesh.py (modified) (2 diffs)

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

@@ -4 +4 @@
 
 class amr(object):
-   """
-   AMR Class definition
+    """
+    AMR Class definition
 
-      Usage:
-         amr=amr();
-   """
+    Usage:
+        amr=amr();
+    """
 
-   def __init__(self): # {{{
-      self.level_max                    = 0.
-      self.region_level_1       = 0.
-      self.region_level_max     = 0.
+    def __init__(self): # {{{
+        self.level_max        = 0.
+        self.region_level_1   = 0.
+        self.region_level_max = 0.
 
-      #set defaults
-      self.setdefaultparameters()
+        #set defaults
+        self.setdefaultparameters()
+    #}}}
+    def __repr__(self): # {{{
+        string="   amr parameters:"
+        string="%s\n%s"%(string,fielddisplay(self,"level_max","maximum refinement level (1, 2, 3 or 4)"))
+        string="%s\n%s"%(string,fielddisplay(self,"region_level_1","region which will be refined once (level 1) [ m ]"))
+        string="%s\n%s"%(string,fielddisplay(self,"region_level_max","region which will be refined with level_max [ m ]"))
+        return string
+    #}}}
+    def setdefaultparameters(self): # {{{
 
-      #}}}
-        def __repr__(self): # {{{
-      string="   amr parameters:"
-      string="%s\n%s"%(string,fielddisplay(self,"level_max","maximum refinement level (1, 2, 3 or 4)"))
-      string="%s\n%s"%(string,fielddisplay(self,"region_level_1","region which will be refined once (level 1) [ m ]"))
-      string="%s\n%s"%(string,fielddisplay(self,"region_level_max","region which will be refined with level_max [ m ]"))
-        return string
-      #}}}
-        def setdefaultparameters(self): # {{{
+        #level_max: 2 to 4
+        self.level_max=2
 
-                #level_max: 2 to 4
-      self.level_max=2
+        #region_level_1: region around (m) the discontinuity (grounding line or ice front) where the mesh will be refined once (h=1).
+        self.region_level_1=20000.
 
-      #region_level_1: region around (m) the discontinuity (grounding line or ice front) where the mesh will be refined once (h=1).
-      self.region_level_1=20000.
+        #region_level_max: region around (m) the discontinuity (grounding line or ice front) where the mesh will be refined with max level of refinement (h=level_max).
+        self.region_level_max=15000.
 
-      #region_level_max: region around (m) the discontinuity (grounding line or ice front) where the mesh will be refined with max level of refinement (h=level_max).
-      self.region_level_max=15000.
-      
-        return self
-   #}}}
-   def checkconsistency(self,md,solution,analyses):    # {{{
+        return self
+        #}}}
+    def checkconsistency(self,md,solution,analyses):    # {{{
+        md = checkfield(md,'fieldname','amr.level_max','numel',[1],'>=',0,'<=',4)
+        md = checkfield(md,'fieldname','amr.region_level_1','numel',[1],'>',0,'NaN',1,'Inf',1)
+        md = checkfield(md,'fieldname','amr.region_level_max','numel',[1],'>',0,'NaN',1,'Inf',1)
+                #it was adopted 20% of the region_level_1
+        if self.region_level_1-self.region_level_max<0.2*self.region_level_1:
+            md.checkmessage("region_level_max should be lower than 80% of region_level_1")
 
-      md = checkfield(md,'fieldname','amr.level_max','numel',[1],'>=',0,'<=',4)
-      md = checkfield(md,'fieldname','amr.region_level_1','numel',[1],'>',0,'NaN',1,'Inf',1)
-      md = checkfield(md,'fieldname','amr.region_level_max','numel',[1],'>',0,'NaN',1,'Inf',1)
-                #it was adopted 20% of the region_level_1
-      if self.region_level_1-self.region_level_max<0.2*self.region_level_1:
-         md.checkmessage("region_level_max should be lower than 80% of region_level_1")
-
-   return md
-   # }}}
-   def marshall(self,prefix,md,fid):    # {{{
-
-      WriteData(fid,prefix,'object',self,'fieldname','level_max','format','Integer')
-      WriteData(fid,prefix,'object',self,'fieldname','region_level_1','format','Double')
-      WriteData(fid,prefix,'object',self,'fieldname','region_level_max','format','Double')
-   # }}}
+        return md
+    # }}}
+    def marshall(self,prefix,md,fid):    # {{{
+        WriteData(fid,prefix,'object',self,'fieldname','level_max','format','Integer')
+        WriteData(fid,prefix,'object',self,'fieldname','region_level_1','format','Double')
+        WriteData(fid,prefix,'object',self,'fieldname','region_level_max','format','Double')
+    # }}}

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

@@ -10 +10 @@
                 Edges=[];
                 Triangles=[];
-                Quadrilaterals=[];
                 IssmEdges=[];
                 IssmSegments=[];

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

@@ -13 +13 @@
                 self.Edges=np.empty((0,3))
                 self.Triangles=np.empty((0,0))
-                self.Quadrilaterals=np.empty((0,0))
                 self.IssmEdges=np.empty((0,0))
                 self.IssmSegments=np.empty((0,0))
@@ -45 +44 @@
                 s+="    Edges: %s\n" % str(self.Edges)
                 s+="    Triangles: %s\n" % str(self.Triangles)
-                s+="    Quadrilaterals: %s\n" % str(self.Quadrilaterals)
                 s+="    IssmEdges: %s\n" % str(self.IssmEdges)
                 s+="    IssmSegments: %s\n" % str(self.IssmSegments)