Changeset 20500 for issm/trunk/src/m/classes/frictionwaterlayer.m

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/frictionwaterlayer.m (modified) (4 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/src/m/classes/frictionwaterlayer.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 coefficient = NaN;
+                f           = NaN;
                 p           = NaN;
                 q           = NaN;
@@ -30 +31 @@
                         if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
 
-                        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1);
-                        md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]);
-                        md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]);
-                        md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1,'>=',0.);
+                        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','friction.f','size',[1 1],'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
+                        md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
+                        md = checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1,'>=',0.);
 
                 end % }}}
@@ -45 +47 @@
                         disp(sprintf('Basal shear stress parameters: tau_b = coefficient^2 * Neff ^r * |u_b|^(s-1) * u_b * 1/f(T)\n(effective stress Neff=rho_ice*g*thickness+rho_water*g*(bed+water_layer), r=q/p and s=1/p)'));
                         fielddisplay(self,'coefficient','frictiontemp coefficient [SI]');
+                        fielddisplay(self,'f','f variable for effective pressure');
                         fielddisplay(self,'p','p exponent');
                         fielddisplay(self,'q','q exponent');
@@ -53 +56 @@
                         WriteData(fid,'enum',FrictionLawEnum,'data',5,'format','Integer');
                         WriteData(fid,'class','friction','object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
+                        WriteData(fid,'class','friction','object',self,'fieldname','f','format','Double');
                         WriteData(fid,'class','friction','object',self,'fieldname','p','format','DoubleMat','mattype',2);
                         WriteData(fid,'class','friction','object',self,'fieldname','q','format','DoubleMat','mattype',2);

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad