Changeset 24668

Timestamp:

03/17/20 06:04:30 (5 years ago)

Author:

bdef

Message:

BUG: fix in NeffLim and py syntax

Location:

issm/trunk-jpl/src

Files:

• c/classes/Loads/Friction.cpp (modified) (3 diffs)
• m/classes/friction.py (modified) (5 diffs)
• m/classes/frictioncoulomb.py (modified) (5 diffs)
• m/classes/frictionhydro.py (modified) (5 diffs)
• m/classes/frictionweertman.py (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

@@ -610 +610 @@
 void Friction::GetAlpha2Schoof(IssmDouble* palpha2, Gauss* gauss){/*{{{*/
 
-        /*This routine calculates the basal friction coefficient 
+        /*This routine calculates the basal friction coefficient
          *
          *               C |u_b|^(m-1)
@@ -643 +643 @@
 void Friction::GetAlpha2Tsai(IssmDouble* palpha2, Gauss* gauss){/*{{{*/
 
-        /*This routine calculates the basal friction coefficient 
+        /*This routine calculates the basal friction coefficient
          *
          * alpha2= min(C |ub|^m , f N ) / |ub|
@@ -727 +727 @@
                 case 3:
                         element->GetInputValue(&Neff,gauss,FrictionEffectivePressureEnum);
-                        p_ice = 0.; // FIXME
+                        element->GetInputValue(&thickness, gauss,ThicknessEnum);
+                        IssmDouble rho_ice   = element->FindParam(MaterialsRhoIceEnum);
+                        IssmDouble gravity   = element->FindParam(ConstantsGEnum);
+                        p_ice   = gravity*rho_ice*thickness;
                         break;
                 case 4:
                         element->GetInputValue(&Neff,gauss,EffectivePressureEnum);
-                        p_ice = 0.; // FIXME
+                        element->GetInputValue(&thickness, gauss,ThicknessEnum);
+                        IssmDouble rho_ice   = element->FindParam(MaterialsRhoIceEnum);
+                        IssmDouble gravity   = element->FindParam(ConstantsGEnum);
+                        p_ice   = gravity*rho_ice*thickness;
                         break;
                 default:

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

@@ -19 +19 @@
         self.coupling = 0
         self.effective_pressure = float('NaN')
-        self.effective_pressure_limit = 0
-    #set defaults
+        self.effective_pressure_limit = 0
+        #set defaults
         self.setdefaultparameters()
         self.requested_outputs = []
@@ -33 +33 @@
         string = "%s\n%s" % (string, fielddisplay(self, 'coupling', 'Coupling flag 0: uniform sheet (negative pressure ok, default), 1: ice pressure only, 2: water pressure assuming uniform sheet (no negative pressure), 3: use provided effective_pressure, 4: used coupled model (not implemented yet)'))
         string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure', 'Effective Pressure for the forcing if not coupled [Pa]'))
-        string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure_limit','Neff do not allow to fall below a certain limit: effective_pressure_limit*rho_ice*g*thickness (default 0)'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure_limit', 'Neff do not allow to fall below a certain limit: effective_pressure_limit * rho_ice * g * thickness (default 0)'))
         string = "%s\n%s" % (string, fielddisplay(self, 'requested_outputs', 'additional outputs requested'))
         return string
@@ -52 +52 @@
     def setdefaultparameters(self):  # {{{
         self.requested_outputs = ['default']
-        self.effective_pressure_limit = 0
+        self.effective_pressure_limit = 0
         return self
     #}}}
@@ -71 +71 @@
         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, 3, 4])
-        md = checkfield(md, 'fieldname', 'friction.effective_pressure_limit','numel',[1],'>=',0)
+        md = checkfield(md, 'fieldname', 'friction.effective_pressure_limit', 'numel', [1], '>=', 0)
         if self.coupling == 3:
             md = checkfield(md, 'fieldname', 'friction.effective_pressure', 'NaN', 1, 'Inf', 1, 'timeseries', 1)
@@ -86 +86 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'q', 'format', 'DoubleMat', 'mattype', 2)
         WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'coupling', 'format', 'Integer')
-        WriteData(fid, prefix, 'object', self,'class','friction','fieldname','effective_pressure_limit','format','Double')
+        WriteData(fid, prefix, 'object', self, 'class', 'friction', 'fieldname', 'effective_pressure_limit', 'format', 'Double')
         if self.coupling == 3:
             WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'effective_pressure', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts)

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

@@ -20 +20 @@
         self.coupling = 0
         self.effective_pressure = float('NaN')
-        self.effective_pressure_limit = 0
+        self.effective_pressure_limit = 0
     #set defaults
         self.setdefaultparameters()
@@ -33 +33 @@
         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]'))
-        string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure_limit','Neff do not allow to fall below a certain limit: effective_pressure_limit*rho_ice*g*thickness (default 0)'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure_limit', 'Neff do not allow to fall below a certain limit: effective_pressure_limit * rho_ice * g * thickness (default 0)'))
         return string
     #}}}
@@ -52 +52 @@
 
     def setdefaultparameters(self):  # {{{
-        self.effective_pressure_limit = 0
-        return self
+        self.effective_pressure_limit = 0
+    return self
     #}}}
 
@@ -65 +65 @@
         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.effective_pressure_limit','numel',[1],'>=',0)
+        md = checkfield(md, 'fieldname', 'friction.effective_pressure_limit', 'numel', [1], '>=', 0)
         if self.coupling == 1:
             md = checkfield(md, 'fieldname', 'friction.effective_pressure', 'NaN', 1, 'Inf', 1, 'timeseries', 1)
@@ -82 +82 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'q', 'format', 'DoubleMat', 'mattype', 2)
         WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'coupling', 'format', 'Integer')
-        WriteData(fid, prefix, 'object', self,'class','friction','fieldname','effective_pressure_limit','format','Double')
+        WriteData(fid, prefix, 'object', self, 'class', 'friction', 'fieldname', 'effective_pressure_limit', 'format', 'Double')
         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)

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

@@ -19 +19 @@
         self.As = np.nan
         self.effective_pressure = np.nan
-        self.effective_pressure_limit = 0
-    #set defaults
-
+        self.effective_pressure_limit = 0
+        #set defaults
         self.setdefaultparameters()
     # }}}
@@ -32 +31 @@
         string = "%s\n%s" % (string, fielddisplay(self, 'As', 'Sliding Parameter without cavitation [m Pa^ - n s^ - 1]'))
         string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure', 'Effective Pressure for the forcing if not coupled [Pa]'))
-        string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure_limit','Neff do not allow to fall below a certain limit: effective_pressure_limit*rho_ice*g*thickness (default 0)'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'effective_pressure_limit', 'Neff do not allow to fall below a certain limit: effective_pressure_limit * rho_ice * g * thickness (default 0)'))
 
         return string
@@ -51 +50 @@
         self.coupling = 0
         self.effective_pressure = np.nan
-        self.effective_pressure_limit = 0
+        self.effective_pressure_limit = 0
         return self
     # }}}
@@ -64 +63 @@
         md = checkfield(md, 'fieldname', 'friction.C', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofelements])
         md = checkfield(md, 'fieldname', 'friction.As', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofelements])
-        md = checkfield(md, 'fieldname', 'friction.effective_pressure_limit','numel',[1],'>=',0)
+        md = checkfield(md, 'fieldname', 'friction.effective_pressure_limit', 'numel', [1], '>=', 0)
         if self.coupling == 3:
             md = checkfield(md, 'fieldname', 'friction.effective_pressure', 'NaN', 1, 'Inf', 1, 'timeseries', 1)
@@ -77 +76 @@
         WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'C', 'format', 'DoubleMat', 'mattype', 2)
         WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'As', 'format', 'DoubleMat', 'mattype', 2)
-        WriteData(fid, prefix, 'object', self,'class','friction','fieldname','effective_pressure_limit','format','Double')
+        WriteData(fid, prefix, 'object', self, 'class', 'friction', 'fieldname', 'effective_pressure_limit', 'format', 'Double')
         if self.coupling in[3, 4]:
             WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'effective_pressure', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts)

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

@@ -22 +22 @@
 
     def __repr__(self):  # {{{
-        string = "Weertman sliding law parameters: Sigma_b = C^(-1 / m) * |u_b|^(1 / m - 1) * u_b"
+        string = "Weertman sliding law parameters: Sigma_b = C^(- 1 / m) * |u_b|^(1 / m - 1) * u_b"
 
         string = "%s\n%s" % (string, fielddisplay(self, "C", "friction coefficient [SI]"))