Changeset 18779

Timestamp:

11/13/14 09:55:54 (10 years ago)

Author:

bdef

Message:

NEW:Adding FrictionEffectivPressureEnum

Location:

issm/trunk-jpl/src/m

Files:

• classes/frictionhydro.m (modified) (3 diffs)
• enum/EnumDefinitions.py (modified) (1 diff)
• enum/FrictionEffectivePressureEnum.m (added)

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

@@ -6 +6 @@
 classdef frictionhydro
         properties (SetAccess=public) 
-                q  = NaN;
-                C  = NaN;
-                As = NaN;
+                q                  = NaN;
+                C                  = NaN;
+                As                 = NaN;
+                effective_pressure = NaN; 
         end
         methods
@@ -35 +36 @@
                         fielddisplay(obj,'C','friction law max value [SI]');
                         fielddisplay(obj,'As','Sliding Parameter without cavitation [m Pa^-n s^-1]');
+                        fielddisplay(obj,'effecitve_pressure','Effective Pressure [Pa]');
                 end % }}}
                 function marshall(obj,md,fid) % {{{
@@ -41 +43 @@
                         WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',2);
                         WriteData(fid,'class','friction','object',obj,'fieldname','As','format','DoubleMat','mattype',2);
+                        WriteData(fid,'class','friction','object',obj,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
                 end % }}}
         end

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -97 +97 @@
 def FrictionGammaEnum(): return StringToEnum("FrictionGamma")[0]
 def FrictionWaterLayerEnum(): return StringToEnum("FrictionWaterLayer")[0]
+def FrictionEffectivePressureEnum(): return StringToEnum("FrictionEffectivePressure")[0]
 def GeometryHydrostaticRatioEnum(): return StringToEnum("GeometryHydrostaticRatio")[0]
 def HydrologyModelEnum(): return StringToEnum("HydrologyModel")[0]