Changeset 9646 for issm/trunk/src/m/classes/model/model.m

Timestamp:

09/07/11 09:36:52 (14 years ago)

Author:

seroussi

Message:

added class balancethickness

File:

• issm/trunk/src/m/classes/model/model.m (modified) (7 diffs)

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

@@ -30 +30 @@
                  materials = modelfield('default',0,'marshall',true);
                  mask = modelfield('default',0,'marshall',true);
+                 balancethickness = modelfield('default',0,'marshall',true);
 
                  %FIXME: all other fields should belong to other classes
@@ -122 +123 @@
                  spcvy          = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  spcvz          = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-                 spcthickness   = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  diagnostic_ref = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
 
@@ -130 +130 @@
                  vel_obs                   = modelfield('default',NaN,'marshall',false);
 
-                 dhdt                      = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  thickness_obs             = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
 
@@ -143 +142 @@
 
                  %Transient 
-                 artificial_diffusivity = modelfield('default',0,'marshall',true,'format','Integer');
                  isprognostic = modelfield('default',0,'marshall',true,'format','Boolean');
                  isdiagnostic = modelfield('default',0,'marshall',true,'format','Boolean');
@@ -411 +409 @@
                          if isfield(structmd,'nodeonicesheet'), md.mask.vertexongroundedice=structmd.nodeonicesheet; end
                          if isfield(structmd,'nodeonwater'), md.mask.vertexonwater=structmd.nodeonwater; end
+                         if isfield(structmd,'spcthickness'), md.balancethickness.spcthickness=structmd.spcthickness; end
+                         if isfield(structmd,'artificial_diffusivity'), md.balancethickness.stabilization=structmd.artificial_diffusivity; end
+                         if isfield(structmd,'dhdt'), md.balancethickness.thickening_rate=structmd.dhdt; end
 
                          %Field changes
@@ -532 +533 @@
                          md.materials=materials;
                          md.mask=mask;
-
-                         %Physical parameters
+                         md.balancethickness=balancethickness;
 
                          %Solver parameters
@@ -592 +592 @@
                          %parameter is often used.
                          md.min_mechanical_constraints=0;
-
-                         %the artificial diffusivity is used in prognostic to avoid
-                         %numerical wiggles of the solution.
-                         md.artificial_diffusivity=1;
 
                          %Solution activated for transient runs. By default we do a