Changeset 27031 for issm/trunk-jpl/src/m/classes/flowequation.js

Timestamp:

05/31/22 06:20:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving MLHO to MOLHO

File:

• issm/trunk-jpl/src/m/classes/flowequation.js (modified) (6 diffs)

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

@@ -22 +22 @@
                 fielddisplay(this,'isSSA','is the Shelfy-Stream Approximation (SSA) used ?');
                 fielddisplay(this,'isL1L2','is the L1L2 approximation used ?');
-                fielddisplay(this,'isMLHO','is the Mono-Layer Higher-Order approximation used?');
+                fielddisplay(this,'isMOLHO','is the MOno-Layer Higher-Order (MOLHO) approximation used?');
                 fielddisplay(this,'isHO','is the Higher-Order (HO) approximation used ?');
                 fielddisplay(this,'isFS','are the Full-FS (FS) equations used ?');
@@ -41 +41 @@
 
         }// }}}
-    this.extrude = function(md) {//{{{
-        this.element_equation=project3d(md,'vector',this.element_equation,'type','element');
-        this.vertex_equation=project3d(md,'vector',this.vertex_equation,'type','node');
-        this.borderSSA=project3d(md,'vector',this.borderSSA,'type','node');
-        this.borderHO=project3d(md,'vector',this.borderHO,'type','node');
-        this.borderFS=project3d(md,'vector',this.borderFS,'type','node');
-        return this;
+        this.extrude = function(md) {//{{{
+                this.element_equation=project3d(md,'vector',this.element_equation,'type','element');
+                this.vertex_equation=project3d(md,'vector',this.vertex_equation,'type','node');
+                this.borderSSA=project3d(md,'vector',this.borderSSA,'type','node');
+                this.borderHO=project3d(md,'vector',this.borderHO,'type','node');
+                this.borderFS=project3d(md,'vector',this.borderFS,'type','node');
+                return this;
     }//}}}
                 this.checkconsistency = function(md,solution,analyses) {//{{{
@@ -59 +59 @@
                         checkfield(md,'fieldname','flowequation.isSSA','numel',[1],'values',[0, 1]);
                         checkfield(md,'fieldname','flowequation.isL1L2','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','flowequation.isMLHO','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','flowequation.isMOLHO','numel',[1],'values',[0, 1]);
                         checkfield(md,'fieldname','flowequation.isHO','numel',[1],'values',[0, 1]);
                         checkfield(md,'fieldname','flowequation.isFS','numel',[1],'values',[0, 1]);
@@ -93 +93 @@
                         else throw Error('Case not supported yet');
                         
-                        if (!(this.isSIA | this.isSSA | this.isL1L2 | this.isMLHO | this.isHO | this.isFS)){
+                        if (!(this.isSIA | this.isSSA | this.isL1L2 | this.isMOLHO | this.isHO | this.isFS)){
                                 checkmessage(md,['no element types set for this model']);
                         }
@@ -108 +108 @@
                         WriteData(fid,prefix,'object',this,'fieldname','isSSA','format','Boolean');
                         WriteData(fid,prefix,'object',this,'fieldname','isL1L2','format','Boolean');
-                        WriteData(fid,prefix,'object',this,'fieldname','isMLHO','format','Boolean');
+                        WriteData(fid,prefix,'object',this,'fieldname','isMOLHO','format','Boolean');
                         WriteData(fid,prefix,'object',this,'fieldname','isHO','format','Boolean');
                         WriteData(fid,prefix,'object',this,'fieldname','isFS','format','Boolean');
@@ -138 +138 @@
         this.isSSA                          = 0;
         this.isL1L2                         = 0;
-        this.isMLHO                         = 0;
+        this.isMOLHO                         = 0;
         this.isHO                           = 0;
         this.isFS                           = 0;