Changeset 20889

Timestamp:

07/13/16 09:34:13 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: getting rid of Enums for SMB class

Location:

issm/trunk-jpl/src

Files:

• c/classes/IoModel.cpp (modified) (2 diffs)
• c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (2 diffs)
• c/shared/io/Marshalling/IoCodeConversions.h (modified) (1 diff)
• m/classes/SMBcomponents.m (modified) (1 diff)
• m/classes/SMBcomponents.py (modified) (1 diff)
• m/classes/SMBd18opdd.m (modified) (1 diff)
• m/classes/SMBd18opdd.py (modified) (1 diff)
• m/classes/SMBforcing.js (modified) (1 diff)
• m/classes/SMBforcing.m (modified) (1 diff)
• m/classes/SMBforcing.py (modified) (1 diff)
• m/classes/SMBgemb.m (modified) (1 diff)
• m/classes/SMBgradients.m (modified) (1 diff)
• m/classes/SMBgradients.py (modified) (1 diff)
• m/classes/SMBhenning.m (modified) (1 diff)
• m/classes/SMBmeltcomponents.m (modified) (1 diff)
• m/classes/SMBmeltcomponents.py (modified) (1 diff)
• m/classes/SMBpdd.m (modified) (1 diff)
• m/classes/SMBpdd.py (modified) (1 diff)

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

@@ -596 +596 @@
                                         /*Read the integer and broadcast it to other cpus:*/
                                         if(fread(&integer,sizeof(int),1,this->fid)!=1) _error_("could not read integer ");
+
+                                        /*Convert codes to Enums if needed*/
+                                        if(strcmp(record_name,"md.smb.model")==0) integer = IoCodeToEnumSMB(integer);
+
+                                        /*Broadcast to other cpus*/
                                         ISSM_MPI_Bcast(&integer,1,ISSM_MPI_INT,0,IssmComm::GetComm()); 
 
@@ -811 +816 @@
                 }
         } //}}}
-}
-/*}}}*/
+}/*}}}*/
 void  IoModel::FetchData(bool* pboolean,const char* data_name){/*{{{*/
 

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

@@ -7 +7 @@
 #include "../../Exceptions/exceptions.h"
 
-void FieldAndEnumFromCode(int* out_enum,char** pfield,const char* string_in){
+void FieldAndEnumFromCode(int* out_enum,char** pfield,const char* string_in){/*{{{*/
 
         /*output*/
@@ -41 +41 @@
         *pfield   = fieldname;
         return;
-}
+}/*}}}*/
+int IoCodeToEnumSMB(int enum_in){/*{{{*/
+        switch(enum_in){
+                case 1: return SMBforcingEnum;
+                case 2: return SMBcomponentsEnum;
+                case 3: return SMBmeltcomponentsEnum;
+                case 4: return SMBpddEnum;
+                case 5: return SMBd18opddEnum;
+                case 6: return SMBgradientsEnum;
+                case 7: return SMBhenningEnum;
+                case 8: return SMBgembEnum;
+                default: _error_("Marshalled SMB code \""<<enum_in<<"\" not supported yet");
+        }
+}/*}}}*/

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

@@ -4 +4 @@
 void FieldAndEnumFromCode(int* out_enum,char** pfield,const char* string_in);
 
+int IoCodeToEnumSMB(int enum_in);
 #endif  

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

@@ -80 +80 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',SMBcomponentsEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',2,'format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);

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

@@ -81 +81 @@
                 yts=365.0*24.0*3600.0
 
-                WriteData(fid,prefix,'name','md.smb.model','data',SMBcomponentsEnum(),'format','Integer');
+                WriteData(fid,prefix,'name','md.smb.model','data',2,'format','Integer');
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)

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

@@ -106 +106 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',SMBd18opddEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',5,'format','Integer');
 
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','ismungsm','format','Boolean');

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

@@ -110 +110 @@
                 yts=365.0*24.0*3600.0
 
-                WriteData(fid,prefix,'name','md.smb.model','data',SMBd18opddEnum(),'format','Integer')
+                WriteData(fid,prefix,'name','md.smb.model','data',5,'format','Integer')
 
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','ismungsm','format','Boolean')

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

@@ -47 +47 @@
         var yts=365.0*24.0*3600.0;
 
-        WriteData(fid,prefix,'name','md.smb.model','data',SMBforcingEnum(),'format','Integer');
+        WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
         WriteData(fid,prefix,'object',this,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
 

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

@@ -67 +67 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',SMBforcingEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
                         

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

@@ -55 +55 @@
                 yts=365.0*24.0*3600.0
 
-                WriteData(fid,prefix,'name','md.smb.model','data',SMBforcingEnum(),'format','Integer');
+                WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
                 

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

@@ -260 +260 @@
                         yts=365.25*24.0*3600.0;
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',SMBgembEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',8,'format','Integer');
                         
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','isgraingrowth','format','Boolean');

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

@@ -64 +64 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',SMBgradientsEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',6,'format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);

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

@@ -61 +61 @@
                 yts=365.0*24.0*3600.0
 
-                WriteData(fid,prefix,'name','md.smb.model','data',SMBgradientsEnum(),'format','Integer');
+                WriteData(fid,prefix,'name','md.smb.model','data',6,'format','Integer');
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)

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

@@ -52 +52 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',SMBhenningEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',7,'format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
                         

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

@@ -91 +91 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',SMBmeltcomponentsEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',3,'format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);

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

@@ -92 +92 @@
                 yts=365.0*24.0*3600.0
 
-                WriteData(fid,prefix,'name','md.smb.model','data',SMBmeltcomponentsEnum(),'format','Integer');
+                WriteData(fid,prefix,'name','md.smb.model','data',3,'format','Integer');
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)

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

@@ -145 +145 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,prefix,'name','md.smb.model','data',SMBpddEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.smb.model','data',4,'format','Integer');
 
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','isdelta18o','format','Boolean');

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

@@ -153 +153 @@
                 yts=365.0*24.0*3600.0
 
-                WriteData(fid,prefix,'name','md.smb.model','data',SMBpddEnum(),'format','Integer')
+                WriteData(fid,prefix,'name','md.smb.model','data',4,'format','Integer')
 
                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','isdelta18o','format','Boolean')