Changeset 22842

Timestamp:

06/13/18 02:12:13 (7 years ago)

Author:

bdef

Message:

NEW: removing not implemented error in coupling after result check

File:

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

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

@@ -17 +17 @@
                 self.p           = float('NaN')
                 self.q           = float('NaN')
-                self.coupling    = 0
-                self.effective_pressure = float('NaN')
+                self.coupling    = 0
+                self.effective_pressure = float('NaN')
                 #set defaults
                 self.setdefaultparameters()
@@ -43 +43 @@
                         raise ValueError('coupling not supported yet')
                 elif self.coupling > 2:
-                        raise ValueError('md.friction.coupling larger than 2, not supported yet')       
+                        raise ValueError('md.friction.coupling larger than 2, not supported yet')
                 return self
         #}}}
@@ -61 +61 @@
                 if self.coupling==1:
                         md = checkfield(md,'fieldname','friction.effective_pressure','NaN',1,'Inf',1,'timeseries',1)
-                elif self.coupling==2:
-                        raise ValueError('coupling not supported yet')
                 elif self.coupling > 2:
                         raise ValueError('md.friction.coupling larger than 2, not supported yet')
@@ -75 +73 @@
                 if self.coupling==1:
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
-                elif self.coupling==2:
-                        raise ValueError('coupling not supported yet')
                 elif self.coupling > 2:
-                        raise ValueError('md.friction.coupling larger than 2, not supported yet')                       
+                        raise ValueError('md.friction.coupling larger than 2, not supported yet')
         # }}}