Changeset 20916

Timestamp:

07/14/16 16:58:06 (9 years ago)

Author:

agscott1

Message:

CHG: Hard-coded basal forcings and calving enums and updated Marshalling

Location:

issm/trunk-jpl/src

Files:

• c/classes/IoModel.cpp (modified) (1 diff)
• c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)
• c/shared/io/Marshalling/IoCodeConversions.h (modified) (1 diff)
• m/classes/basalforcings.js (modified) (1 diff)
• m/classes/basalforcings.m (modified) (1 diff)
• m/classes/basalforcings.py (modified) (1 diff)
• m/classes/calving.js (modified) (1 diff)
• m/classes/calving.m (modified) (1 diff)
• m/classes/calving.py (modified) (1 diff)
• m/classes/calvingdev.m (modified) (1 diff)
• m/classes/calvinglevermann.m (modified) (1 diff)
• m/classes/calvinglevermann.py (modified) (1 diff)
• m/classes/calvingminthickness.m (modified) (1 diff)
• m/classes/linearbasalforcings.m (modified) (1 diff)
• m/classes/linearbasalforcings.py (modified) (1 diff)
• m/classes/mesh3dsurface.m (modified) (1 diff)
• m/classes/mismipbasalforcings.m (modified) (1 diff)
• m/classes/mismipbasalforcings.py (modified) (1 diff)
• m/classes/organizer.m (modified) (2 diffs)
• m/classes/plumebasalforcings.m (modified) (1 diff)

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

@@ -599 +599 @@
                                         /*Convert codes to Enums if needed*/
                                         if(strcmp(record_name,"md.smb.model")==0) integer = IoCodeToEnumSMB(integer);
+                                        if(strcmp(record_name,"md.basalforcings.model")==0) integer = IoCodeToEnumBasal(integer);
+                                        if(strcmp(record_name,"md.calving.law")==0) integer = IoCodeToEnumCalving(integer);
 
                                         /*Broadcast to other cpus*/

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

@@ -55 +55 @@
         }
 }/*}}}*/
+int IoCodeToEnumBasal(int enum_in){/*{{{*/
+        switch(enum_in){
+                case 1: return FloatingMeltRateEnum;
+                case 2: return LinearFloatingMeltRateEnum;
+                case 3: return MismipFloatingMeltRateEnum;
+                case 4: return MantlePlumeGeothermalFluxEnum;
+                default: _error_("Marshalled Basal Forcings code \""<<enum_in<<"\" not supported yet");
+        }
+}/*}}}*/
+int IoCodeToEnumCalving(int enum_in){/*{{{*/
+        switch(enum_in){
+                case 1: return DefaultCalvingEnum;
+                case 2: return CalvingDevEnum;
+                case 3: return CalvingLevermannEnum;
+                case 4: return CalvingMinthicknessEnum;
+                default: _error_("Marshalled Calving law code \""<<enum_in<<"\" not supported yet");
+        }
+}/*}}}*/

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

@@ -5 +5 @@
 
 int IoCodeToEnumSMB(int enum_in);
+int IoCodeToEnumBasal(int enum_in);
+int IoCodeToEnumCalving(int enum_in);
 #endif  

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

@@ -64 +64 @@
                         var yts=md.constants.yts;
 
