Changeset 26832

Timestamp:

01/28/22 07:52:35 (3 years ago)

Author:

vverjans

Message:

CHG: change IO code of SMBautoregression and frontalforcingsrignotautoregression

Location:

issm/trunk-jpl/src

Files:

• c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (2 diffs)
• m/classes/SMBautoregression.m (modified) (1 diff)
• m/classes/SMBautoregression.py (modified) (1 diff)
• m/classes/frontalforcingsrignotautoregression.m (modified) (1 diff)
• m/classes/frontalforcingsrignotautoregression.py (modified) (1 diff)

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

@@ -241 +241 @@
                 case 11: return SMBgradientscomponentsEnum;
                 case 12: return SMBsemicEnum;   
-                case 55: return SMBautoregressionEnum;
+                case 13: return SMBautoregressionEnum;
                 default: _error_("Marshalled SMB code \""<<enum_in<<"\" not supported yet");
         }
@@ -275 +275 @@
                 case 1: return FrontalForcingsDefaultEnum;
                 case 2: return FrontalForcingsRignotEnum;
-                case 55: return FrontalForcingsRignotAutoregressionEnum;
+                case 3: return FrontalForcingsRignotAutoregressionEnum;
                 default: _error_("Marshalled Frontalforcings code \""<<enum_in<<"\" not supported yet");
         }

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

@@ -141 +141 @@
                         end
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',55,'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',13,'format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','num_basins','format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','ar_order','format','Integer');

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

@@ -138 +138 @@
                 print('      smb.refelevation not specified: Reference elevations set to mean surface elevation of basins')
 
-        WriteData(fid, prefix, 'name', 'md.smb.model', 'data', 55, 'format', 'Integer')
+        WriteData(fid, prefix, 'name', 'md.smb.model', 'data', 13, 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'num_basins', 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'ar_order', 'format', 'Integer')

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

@@ -75 +75 @@
                 function marshall(self,prefix,md,fid) % {{{
                         yts=md.constants.yts;
-                        WriteData(fid,prefix,'name','md.frontalforcings.parameterization','data',55,'format','Integer');
+                        WriteData(fid,prefix,'name','md.frontalforcings.parameterization','data',3,'format','Integer');
                         WriteData(fid,prefix,'object',self,'class','frontalforcings','fieldname','num_basins','format','Integer');
                         WriteData(fid,prefix,'object',self,'class','frontalforcings','fieldname','subglacial_discharge','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts);

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

@@ -77 +77 @@
     def marshall(self, prefix, md, fid):  # {{{
         yts = md.constants.yts
-        WriteData(fid, prefix, 'name', 'md.frontalforcings.parameterization', 'data', 55, 'format', 'Integer')
+        WriteData(fid, prefix, 'name', 'md.frontalforcings.parameterization', 'data', 3, 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'class', 'frontalforcings', 'fieldname', 'num_basins', 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'class', 'frontalforcings', 'fieldname', 'subglacial_discharge', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)