Changeset 20940

Timestamp:

07/19/16 12:11:33 (9 years ago)

Author:

agscott1

Message:

CHG: Changed masstransport to use a String for marshalling instead of an integer

Location:

issm/trunk-jpl/src

Files:

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

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

@@ -658 +658 @@
                                                 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 if(strcmp(record_name,"md.masstransport.hydrostatic_adjustment")==0){
                                                 this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
                                         } else {
@@ -788 +790 @@
                                         } else if(strcmp(record_name,"md.groundingline.migration")==0){
                                                 this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
+                                        } else if(strcmp(record_name,"md.masstransport.hydrostatic_adjustment")==0){
+                                                this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
                                         } else {
                                                 /*Add string to parameters: */

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

@@ -65 +65 @@
                         WriteData(fid,prefix,'object',this,'fieldname','isfreesurface','format','Boolean');
                         WriteData(fid,prefix,'object',this,'fieldname','min_thickness','format','Double');
-                        WriteData(fid,prefix,'data',StringToEnum(this.hydrostatic_adjustment),'format','Integer','name','md.masstransport.hydrostatic_adjustment');
+                        WriteData(fid,prefix,'data',this.hydrostatic_adjustment,'format','String','name','md.masstransport.hydrostatic_adjustment');
                         WriteData(fid,prefix,'object',this,'fieldname','stabilization','format','Integer');
                         WriteData(fid,prefix,'object',this,'fieldname','vertex_pairing','format','DoubleMat','mattype',3);

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

@@ -118 +118 @@
                         WriteData(fid,prefix,'object',self,'fieldname','isfreesurface','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double');
-                        WriteData(fid,prefix,'data',StringToEnum(self.hydrostatic_adjustment),'format','Integer','name','md.masstransport.hydrostatic_adjustment');
+                        WriteData(fid,prefix,'data',self.hydrostatic_adjustment,'format','String','name','md.masstransport.hydrostatic_adjustment');
                         WriteData(fid,prefix,'object',self,'fieldname','stabilization','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3);

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

@@ -88 +88 @@
                 WriteData(fid,prefix,'object',self,'fieldname','isfreesurface','format','Boolean')
                 WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double')
-                WriteData(fid,prefix,'data',StringToEnum(self.hydrostatic_adjustment)[0],'format','Integer','name','md.masstransport.hydrostatic_adjustment')
+                WriteData(fid,prefix,'data',self.hydrostatic_adjustment,'format','String','name','md.masstransport.hydrostatic_adjustment')
                 WriteData(fid,prefix,'object',self,'fieldname','stabilization','format','Integer')
                 WriteData(fid,prefix,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3)