Changeset 23621

Timestamp:

01/10/19 07:13:42 (6 years ago)

Author:

sjohnsen

Message:

CHG: enable FrictionCoupling flag 4

File:

• issm/trunk-jpl/src/m/classes/friction.m (modified) (4 diffs)

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

@@ -24 +24 @@
                                         self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1);
                                 case 4
-                                        error('not implemented yet');
+                                        self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1);
                                 otherwise
                                         error('not supported yet');             
@@ -61 +61 @@
                                         md = checkfield(md,'fieldname','friction.effective_pressure','NaN',1,'Inf',1,'timeseries',1);
                                 case 4
-                                        error('not implemented yet');
+                                
                                 otherwise
                                         error('not supported yet');             
@@ -72 +72 @@
                         fielddisplay(self,'q','q exponent');
                         fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]');
-                        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)');
+                        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: use coupled model (not implemented yet)');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -89 +89 @@
                                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                                 case 4
-                                        error('not implemented yet');
+                                        WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                                 otherwise
                                         error('not supported yet');