-                        WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.basalforcings.model','data',1,'format','Integer');
                         WriteData(fid,prefix,'object',this,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',this,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)

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

@@ -68 +68 @@
                         yts=md.constants.yts;
 
-                        WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.basalforcings.model','data',1,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)

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

@@ -73 +73 @@
                 yts=md.constants.yts
 
-                WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer');
+                WriteData(fid,prefix,'name','md.basalforcings.model','data',1,'format','Integer');
                 WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
                 WriteData(fid,prefix,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)

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

@@ -33 +33 @@
                 this.marshall=function(md,prefix,fid) { //{{{
                         var yts=md.constants.yts;
-                        WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.calving.law','data',1,'format','Integer');
                         WriteData(fid,prefix,'object',this,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
                         WriteData(fid,prefix,'object',this,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);

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

@@ -49 +49 @@
                 function marshall(self,prefix,md,fid) % {{{
                         yts=md.constants.yts;
-                        WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.calving.law','data',1,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
                         WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);

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

@@ -54 +54 @@
                 yts=md.constants.yts
 
-                WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer');
+                WriteData(fid,prefix,'name','md.calving.law','data',1,'format','Integer');
                 WriteData(fid,prefix,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts)
                 WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts)

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

@@ -52 +52 @@
                 function marshall(self,prefix,md,fid) % {{{
                         yts=md.constants.yts;
-                        WriteData(fid,prefix,'name','md.calving.law','data',CalvingDevEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.calving.law','data',2,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);

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

@@ -52 +52 @@
                 function marshall(self,prefix,md,fid) % {{{
                         yts=md.constants.yts;
-                        WriteData(fid,prefix,'name','md.calving.law','data',CalvingLevermannEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.calving.law','data',3,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);

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

@@ -51 +51 @@
         def marshall(self,prefix,md,fid):    # {{{
                 yts=md.constants.yts
-                WriteData(fid,prefix,'name','md.calving.law','data',CalvingLevermannEnum(),'format','Integer');
+                WriteData(fid,prefix,'name','md.calving.law','data',3,'format','Integer');
                 WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1)
                 WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts)

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

@@ -51 +51 @@
                 function marshall(self,prefix,md,fid) % {{{
                         yts=md.constants.yts;
-                        WriteData(fid,prefix,'name','md.calving.law','data',CalvingMinthicknessEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.calving.law','data',4,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);

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

@@ -79 +79 @@
                         pos=find(md.geometry.base>md.basalforcings.deepwater_elevation & md.geometry.base<md.basalforcings.upperwater_elevation);
                         floatingice_melting_rate(pos)=md.basalforcings.deepwater_melting_rate*(md.geometry.base(pos)-md.basalforcings.upperwater_elevation)/(md.basalforcings.deepwater_elevation-md.basalforcings.upperwater_elevation);
-                        WriteData(fid,prefix,'name','md.basalforcings.model','data',LinearFloatingMeltRateEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.basalforcings.model','data',2,'format','Integer');
                         WriteData(fid,prefix,'data',floatingice_melting_rate,'format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','name','md.basalforcings.groundedice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)

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

@@ -99 +99 @@
                 floatingice_melting_rate[pos]=md.basalforcings.deepwater_melting_rate*(md.geometry.base[pos]-md.basalforcings.upperwater_elevation)/(md.basalforcings.deepwater_elevation-md.basalforcings.upperwater_elevation)
 
-                WriteData(fid,prefix,'name','md.basalforcings.model','data',LinearFloatingMeltRateEnum(),'format','Integer');
+                WriteData(fid,prefix,'name','md.basalforcings.model','data',2,'format','Integer');
                 WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','name','md.basalforcings.groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
                 WriteData(fid,prefix,'data',floatingice_melting_rate,'name','md.basalforcings.floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)

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

@@ -130 +130 @@
                         fielddisplay(obj,'extractedelements','elements extracted from the model'); 
                 end % }}}
-                function marshall(obj,prefix,md,fid) % {{{
+                function marshall(obj,md,fid) % {{{
                         WriteData(fid,prefix,'name','md.mesh.domain_type','data',StringToEnum(['Domain' domaintype(obj)]),'format','Integer');
                         WriteData(fid,prefix,'name','md.mesh.domain_dimension','data',dimension(obj),'format','Integer');

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

@@ -88 +88 @@
                         floatingice_melting_rate=md.basalforcings.meltrate_factor*tanh((md.geometry.base-md.geometry.bed)./md.basalforcings.threshold_thickness).*max(md.basalforcings.upperdepth_melt-md.geometry.base,0);
 
-                        WriteData(fid,prefix,'name','md.basalforcings.model','data',MismipFloatingMeltRateEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.basalforcings.model','data',3,'format','Integer');
                         WriteData(fid,prefix,'data',floatingice_melting_rate,'format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','name','md.basalforcings.groundedice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)

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

@@ -87 +87 @@
         floatingice_melting_rate = md.basalforcings.meltrate_factor*numpy.tanh((md.geometry.base-md.geometry.bed)/md.basalforcings.threshold_thickness)*numpy.amax(md.basalforcings.upperdepth_melt-md.geometry.base,0)
 
-        WriteData(fid,prefix,'name','md.basalforcings.model','data',MismipFloatingMeltRateEnum(),'format','Integer')
+        WriteData(fid,prefix,'name','md.basalforcings.model','data',3,'format','Integer')
         WriteData(fid,prefix,'data',floatingice_melting_rate,'format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','name','md.basalforcings.groundedice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)

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

@@ -5 +5 @@
 %      prefix:     prefix for saved model names
 %      steps:      requested steps
-%      color:      color of step title (default is '41;37')
+%      color:      color of step title (default is '41;37;01')
 %
 %   Usage:
@@ -45 +45 @@
 
                         %Color
-                        org.color=getfieldvalue(options,'color','41;37');
+                        org.color=getfieldvalue(options,'color','41;37;01');
 
                         %Get steps

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

@@ -113 +113 @@
                         yts=md.constants.yts;
 
-                        WriteData(fid,prefix,'name','md.basalforcings.model','data',MantlePlumeGeothermalFluxEnum(),'format','Integer');
+                        WriteData(fid,prefix,'name','md.basalforcings.model','data',4,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','name','md.basalforcings.groundedice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)