Changeset 6949

Timestamp:

01/05/11 11:30:38 (14 years ago)

Author:

seroussi

Message:

added hydrostatic adjustment in serial

Location:

issm/trunk/src/m

Files:

• classes/@model/model.m (modified) (1 diff)
• classes/@model/setdefaultparameters.m (modified) (1 diff)
• enum/HydrostaticAdjustmentEnum.m (added)
• enum/IncrementalEnum.m (added)
• model/display/displaytransient.m (modified) (1 diff)
• model/marshall.m (modified) (1 diff)

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

@@ -198 +198 @@
         md.timeacc=0;
         md.timedec=0;
+        md.hydrostatic_adjustment=0;
 
         %Control

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

@@ -131 +131 @@
 md.cfl_coefficient=1/2;
 
+%Hydrostatic adjustment
+md.hydrostatic_adjustment=AbsoluteEnum;
 %the artificial diffusivity is used in prognostic to avoid
 %numerical wiggles of the solution.

issm/trunk/src/m/model/display/displaytransient.m

@@ -28 +28 @@
 fielddisplay(md,'time_adapt','compute new time step each iteration, using CFL criterion');
 fielddisplay(md,'cfl_coefficient','CFL coefficient');
+fielddisplay(md,'hydrostatic_adjstment','type of adjustment for ice shelves update');

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

@@ -131 +131 @@
 WriteData(fid,md.time_adapt,'Integer','time_adapt');
 WriteData(fid,md.cfl_coefficient,'Scalar','cfl_coefficient');
+WriteData(fid,md.hydrostatic_adjustment,'Integer','hydrostatic_adjustment');
 WriteData(fid,md.penalty_offset,'Scalar','penalty_offset');
 WriteData(fid,md.penalty_melting,'Scalar','penalty_melting');