Changeset 15564 for issm/trunk-jpl/src/m/classes/model/model.m

Timestamp:

07/23/13 14:23:07 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: hutter-> SIA macayeal->SSA pattyn->HO stokes->FS

File:

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

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

@@ -171 +171 @@
                                 md.flowequation.element_equation=project2d(md,md.flowequation.element_equation,1);
                                 md.flowequation.vertex_equation=project2d(md,md.flowequation.vertex_equation,1);
-                                md.flowequation.bordermacayeal=project2d(md,md.flowequation.bordermacayeal,1);
-                                md.flowequation.borderpattyn=project2d(md,md.flowequation.borderpattyn,1);
-                                md.flowequation.borderstokes=project2d(md,md.flowequation.borderstokes,1);
+                                md.flowequation.borderSSA=project2d(md,md.flowequation.borderSSA,1);
+                                md.flowequation.borderHO=project2d(md,md.flowequation.borderHO,1);
+                                md.flowequation.borderFS=project2d(md,md.flowequation.borderFS,1);
                         end     
 
@@ -262 +262 @@
                         %   It can either be a domain file (argus type, .exp extension), or an array of element flags. 
                         %   If user wants every element outside the domain to be 
-                        %   extract2d, add '~' to the name of the domain file (ex: '~Pattyn.exp');
+                        %   extract2d, add '~' to the name of the domain file (ex: '~HO.exp');
                         %   an empty string '' will be considered as an empty domain
                         %   a string 'all' will be considered as the entire domain
@@ -718 +718 @@
                                 md.flowequation.vertex_equation=project3d(md,'vector',oldvertices_type,'type','node');
                         end
-                        md.flowequation.bordermacayeal=project3d(md,'vector',md.flowequation.bordermacayeal,'type','node');
-                        md.flowequation.borderpattyn=project3d(md,'vector',md.flowequation.borderpattyn,'type','node');
-                        md.flowequation.borderstokes=project3d(md,'vector',md.flowequation.borderstokes,'type','node');
+                        md.flowequation.borderSSA=project3d(md,'vector',md.flowequation.borderSSA,'type','node');
+                        md.flowequation.borderHO=project3d(md,'vector',md.flowequation.borderHO,'type','node');
+                        md.flowequation.borderFS=project3d(md,'vector',md.flowequation.borderFS,'type','node');
 
                         %boundary conditions
@@ -882 +882 @@
                         if isfield(structmd,'artificial_diffusivity'), md.balancethickness.stabilization=structmd.artificial_diffusivity; end
                         if isfield(structmd,'dhdt'), md.balancethickness.thickening_rate=structmd.dhdt; end
-                        if isfield(structmd,'ishutter'), md.flowequation.ishutter=structmd.ishutter; end
-                        if isfield(structmd,'isstokes'), md.flowequation.isstokes=structmd.isstokes; end
+                        if isfield(structmd,'isSIA'), md.flowequation.isSIA=structmd.isSIA; end
+                        if isfield(structmd,'isFS'), md.flowequation.isFS=structmd.isFS; end
                         if isfield(structmd,'elements_type'), md.flowequation.element_equation=structmd.elements_type; end
                         if isfield(structmd,'vertices_type'), md.flowequation.vertex_equation=structmd.vertices_type; end