Changeset 20297

Timestamp:

03/04/16 20:48:49 (9 years ago)

Author:

Eric.Larour

Message:

CHG: minor changes, adjustmnets.

Location:

issm/trunk-jpl/src/m/classes

Files:

• outputdefinition.js (modified) (1 diff)
• qmu.js (modified) (1 diff)

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

@@ -37 +37 @@
                 }
                 enums=ArrayUnique(enums);
+                if (enums.length==0){ enums=NaN; }
                 WriteData(fid,'data',enums,'enum',OutputdefinitionListEnum(),'format','DoubleMat','mattype',1);
                 }//}}}

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

@@ -103 +103 @@
                         WriteData(fid,'object',this,'fieldname','isdakota','format','Boolean');
                         if (!this.isdakota){
-                                WriteData(fid,'data',false,'enum',QmuMassFluxSegmentsPresentEnum(),'format','Boolean');
-                                return; 
+                                WriteData(fid,'data',0,'enum',QmuMassFluxSegmentsPresentEnum(),'format','Boolean');
                         }
-                        WriteData(fid,'object',this,'fieldname','partition','format','DoubleMat','mattype',2);
-                        WriteData(fid,'object',this,'fieldname','numberofpartitions','format','Integer');
-                        WriteData(fid,'object',this,'fieldname','numberofresponses','format','Integer');
-                        WriteData(fid,'object',this,'fieldname','variabledescriptors','format','StringArray');
-                        WriteData(fid,'object',this,'fieldname','responsedescriptors','format','StringArray');
-                        if (this.mass_flux_segments.length){
-                                WriteData(fid,'data',this.mass_flux_segments,'enum',MassFluxSegmentsEnum(),'format','MatArray');
-                                flag=true; 
+                        else{
+                                WriteData(fid,'object',this,'fieldname','partition','format','DoubleMat','mattype',2);
+                                WriteData(fid,'object',this,'fieldname','numberofpartitions','format','Integer');
+                                WriteData(fid,'object',this,'fieldname','numberofresponses','format','Integer');
+                                WriteData(fid,'object',this,'fieldname','variabledescriptors','format','StringArray');
+                                WriteData(fid,'object',this,'fieldname','responsedescriptors','format','StringArray');
+                                if (this.mass_flux_segments.length){
+                                        WriteData(fid,'data',this.mass_flux_segments,'enum',MassFluxSegmentsEnum(),'format','MatArray');
+                                        flag=true; 
+                                }
+                                else flag=false; 
+                                WriteData(fid,'data',flag,'enum',QmuMassFluxSegmentsPresentEnum(),'format','Boolean');
                         }
-                        else flag=false; 
-                        WriteData(fid,'data',flag,'enum',QmuMassFluxSegmentsPresentEnum(),'format','Boolean');
                 }//}}}
                 this.fix=function() { //{{{