Changeset 18798

Timestamp:

11/17/14 13:57:34 (10 years ago)

Author:

bdef

Message:

CHG: Adding friction law and clean up

File:

• issm/trunk-jpl/src/m/classes/model.m (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/model.m ¶

@@ -202 +202 @@
                                 md.friction.C=project2d(md,md.friction.C,1);
                                 md.friction.As=project2d(md,md.friction.As,1);
+                                md.friction.effective_pressure=project2d(md,md.friction.effective_pressure,1);
                         elseif isa(md.friction,'frictionwaterlayer'),
                                 md.friction.coefficient=project2d(md,md.friction.coefficient,1);
@@ -762 +763 @@
                                 md.friction.C=project3d(md,'vector',md.friction.C,'type','element');
                                 md.friction.As=project3d(md,'vector',md.friction.As,'type','element');
+                                md.friction.effective_pressure=project3d(md,'vector',md.friction.effective_pressure,'type','node','layer',1);
                         elseif isa(md.friction,'frictionwaterlayer'),
                                 md.friction.coefficient=project3d(md,'vector',md.friction.coefficient,'type','node','layer',1);