source: issm/oecreview/Archive/22819-23185/ISSM-22874-22875.diff

Last change on this file was 23186, checked in by Mathieu Morlighem, 7 years ago

CHG: added Archive/22819-23185

File size: 1.4 KB
  • ../trunk-jpl/src/m/classes/friction.py

     
    3737                self.p=project3d(md,'vector',self.p,'type','element')
    3838                self.q=project3d(md,'vector',self.q,'type','element')
    3939                #if self.coupling==0: #doesnt work with empty loop, so just skip it?
    40                 if self.coupling==3:
     40                if self.coupling in[3,4]:
    4141                        self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1)
    42                 elif self.coupling==4:
    43                         raise ValueError('coupling not supported yet')
    4442                elif self.coupling > 4:
    4543                        raise ValueError('md.friction.coupling larger than 4, not supported yet')
    4644                return self
     
    7068                WriteData(fid,prefix,'object',self,'fieldname','p','format','DoubleMat','mattype',2)
    7169                WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2)
    7270                WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer')
    73                 if self.coupling==3:
     71                if self.coupling in[3,4]:
    7472                        WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
    7573                elif self.coupling > 4:
    7674                        raise ValueError('md.friction.coupling larger than 4, not supported yet')
Note: See TracBrowser for help on using the repository browser.