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
RevLine 
[23186]1Index: ../trunk-jpl/src/m/classes/friction.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/friction.py (revision 22874)
4+++ ../trunk-jpl/src/m/classes/friction.py (revision 22875)
5@@ -37,10 +37,8 @@
6 self.p=project3d(md,'vector',self.p,'type','element')
7 self.q=project3d(md,'vector',self.q,'type','element')
8 #if self.coupling==0: #doesnt work with empty loop, so just skip it?
9- if self.coupling==3:
10+ if self.coupling in[3,4]:
11 self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1)
12- elif self.coupling==4:
13- raise ValueError('coupling not supported yet')
14 elif self.coupling > 4:
15 raise ValueError('md.friction.coupling larger than 4, not supported yet')
16 return self
17@@ -70,7 +68,7 @@
18 WriteData(fid,prefix,'object',self,'fieldname','p','format','DoubleMat','mattype',2)
19 WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2)
20 WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer')
21- if self.coupling==3:
22+ if self.coupling in[3,4]:
23 WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
24 elif self.coupling > 4:
25 raise ValueError('md.friction.coupling larger than 4, not supported yet')
Note: See TracBrowser for help on using the repository browser.