Changeset 18944

Timestamp:

12/04/14 15:54:54 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed test101.py with new massflux class

Location:

issm/trunk-jpl

Files:

• src/m/classes/massfluxatgate.m (modified) (3 diffs)
• src/m/classes/massfluxatgate.py (modified) (5 diffs)
• test/NightlyRun/test101.m (modified) (1 diff)
• test/NightlyRun/test101.py (modified) (1 diff)

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

@@ -8 +8 @@
         properties (SetAccess=public)  
                 %massfluxatgate 
-                name                = '';
-                definitionenum     = NaN; %enum that identifies this output definition uniquely, from Outputdefinition[1-10]Enum
-                profilename            = ''; 
+                name            = '';
+                definitionenum  = 0;
+                profilename     = ''; 
         end
         properties (SetAccess=private)  
-                segments            = NaN;
+                segments        = NaN;
         end
         methods
@@ -40 +40 @@
                         end
                         
-                        md = checkfield(md,'fieldname','obj.definitionenum','field',obj.definitionenum,'values',[Outputdefinition1Enum,Outputdefinition2Enum,Outputdefinition3Enum,Outputdefinition4Enum,Outputdefinition5Enum,Outputdefinition6Enum,Outputdefinition7Enum,Outputdefinition8Enum,Outputdefinition9Enum,Outputdefinition10Enum]);
+                        md = checkfield(md,'field',obj.definitionenum,'values',[Outputdefinition1Enum(),Outputdefinition2Enum(),Outputdefinition3Enum(),Outputdefinition4Enum(),Outputdefinition5Enum(),Outputdefinition6Enum(),Outputdefinition7Enum(),Outputdefinition8Enum(),Outputdefinition9Enum(),Outputdefinition10Enum()]);
 
                         %check the profilename points to a file!: 
@@ -52 +52 @@
                         fielddisplay(obj,'name','identifier for this massfluxatgate response');
                         fielddisplay(obj,'profilename','name of file (shapefile or argus file) defining a profile (or gate)');
+                        fielddisplay(obj,'definitionenum','enum that identifies this output definition uniquely, from Outputdefinition[1-10]Enum');
                         
                 end % }}}

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

@@ -1 +1 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
+from pairoptions import pairoptions
 from checkfield import checkfield
 from WriteData import WriteData
