Changeset 18197

Timestamp:

06/30/14 14:38:11 (11 years ago)

Author:

seroussi

Message:

NEW: names in augmented lagrangian

Location:

issm/trunk-jpl/src/m/classes

Files:

• flowequation.m (modified) (3 diffs)
• flowequation.py (modified) (3 diffs)

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

@@ -6 +6 @@
 classdef flowequation
         properties (SetAccess=public) 
-                isSIA            = 0;
-                isSSA            = 0;
-                isL1L2           = 0;
-                isHO             = 0;
-                isFS             = 0;
-                fe_SSA           = '';
-                fe_HO            = '';
-                fe_FS            = '';
-                XTH_r            = 1.;
-                XTH_theta        = 0.;
-                vertex_equation  = NaN;
-                element_equation = NaN;
-                borderSSA        = NaN;
-                borderHO         = NaN;
-                borderFS         = NaN;
+                isSIA                  = 0;
+                isSSA                  = 0;
+                isL1L2                 = 0;
+                isHO                   = 0;
+                isFS                   = 0;
+                fe_SSA                 = '';
+                fe_HO                  = '';
+                fe_FS                  = '';
+                augmented_lagrangian_r = 1.;
+                XTH_theta              = 0.;
+                vertex_equation        = NaN;
+                element_equation       = NaN;
+                borderSSA              = NaN;
+                borderHO               = NaN;
+                borderFS               = NaN;
         end
         methods (Static)
@@ -135 +135 @@
                                 md = checkfield(md,'fieldname','flowequation.fe_HO' ,'values',{'P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P2bubble','P1xP3','P2xP4'});
                                 md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',{'P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','LATaylorHood','XTaylorHood','OneLayerP4z','CrouzeixRaviart'});
-                                md = checkfield(md,'fieldname','flowequation.XTH_r','numel',[1],'>',0.);
+                                md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_r','numel',[1],'>=',0.);
                                 md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',0.5);
                                 md = checkfield(md,'fieldname','flowequation.borderSSA','size',[md.mesh.numberofvertices 1],'values',[0 1]);
@@ -192 +192 @@
                         WriteData(fid,'enum',FlowequationFeHOEnum() ,'data',StringToEnum(obj.fe_HO) ,'format','Integer');
                         WriteData(fid,'enum',FlowequationFeFSEnum() ,'data',StringToEnum(obj.fe_FS) ,'format','Integer');
-                        WriteData(fid,'enum',AugmentedLagrangianREnum() ,'data',obj.XTH_r ,'format','Double');
+                        WriteData(fid,'enum',AugmentedLagrangianREnum(),'data',obj.augmented_lagrangian_r ,'format','Double');
                         WriteData(fid,'enum',AugmentedLagrangianThetaEnum() ,'data',obj.XTH_theta ,'format','Double');
                         WriteData(fid,'object',obj,'fieldname','borderSSA','format','DoubleMat','mattype',1);

issm/trunk-jpl/src/m/classes/flowequation.py

@@ -17 +17 @@
         def __init__(self): # {{{
                 
-                self.isSIA            = 0
-                self.isSSA            = 0
-                self.isL1L2           = 0
-                self.isHO             = 0
-                self.isFS             = 0
-                self.fe_SSA           = ''
-                self.fe_HO            = ''
-                self.fe_FS            = ''
-                self.XTH_r            = 1.
-                self.XTH_theta        = 0.
-                self.vertex_equation  = float('NaN')
-                self.element_equation = float('NaN')
-                self.borderSSA        = float('NaN')
-                self.borderHO         = float('NaN')
-                self.borderFS         = float('NaN')
+                self.isSIA                   = 0
+                self.isSSA                   = 0
+                self.isL1L2                  = 0
+                self.isHO                    = 0
+                self.isFS                    = 0
+                self.fe_SSA                  = ''
+                self.fe_HO                   = ''
+                self.fe_FS                   = ''
+                self.augmented_lagrangian_r  = 1.
+                self.XTH_theta               = 0.
+                self.vertex_equation         = float('NaN')
+                self.element_equation        = float('NaN')
+                self.borderSSA               = float('NaN')
+                self.borderHO                = float('NaN')
+                self.borderFS                = float('NaN')
 
                 #set defaults
@@ -82 +82 @@
                         md = checkfield(md,'fieldname','flowequation.borderHO','size',[md.mesh.numberofvertices],'values',[0,1])
                         md = checkfield(md,'fieldname','flowequation.borderFS','size',[md.mesh.numberofvertices],'values',[0,1])
-                        md = checkfield(md,'fieldname','flowequation.XTH_r','numel',[1],'>',0.)
+                        md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_r','numel',[1],'>',0.)
                         md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',.5)
                         if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'):
@@ -111 +111 @@
                 WriteData(fid,'enum',FlowequationFeHOEnum() ,'data',StringToEnum(self.fe_HO)[0] ,'format','Integer')
                 WriteData(fid,'enum',FlowequationFeFSEnum() ,'data',StringToEnum(self.fe_FS)[0] ,'format','Integer')
-                WriteData(fid,'enum',AugmentedLagrangianREnum() ,'data',self.XTH_r ,'format','Double')
+                WriteData(fid,'enum',AugmentedLagrangianREnum(),'data',self.augmented_lagrangian_r ,'format','Double')
                 WriteData(fid,'enum',AugmentedLagrangianThetaEnum() ,'data',self.XTH_theta ,'format','Double')
                 WriteData(fid,'object',self,'fieldname','borderSSA','format','DoubleMat','mattype',1)