Changeset 20925

Timestamp:

07/16/16 16:49:31 (9 years ago)

Author:

agscott1

Message:

CHG: Hard-coded enums for flowequation.fe_SSA/HO/FS and updated marshalling for flowequation.

Location:

issm/trunk-jpl/src

Files:

• c/classes/IoModel.cpp (modified) (2 diffs)
• c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)
• c/shared/io/Marshalling/IoCodeConversions.h (modified) (1 diff)
• m/classes/flowequation.m (modified) (1 diff)
• m/classes/flowequation.py (modified) (1 diff)

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

@@ -650 +650 @@
                                                 string[0]='\0';
                                         }
-
-                                        /*Add string to parameters: */
-                                        this->AddConstant(new IoConstant(string,record_name));
+                                        /*Convert strings to enums if needed*/
+                                        if(strcmp(record_name,"md.flowequation.fe_SSA")==0){
+                                                this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
+                                        } else if(strcmp(record_name,"md.flowequation.fe_HO")==0){
+                                                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 {
+                                                /*Add string to parameters: */
+                                                this->AddConstant(new IoConstant(string,record_name));
+                                        }
 
                                         /*Free string*/
@@ -770 +778 @@
                                                 string[0]='\0';
                                         }
-                                        /*Add string to parameters: */
-                                        this->AddConstant(new IoConstant(string,record_name));
+                                        if(strcmp(record_name,"md.flowequation.fe_SSA")==0){
+                                                this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
+                                        } else if(strcmp(record_name,"md.flowequation.fe_HO")==0){
+                                                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 {
+                                                /*Add string to parameters: */
+                                                this->AddConstant(new IoConstant(string,record_name));
+                                        }
 
                                         /*Free string*/

issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp

@@ -89 +89 @@
         }
 }/*}}}*/
+

issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.h

@@ -9 +9 @@
 int IoCodeToEnumHydrology(int enum_in);
 int IoCodeToEnumMaterials(int enum_in);
+
 #endif  

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

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

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

@@ -126 +126 @@
                 WriteData(fid,prefix,'object',self,'fieldname','isHO','format','Boolean')
                 WriteData(fid,prefix,'object',self,'fieldname','isFS','format','Boolean')
-                WriteData(fid,prefix,'object',self,'fieldname','fe_SSA','data',StringToEnum(self.fe_SSA)[0],'format','Integer')
-                WriteData(fid,prefix,'object',self,'fieldname','fe_HO','data',StringToEnum(self.fe_HO)[0] ,'format','Integer')
-                WriteData(fid,prefix,'object',self,'fieldname','fe_FS','data',StringToEnum(self.fe_FS)[0] ,'format','Integer')
+                WriteData(fid,prefix,'object',self,'fieldname','fe_SSA','data',self.fe_SSA,'format','String')
+                WriteData(fid,prefix,'object',self,'fieldname','fe_HO','data',self.fe_HO,'format','String')
+                WriteData(fid,prefix,'object',self,'fieldname','fe_FS','data',self.fe_FS ,'format','String')
                 WriteData(fid,prefix,'object',self,'fieldname','augmented_lagrangian_r','format','Double');
                 WriteData(fid,prefix,'object',self,'fieldname','augmented_lagrangian_rhop','format','Double');