@@ -14 +15 @@
         """
 
-        def __init__(self,name,profilename): # {{{
-                self.name           = name
-                self.profilename    = profilename
-                self.segments       = float('NaN')
+        def __init__(self,*args): # {{{
+
+                self.name            = ''
+                self.definitionenum  = 0
+                self.profilename     = ''
+                self.segments        = float('NaN')
+
+                #set defaults
+                self.setdefaultparameters()
+
+                #use provided options to change fields
+                options=pairoptions(*args)
+
+                #OK get other fields
+                self=options.AssignObjectFields(self)
 
                 #}}}
@@ -24 +36 @@
                 string="   Massfluxatgate:"
                 string="%s\n%s"%(string,fielddisplay(self,'name','identifier for this massfluxatgate response'))
+                string="%s\n%s"%(string,fielddisplay(self,'definitionenum','enum that identifies this output definition uniquely, from Outputdefinition[1-10]Enum'))
                 string="%s\n%s"%(string,fielddisplay(self,'profilename','name of file (shapefile or argus file) defining a profile (or gate)'))
                 return string
@@ -37 +50 @@
                 if  not isinstance(self.profilename, basestring):
                         raise RuntimeError("massfluxatgate error message: 'profilename' field should be a string!") 
+
+                        md = checkfield(md,'field',self.definitionenum,'values',[Outputdefinition1Enum(),Outputdefinition2Enum(),Outputdefinition3Enum(),Outputdefinition4Enum(),Outputdefinition5Enum(),Outputdefinition6Enum(),Outputdefinition7Enum(),Outputdefinition8Enum(),Outputdefinition9Enum(),Outputdefinition10Enum()])
                 
                 #check the profilename points to a file!: 
@@ -51 +66 @@
                 #ok, marshall name and segments: 
                 WriteData(fid,'object',self,'fieldname','name','format','String')
+                WriteData(fid,'object',self,'fieldname','definitionenum','format','Integer')
                 WriteData(fid,'object',self,'fieldname','segments','format','DoubleMat','mattype',1)
 

issm/trunk-jpl/test/NightlyRun/test101.m

@@ -8 +8 @@
 md.stressbalance.requested_outputs={'default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy','MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6'};
 md.outputdefinition.definitions={...
-        massfluxatgate('name','MassFlux1','profilename',['../Exp/MassFlux1.exp'],'definitionenum',Outputdefinition1Enum),...
-        massfluxatgate('name','MassFlux2','profilename',['../Exp/MassFlux2.exp'],'definitionenum',Outputdefinition2Enum),...
-        massfluxatgate('name','MassFlux3','profilename',['../Exp/MassFlux3.exp'],'definitionenum',Outputdefinition3Enum),...
-        massfluxatgate('name','MassFlux4','profilename',['../Exp/MassFlux4.exp'],'definitionenum',Outputdefinition4Enum),...
-        massfluxatgate('name','MassFlux5','profilename',['../Exp/MassFlux5.exp'],'definitionenum',Outputdefinition5Enum),...
-        massfluxatgate('name','MassFlux6','profilename',['../Exp/MassFlux6.exp'],'definitionenum',Outputdefinition6Enum)...
+        massfluxatgate('name','MassFlux1','profilename',['../Exp/MassFlux1.exp'],'definitionenum',Outputdefinition1Enum()),...
+        massfluxatgate('name','MassFlux2','profilename',['../Exp/MassFlux2.exp'],'definitionenum',Outputdefinition2Enum()),...
+        massfluxatgate('name','MassFlux3','profilename',['../Exp/MassFlux3.exp'],'definitionenum',Outputdefinition3Enum()),...
+        massfluxatgate('name','MassFlux4','profilename',['../Exp/MassFlux4.exp'],'definitionenum',Outputdefinition4Enum()),...
+        massfluxatgate('name','MassFlux5','profilename',['../Exp/MassFlux5.exp'],'definitionenum',Outputdefinition5Enum()),...
+        massfluxatgate('name','MassFlux6','profilename',['../Exp/MassFlux6.exp'],'definitionenum',Outputdefinition6Enum())...
         };
 

issm/trunk-jpl/test/NightlyRun/test101.py

@@ -19 +19 @@
 md.stressbalance.requested_outputs=['default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy','MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6']
 md.outputdefinition.definitions=[
-                massfluxatgate('MassFlux1','../Exp/MassFlux1.exp'),
-                massfluxatgate('MassFlux2','../Exp/MassFlux2.exp'),
-                massfluxatgate('MassFlux3','../Exp/MassFlux3.exp'),
-                massfluxatgate('MassFlux4','../Exp/MassFlux4.exp'),
-                massfluxatgate('MassFlux5','../Exp/MassFlux5.exp'),
-                massfluxatgate('MassFlux6','../Exp/MassFlux6.exp')
+                massfluxatgate('name','MassFlux1','profilename','../Exp/MassFlux1.exp','definitionenum',Outputdefinition1Enum()),
+                massfluxatgate('name','MassFlux2','profilename','../Exp/MassFlux2.exp','definitionenum',Outputdefinition2Enum()),
+                massfluxatgate('name','MassFlux3','profilename','../Exp/MassFlux3.exp','definitionenum',Outputdefinition3Enum()),
+                massfluxatgate('name','MassFlux4','profilename','../Exp/MassFlux4.exp','definitionenum',Outputdefinition4Enum()),
+                massfluxatgate('name','MassFlux5','profilename','../Exp/MassFlux5.exp','definitionenum',Outputdefinition5Enum()),
+                massfluxatgate('name','MassFlux6','profilename','../Exp/MassFlux6.exp','definitionenum',Outputdefinition6Enum())
                 ]