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

Timestamp:

09/06/11 11:11:00 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added friction object

File:

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

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

@@ -16 +16 @@
                  flaim     = modelfield('default',0,'marshall',false);
                  surfaceforcings = modelfield('default',0,'marshall',true);
+                 friction  = modelfield('default',0,'marshall',true);
 
                  %FIXME: all other fields should belong to other classes
@@ -119 +120 @@
                  %Physical parameters
 
-                 drag_coefficient = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-                 drag_p           = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2);
-                 drag_q           = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2);
                  rheology_B       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  rheology_n       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2);
@@ -408 +406 @@
 
                          %Field name change
-                         if isfield(structmd,'drag'), md.drag_coefficient=structmd.drag; end
-                         if isfield(structmd,'p'), md.drag_p=structmd.p; end
-                         if isfield(structmd,'q'), md.drag_q=structmd.p; end
+                         if isfield(structmd,'drag'), md.friction.coefficient=structmd.drag; end
+                         if isfield(structmd,'p'), md.friction.p=structmd.p; end
+                         if isfield(structmd,'q'), md.friction.q=structmd.p; end
                          if isfield(structmd,'B'), md.rheology_B=structmd.B; end
                          if isfield(structmd,'n'), md.rheology_n=structmd.n; end
@@ -438 +436 @@
                          if isfield(structmd,'dakota_analysis'), md.dakota_analysis=structmd.dakota_analysis; end
                          if isfield(structmd,'surface_mass_balance'), md.surfaceforcings.mass_balance=structmd.surface_mass_balance; end
+                         if isfield(structmd,'drag_coefficient'), md.friction.coefficient=structmd.drag_coefficient; end
+                         if isfield(structmd,'drag_p'), md.friction.p=structmd.drag_p; end
+                         if isfield(structmd,'drag_q'), md.friction.q=structmd.drag_q; end
 
                          %Field changes
@@ -489 +490 @@
                          end
                          if isnumeric(md.control_type),
-                                 if (structmd.control_type==143), md.control_type={'DragCoefficient'}; end
+                                 if (structmd.control_type==143), md.control_type={'FrictionCoefficient'}; end
                                  if (structmd.control_type==190), md.control_type={'RheologyBbar'}; end
                                  if (structmd.control_type==147), md.control_type={'Dhdt'}; end
@@ -545 +546 @@
                          md.flaim=flaim;
                          md.surfaceforcings=surfaceforcings;
+                         md.friction=friction;
 
                          %Materials parameters
@@ -674 +676 @@
                          %parameter to be inferred by control methods (only
                          %drag and B are supported yet)
-                         md.control_type={'DragCoefficient'};
+                         md.control_type={'FrictionCoefficient'};
 
                          %number of steps in the control methods