Changeset 20927

Timestamp:

07/17/16 15:23:16 (9 years ago)

Author:

agscott1

Message:

CHG: Added string enum for flowequation js, and added string enum to groundingline.migration for marshalling

Location:

issm/trunk-jpl/src

Files:

• c/classes/IoModel.cpp (modified) (2 diffs)
• m/classes/flowequation.js (modified) (1 diff)
• m/classes/groundingline.js (modified) (1 diff)
• m/classes/groundingline.m (modified) (1 diff)
• m/classes/groundingline.py (modified) (1 diff)

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -656 +656 @@
                                                 this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
                                         } else if(strcmp(record_name,"md.flowequation.fe_FS")==0){
+                                                this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
+                                        } else if(strcmp(record_name,"md.groundingline.migration")==0){
                                                 this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
                                         } else {
@@ -784 +786 @@
                                         } else if(strcmp(record_name,"md.flowequation.fe_FS")==0){
                                                 this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
+                                        } else if(strcmp(record_name,"md.groundingline.migration")==0){
+                                                this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
                                         } else {
                                                 /*Add string to parameters: */

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

@@ -104 +104 @@
                         WriteData(fid,prefix,'object',this,'fieldname','isHO','format','Boolean');
                         WriteData(fid,prefix,'object',this,'fieldname','isFS','format','Boolean');
-                        WriteData(fid,prefix,'object',this,'fieldname','fe_SSA','data',StringToEnum(this.fe_SSA),'format','Integer');
-                        WriteData(fid,prefix,'object',this,'fieldname','fe_HO','data',StringToEnum(this.fe_HO) ,'format','Integer');
-                        WriteData(fid,prefix,'object',this,'fieldname','fe_FS','data',StringToEnum(this.fe_FS) ,'format','Integer');
+                        WriteData(fid,prefix,'object',this,'fieldname','fe_SSA','data',this.fe_SSA,'format','String');
+                        WriteData(fid,prefix,'object',this,'fieldname','fe_HO','data',this.fe_HO,'format','String');
+                        WriteData(fid,prefix,'object',this,'fieldname','fe_FS','data',this.fe_FS,'format','String');
 
                         WriteData(fid,prefix,'object',this,'fieldname','augmented_lagrangian_r','format','Double');

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

@@ -41 +41 @@
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{
-                        WriteData(fid,prefix,'data',StringToEnum(this.migration),'name','md.groundingline.migration','format','Integer');
+                        WriteData(fid,prefix,'data',this.migration,'name','md.groundingline.migration','format','String');
                 }//}}}
                 this.fix=function() { //{{{

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

@@ -48 +48 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
-                        WriteData(fid,prefix,'data',StringToEnum(self.migration),'name','md.groundingline.migration','format','Integer');
+                        WriteData(fid,prefix,'data',self.migration,'name','md.groundingline.migration','format','String');
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{

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

@@ -51 +51 @@
         # }}}
         def marshall(self,prefix,md,fid):    # {{{
-                WriteData(fid,prefix,'data',StringToEnum(self.migration)[0],'name','md.groundingline.migration','format','Integer')
+                WriteData(fid,prefix,'data',self.migration,'name','md.groundingline.migration','format','String')
         # }}}