Changeset 915

Timestamp:

06/11/09 15:28:01 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed output

Location:

issm/trunk/src/m/solutions/cielo

Files:

• loadcontrolfinalsol.m (modified) (1 diff)
• loadresults.m (modified) (1 diff)
• prognostic.m (modified) (1 diff)
• thermal.m (modified) (1 diff)
• transient2d.m (modified) (1 diff)
• transient3d.m (modified) (1 diff)

issm/trunk/src/m/solutions/cielo/loadcontrolfinalsol.m

@@ -1 +1 @@
 function md=loadfinalcontrolsol(md,solution);
 
-if isnan(md.results), md.results=struct(); end
+if ~isstruct(md.results), md.results=struct(); end
 md.results.control.vx=solution.vx*md.yts;
 md.results.control.vy=solution.vy*md.yts;

issm/trunk/src/m/solutions/cielo/loadresults.m

@@ -14 +14 @@
 isstokes=m_ds.parameters.isstokes;
 
-if isnan(md.results), md.results=struct(); end 
+if ~isstruct(md.results), md.results=struct(); end 
 if dim==2,
         results.step=1;

issm/trunk/src/m/solutions/cielo/prognostic.m

@@ -28 +28 @@
 
         displaystring(md.debug,'\n%s',['load results...']);
-        if isnan(md.results), md.results=struct(); end
+        if ~isstruct(md.results), md.results=struct(); end
         md.results.prognostic.step=1;
         md.results.prognostic.time=0;

issm/trunk/src/m/solutions/cielo/thermal.m

@@ -29 +29 @@
 
         %plug onto the model
-        if isnan(md.results), md.results=struct(); end
+        if ~isstruct(md.results), md.results=struct(); end
         md.results.thermal=results;
 

issm/trunk/src/m/solutions/cielo/transient2d.m

@@ -109 +109 @@
         results(i).thickness=solution(i).h_g;
 end
-if isnan(md.results), md.results=struct(); end
+if ~isstruct(md.results), md.results=struct(); end
 md.results.transient=results;

issm/trunk/src/m/solutions/cielo/transient3d.m

@@ -149 +149 @@
         results(i).melting=solution(i).m_g;
 end
-if isnan(md.results), md.results=struct(); end
+if ~isstruct(md.results), md.results=struct(); end
 md.results.transient=results;