Changeset 16297

Timestamp:

10/04/13 11:15:33 (11 years ago)

Author:

Eric.Larour

Message:

NEW: starting new way of processing responses.

Location:

issm/trunk-jpl

Files:

• src/m/classes/massfluxatgate.m (added)
• src/m/classes/model.m (modified) (3 diffs)
• src/m/classes/outputdefinition.m (added)
• src/m/classes/qmu.m (modified) (3 diffs)
• src/m/classes/qmu.py (modified) (3 diffs)
• test/NightlyRun/test234.m (modified) (1 diff)

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

@@ -45 +45 @@
 
                 results          = 0;
+                outputdefinition = 0;
                 radaroverlay     = 0;
                 miscellaneous    = 0;
@@ -1071 +1072 @@
                         md.radaroverlay     = radaroverlay();
                         md.results          = struct();
+                        md.outputdefinition = outputdefinition();
                         md.miscellaneous    = miscellaneous();
                         md.private          = private();
@@ -1107 +1109 @@
                         disp(sprintf('%19s: %-22s -- %s','inversion'       ,['[1x1 ' class(obj.inversion) ']'],'parameters for inverse methods'));
                         disp(sprintf('%19s: %-22s -- %s','qmu'             ,['[1x1 ' class(obj.qmu) ']'],'dakota properties'));
+                        disp(sprintf('%19s: %-22s -- %s','outputdefinition',['[1x1 ' class(obj.outputdefinition) ']'],'output definition'));
                         disp(sprintf('%19s: %-22s -- %s','results'         ,['[1x1 ' class(obj.results) ']'],'model results'));
                         disp(sprintf('%19s: %-22s -- %s','radaroverlay'    ,['[1x1 ' class(obj.radaroverlay) ']'],'radar image for plot overlay'));

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

@@ -17 +17 @@
                 variabledescriptors         = {};
                 responsedescriptors         = {};
-                mass_flux_profile_directory = NaN;
-                mass_flux_profiles          = NaN;
-                mass_flux_segments          = {};
                 adjacency                   = NaN;
                 vertex_weight               = NaN;
@@ -133 +130 @@
                         fielddisplay(obj,'responsedescriptors','');
                         fielddisplay(obj,'method','array of dakota_method class');
-                        fielddisplay(obj,'mass_flux_profile_directory','directory for mass flux profiles');
-                        fielddisplay(obj,'mass_flux_profiles','list of mass_flux profiles');
-                        fielddisplay(obj,'mass_flux_segments','');
                         fielddisplay(obj,'adjacency','');
                         fielddisplay(obj,'vertex_weight','weight applied to each mesh vertex');
@@ -151 +145 @@
                         WriteData(fid,'object',obj,'fieldname','variabledescriptors','format','StringArray');
                         WriteData(fid,'object',obj,'fieldname','responsedescriptors','format','StringArray');
-                        if ~isempty(obj.mass_flux_segments), 
-                                WriteData(fid,'data',obj.mass_flux_segments,'enum',MassFluxSegmentsEnum,'format','MatArray');
-                                flag=true; 
-                        else 
-                                flag=false; 
-                        end
-                        WriteData(fid,'data',flag,'enum',QmuMassFluxSegmentsPresentEnum,'format','Boolean');
                 end % }}}
         end

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

@@ -27 +27 @@
                 self.variabledescriptors         = []
                 self.responsedescriptors         = []
-                self.mass_flux_profile_directory = float('NaN')
-                self.mass_flux_profiles          = float('NaN')
-                self.mass_flux_segments          = []
                 self.adjacency                   = float('NaN')
                 self.vertex_weight               = float('NaN')
@@ -126 +123 @@
                 s+="%s\n" % fielddisplay(self,'responsedescriptors','')
                 s+="%s\n" % fielddisplay(self,'method','array of dakota_method class')
-                s+="%s\n" % fielddisplay(self,'mass_flux_profile_directory','directory for mass flux profiles')
-                s+="%s\n" % fielddisplay(self,'mass_flux_profiles','list of mass_flux profiles')
-                s+="%s\n" % fielddisplay(self,'mass_flux_segments','')
                 s+="%s\n" % fielddisplay(self,'adjacency','')
                 s+="%s\n" % fielddisplay(self,'vertex_weight','weight applied to each mesh vertex')
@@ -144 +138 @@
                 WriteData(fid,'object',self,'fieldname','variabledescriptors','format','StringArray')
                 WriteData(fid,'object',self,'fieldname','responsedescriptors','format','StringArray')
-                if not self.mass_flux_segments:
-                        WriteData(fid,'data',self.mass_flux_segments,'enum',MassFluxSegmentsEnum(),'format','MatArray');
-                        flag=True; 
-                else:
-                        flag=False; 
-                WriteData(fid,'data',flag,'enum',QmuMassFluxSegmentsPresentEnum(),'format','Boolean');
         # }}}

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

@@ -28 +28 @@
 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
 md.qmu.responses.IceVolume=response_function('IceVolume',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.qmu.responses.massFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.qmu.responses.MassFlux1=response_function('MassFlux1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.qmu.responses.MassFlux2=response_function('MassFlux2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.qmu.responses.MassFlux3=response_function('MassFlux3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.qmu.responses.MassFlux4=response_function('MassFlux4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.qmu.responses.MassFlux5=response_function('MassFlux5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.qmu.responses.massFlux6=response_function('MassFlux6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
 
-%mass flux profiles
-md.qmu.mass_flux_profiles={'../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp'};
-md.qmu.mass_flux_profile_directory=pwd;
+md.outputdefinition.list={...
+                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')...
+        };
+
 
 %%  nond_sampling study