Changeset 17379

Timestamp:

03/04/14 11:58:23 (11 years ago)

Author:

bdef

Message:

BUG: Fix in exportVTK to deal with simulation without results

Location:

issm/trunk-jpl/src/m

Files:

• contrib/paraview/exportVTK.m (modified) (2 diffs)
• enum/DamageEvolutionNumRequestedOutputsEnum.m (deleted)
• enum/DamageEvolutionRequestedOutputsEnum.m (deleted)
• exp/expdisp.m (modified) (1 diff)

issm/trunk-jpl/src/m/contrib/paraview/exportVTK.m

@@ -39 +39 @@
 %this is the result structure
 res_struct=model.results;
-%Getting all the solutions of the model
-solnames=fields(res_struct);
-num_of_sols=length(solnames);
-num_of_timesteps=1;
-%building solution structure 
-for i=1:num_of_sols
-        sol_struct{i}=res_struct.(solnames{i});
-        %looking for multiple time steps
-        if(size(sol_struct{i},2)>num_of_timesteps);
-                num_of_timesteps=size(sol_struct{i},2);
+%checking for results
+if (length(fields(res_struct))>0);
+        %Getting all the solutions of the model
+        solnames=fields(res_struct);
+        num_of_sols=length(solnames);
+        num_of_timesteps=1;
+        %building solution structure 
+        for i=1:num_of_sols
+                sol_struct{i}=res_struct.(solnames{i});
+                %looking for multiple time steps
+                if(size(sol_struct{i},2)>num_of_timesteps);
+                        num_of_timesteps=size(sol_struct{i},2);
   end
+ end
+else
+        num_of_timesteps=1;
 end
-
 for step=1:num_of_timesteps;
         
@@ -85 +89 @@
 
         %loop over the different solution structures
-        for j=1:num_of_sols
-                %dealing with results on different timesteps
-                if(size(sol_struct{j},2)>timestep);
-                        timestep = step;
-                else
-                        timestep = size(sol_struct{j},2);
+        if (exist('num_of_sols'));
+                for j=1:num_of_sols
+                        %dealing with results on different timesteps
+                        if(size(sol_struct{j},2)>timestep);
+                                timestep = step;
+                        else
+                                timestep = size(sol_struct{j},2);
+            end
+                        
+                        %getting the number of fields in the solution
+                        fieldnames=fields(sol_struct{j}(timestep));
+                        num_of_fields=length(fieldnames);
+                        
+                        %check which field is a real result and print
+                        for k=1:num_of_fields
+                                if ((numel(sol_struct{j}(timestep).(fieldnames{k})))== ...
+                                                num_of_points);
+                                        %paraview does not like NaN, replacing
+                                        nanval=find(isnan(sol_struct{j}(timestep).(fieldnames{k})));
+                                        sol_struct{j}(timestep).(fieldnames{k})(nanval)=-9999;
+                                        %also checking for verry small value that mess up
+                                        smallval=(abs(sol_struct{j}(timestep).(fieldnames{k}))<1.0e-20);
+                                        sol_struct{j}(timestep).(fieldnames{k})(smallval)=0.0;
+                                        fprintf(FID,'SCALARS %s float 1 \n',fieldnames{k});
+                                        fprintf(FID,'LOOKUP_TABLE default\n');
+                                        s='%e\n';
+                                        fprintf(FID,s,sol_struct{j}(timestep).(fieldnames{k}));
+                    end         
+            end 
           end
-
-                %getting the number of fields in the solution
-                fieldnames=fields(sol_struct{j}(timestep));
-                num_of_fields=length(fieldnames);
-                
-                %check which field is a real result and print
-                        for k=1:num_of_fields
-                        if ((numel(sol_struct{j}(timestep).(fieldnames{k})))== ...
-                                        num_of_points);
-                                %paraview does not like NaN, replacing
-                                nanval=find(isnan(sol_struct{j}(timestep).(fieldnames{k})));
-                                sol_struct{j}(timestep).(fieldnames{k})(nanval)=-9999;
-                                %also checking for verry small value that mess up
-                                smallval=(abs(sol_struct{j}(timestep).(fieldnames{k}))<1.0e-20);
-                                sol_struct{j}(timestep).(fieldnames{k})(smallval)=0.0;
-                                fprintf(FID,'SCALARS %s float 1 \n',fieldnames{k});
-                                fprintf(FID,'LOOKUP_TABLE default\n');
-                                s='%e\n';
-                                fprintf(FID,s,sol_struct{j}(timestep).(fieldnames{k}));
-        end             
-          end 
-        end
-        
+  end
         %loop on arguments, if something other than result is asked, do
         %it now

issm/trunk-jpl/src/m/exp/expdisp.m

@@ -46 +46 @@
 for i=1:length(domain),         
         if domain(i).nods==1
-                plot(domain(i).x*unitmultiplier,domain(i).y*unitmultiplier,'ok','MarkerSize',10);
+                plot(domain(i).x*unitmultiplier,domain(i).y*unitmultiplier,'o','MarkerEdgeColor','k','MarkerFaceColor','r','MarkerSize',10);
         else
                 if (isnumeric(linestyle))