Changeset 4202 for issm/trunk

Timestamp:

06/24/10 15:24:24 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed matlab readdata

Location:

issm/trunk/src/m/classes/public

Files:

• ReadData.m (modified) (1 diff)
• isresultconsistent.m (modified) (4 diffs)
• loadresultsfromdisk.m (modified) (2 diffs)

issm/trunk/src/m/classes/public/ReadData.m

@@ -27 +27 @@
         elseif type==3,
                 N=fread(fid,1,'int');
-                field=fread(fid,M*N,'double');
+                field=fread(fid,[M N],'double');
+        else
+                error(['cannot read data of type ' num2str(type) ]);
         end
 

issm/trunk/src/m/classes/public/isresultconsistent.m

@@ -26 +26 @@
 
 %DIAGNOSTIC
-if analysis_type==DiagnosticAnalysisEnum() & md.control_analysis==0,
+if analysis_type==DiagnosticSolutionEnum() & md.control_analysis==0,
 
         if (md.dim==3)
@@ -59 +59 @@
 
 %CONTROL
-if analysis_type==DiagnosticAnalysisEnum() & md.control_analysis==1,
+if analysis_type==DiagnosticSolutionEnum() & md.control_analysis==1,
 
         if ~md.cm_gradient,
@@ -118 +118 @@
 
 %THERMAL
-if analysis_type==ThermalAnalysisEnum(),
+if analysis_type==ThermalSolutionEnum(),
 
         for iter=1:length(md.results.ThermalAnalysis)
@@ -154 +154 @@
 end
 
-if analysis_type==TransientAnalysisEnum(),
+if (analysis_type==Transient2DSolutionEnum() | analysis_type==Transient3DSolutionEnum()),
 
         for iter=1:length(md.results.TransientAnalysis)

issm/trunk/src/m/classes/public/loadresultsfromdisk.m

@@ -20 +20 @@
         %load results onto model
         structure=parseresultsfromdisk(filename);
-        md.results.(structure.analysis_type)=structure;
+        md.results.(structure.SolutionType)=structure;
 
         %recover analysis_type from results
-        md.analysis_type=structure(1).analysis_type;
+        md.analysis_type=structure(1).SolutionType;
         if isscalar(md.sub_analysis_type),
                 md.sub_analysis_type=EnumAsString(md.sub_analysis_type);
@@ -30 +30 @@
         %Check result is consistent, only if it exists
         disp(sprintf('%s\n','checking result consistency'));
-        if ~isresultconsistent(md,structure(1).analysis_type),
+        if ~isresultconsistent(md,structure(1).SolutionType),
                 %it would be very cruel to use an error, it would kill the computed results (although they are not consistent...)
                 disp('!! results not consistent correct the model !!')