Changeset 6736

Timestamp:

12/16/10 17:10:04 (14 years ago)

Author:

Eric.Larour

Message:

New parseresults routine when we are using split io on the cluster.

Location:

issm/trunk/src/m/model

Files:

• ReadDataDimensions.m (added)
• SectionValues.m (modified) (1 diff)
• loadresultsfromdisk.m (modified) (1 diff)
• parseresultsfromdisk.m (modified) (2 diffs)
• parseresultsfromdiskioserial.m (added)
• parseresultsfromdiskiosplit.m (added)
• tres.m (modified) (1 diff)

issm/trunk/src/m/model/SectionValues.m

@@ -82 +82 @@
 
         %Interpolation of data on specified points
-        data_interp=InterpFromMeshToMesh2d(md.elements,md.x,md.y,data,X,Y);
-        %data_interp=griddata(md.x,md.y,data,X,Y);
+        %data_interp=InterpFromMeshToMesh2d(md.elements,md.x,md.y,data,X,Y);
+        data_interp=griddata(md.x,md.y,data,X,Y);
 
         %Compute index

issm/trunk/src/m/model/loadresultsfromdisk.m

@@ -19 +19 @@
 
         %load results onto model
-        structure=parseresultsfromdisk(filename);
+        structure=parseresultsfromdisk(filename,~md.io_gather);
         md.results.(structure.SolutionType)=structure;
 

issm/trunk/src/m/model/parseresultsfromdisk.m

@@ -1 @@
-function results=parseresultsfromdisk(filename)
+function results=parseresultsfromdisk(filename,iosplit)
 %PARSERESULTSFROMDISK - ...
 %
 %   Usage:
-%      results=parseresultsfromdisk(filename)
+%      results=parseresultsfromdisk(filename,iosplit)
 
-%Open file
-fid=fopen(filename,'rb');
-if(fid==-1),
-        error(['loadresultsfromdisk error message: could not open ',filename,' for binary reading']);
-end
-results=struct();
 
-%Read fields until the end of the file.
-result=ReadData(fid);
-while ~isempty(result),
 
-        %Get time and step
-        results(result.step).step=result.step;
-        results(result.step).time=result.time; 
-
-        %Add result
-        if (length(results)>=result.step & isfield(results,result.fieldname) & ~strcmp(result.fieldname,'SolutionType')),
-                results(result.step).(result.fieldname)=[ results(result.step).(result.fieldname); result.field];
-        else
-                results(result.step).(result.fieldname)=result.field;
-        end
-
-        %read next result
-        result=ReadData(fid);
-
+if iosplit,
+        results=parseresultsfromdiskiosplit(filename);
+else
+        results=parseresultsfromdiskioserial(filename);
 end
 
@@ -36 +17 @@
 
 fclose(fid);
+end

issm/trunk/src/m/model/tres.m

@@ -74 +74 @@
         md.temperature=PatchToVec(md.results.SteadystateSolution.Temperature);
         md.melting_rate=PatchToVec(md.results.SteadystateSolution.MeltingRate);
+        
+        if md.control_analysis==1,
+                if control_type==md.control_type
+                        md.(EnumToModelField(control_type))=PatchToVec(md.results.DiagnosticSolution.(EnumToString(control_type)));
+                end
+        end
+
 elseif strcmpi(string,'thermal'),
         md.temperature=PatchToVec(md.results.ThermalSolution.Temperature);