Changeset 20918
- Timestamp:
- 07/14/16 20:36:56 (9 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/IoModel.cpp
r20917 r20918 602 602 if(strcmp(record_name,"md.calving.law")==0) integer = IoCodeToEnumCalving(integer); 603 603 if(strcmp(record_name,"md.hydrology.model")==0) integer = IoCodeToEnumHydrology(integer); 604 if(strcmp(record_name,"md.materials.type")==0) integer = IoCodeToEnumMaterials(integer); 604 605 605 606 /*Broadcast to other cpus*/ -
issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp
r20917 r20918 81 81 } 82 82 }/*}}}*/ 83 int IoCodeToEnumMaterials(int enum_in){/*{{{*/ 84 switch(enum_in){ 85 case 1: return MatdamageiceEnum; 86 case 2: return MatestarEnum; 87 case 3: return MaticeEnum; 88 default: _error_("Marshalled materials code \""<<enum_in<<"\" not supported yet"); 89 } 90 }/*}}}*/ -
issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.h
r20917 r20918 8 8 int IoCodeToEnumCalving(int enum_in); 9 9 int IoCodeToEnumHydrology(int enum_in); 10 int IoCodeToEnumMaterials(int enum_in); 10 11 #endif -
issm/trunk-jpl/src/m/classes/matdamageice.m
r20690 r20918 153 153 end % }}} 154 154 function marshall(self,prefix,md,fid) % {{{ 155 WriteData(fid,prefix,'name','md.materials.type','data', MatdamageiceEnum(),'format','Integer');155 WriteData(fid,prefix,'name','md.materials.type','data',1,'format','Integer'); 156 156 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_ice','format','Double'); 157 157 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_water','format','Double'); -
issm/trunk-jpl/src/m/classes/matdamageice.py
r20690 r20918 145 145 # }}} 146 146 def marshall(self,prefix,md,fid): # {{{ 147 WriteData(fid,prefix,'name','md.materials.type','data', MatdamageiceEnum(),'format','Integer');147 WriteData(fid,prefix,'name','md.materials.type','data',1,'format','Integer'); 148 148 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_ice','format','Double') 149 149 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_water','format','Double') -
issm/trunk-jpl/src/m/classes/matestar.m
r20690 r20918 156 156 end % }}} 157 157 function marshall(self,prefix,md,fid) % {{{ 158 WriteData(fid,prefix,'name','md.materials.type','data', MatestarEnum(),'format','Integer');158 WriteData(fid,prefix,'name','md.materials.type','data',2,'format','Integer'); 159 159 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_ice','format','Double'); 160 160 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_water','format','Double'); -
issm/trunk-jpl/src/m/classes/matice.js
r20902 r20918 114 114 } // }}} 115 115 this.marshall=function(md,prefix,fid) { //{{{ 116 WriteData(fid,prefix,'name','md.materials.type','data', MaticeEnum(),'format','Integer');116 WriteData(fid,prefix,'name','md.materials.type','data',3,'format','Integer'); 117 117 WriteData(fid,prefix,'object',this,'class','materials','fieldname','rho_ice','format','Double'); 118 118 WriteData(fid,prefix,'object',this,'class','materials','fieldname','rho_water','format','Double'); -
issm/trunk-jpl/src/m/classes/matice.m
r20902 r20918 152 152 end % }}} 153 153 function marshall(self,prefix,md,fid) % {{{ 154 WriteData(fid,prefix,'name','md.materials.type','data', MaticeEnum(),'format','Integer');154 WriteData(fid,prefix,'name','md.materials.type','data',3,'format','Integer'); 155 155 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_ice','format','Double'); 156 156 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_water','format','Double'); -
issm/trunk-jpl/src/m/classes/matice.py
r20902 r20918 146 146 # }}} 147 147 def marshall(self,prefix,md,fid): # {{{ 148 WriteData(fid,prefix,'name','md.materials.type','data', MaticeEnum(),'format','Integer');148 WriteData(fid,prefix,'name','md.materials.type','data',3,'format','Integer'); 149 149 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_ice','format','Double') 150 150 WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_water','format','Double')
Note:
See TracChangeset
for help on using the changeset viewer.