Changeset 22758 for issm/trunk/src/m/classes/friction.py

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/friction.py (modified) (6 diffs)

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

@@ +1 @@
+import numpy as np
 from fielddisplay import fielddisplay
 from project3d import project3d
@@ -16 +17 @@
                 self.p           = float('NaN')
                 self.q           = float('NaN')
-
+                self.coupling    = 0
+                self.effective_pressure = float('NaN')
                 #set defaults
                 self.setdefaultparameters()
@@ -22 +24 @@
                 #}}}
         def __repr__(self): # {{{
-                string="Basal shear stress parameters: Sigma_b = coefficient^2 * Neff ^r * |u_b|^(s-1) * u_b,\n(effective stress Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p)"
+                string="Basal shear stress parameters: Sigma_b = coefficient^2 * Neff ^r * |u_b|^(s-1) * u_b,\n(effective stress Neff=rho_ice*g*thickness+rho_water*g*base, r=q/p and s=1/p)"
 
                 string="%s\n%s"%(string,fielddisplay(self,"coefficient","friction coefficient [SI]"))
                 string="%s\n%s"%(string,fielddisplay(self,"p","p exponent"))
                 string="%s\n%s"%(string,fielddisplay(self,"q","q exponent"))
+                string="%s\n%s"%(string,fielddisplay(self,'coupling','Coupling flag: 0 for default, 1 for forcing(provide md.friction.effective_pressure)  and 2 for coupled(not implemented yet)'))
+                string="%s\n%s"%(string,fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]'))
                 return string
                 #}}}
@@ -33 +37 @@
                 self.p=project3d(md,'vector',self.p,'type','element')
                 self.q=project3d(md,'vector',self.q,'type','element')
+                #if self.coupling==0: #doesnt work with empty loop, so just skip it?
+                if self.coupling==1:
+                        self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',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')       
                 return self
         #}}}
@@ -47 +58 @@
                 md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
                 md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
-
+                md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0,1,2])
+                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')
                 return md
         # }}}
@@ -55 +72 @@
                 WriteData(fid,prefix,'object',self,'fieldname','p','format','DoubleMat','mattype',2)
                 WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2)
+                WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer')
+                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')                       
         # }}}