Changeset 7407

Timestamp:

02/09/11 16:53:39 (14 years ago)

Author:

seroussi

Message:

added shelf_dampening field in model

Location:

issm/trunk/src/m

Files:

• classes/model.m (modified) (2 diffs)
• model/marshall.m (modified) (1 diff)

issm/trunk/src/m/classes/model.m

@@ -78 +78 @@
                  borderstokes=NaN;
 
-                 %Stokes mesh
+                 %Stokes
                  stokesreconditioning=0;
+                 shelf_dampening=0;
 
                  %Penalties
@@ -549 +550 @@
                          md.verbose=verbose('solution',true,'qmu',true,'control',true);
 
-                         %Stokes mesh
+                         %Stokes
                          md.stokesreconditioning=10^13;
+                         md.shelf_dampening=0;
 
                          %Penalties

issm/trunk/src/m/model/marshall.m

@@ -146 +146 @@
 WriteData(fid,md.viscosity_overshoot,'Scalar','viscosity_overshoot');
 WriteData(fid,md.stokesreconditioning,'Scalar','stokesreconditioning');
+WriteData(fid,md.shelf_dampening,'Integer','shelf_dampening');
 WriteData(fid,md.waitonlock,'Scalar','waitonlock');
 WriteData(fid,md.kff,'Integer','kff');