Changeset 20786

Timestamp:

06/20/16 23:51:33 (9 years ago)

Author:

bdef

Message:

updating paraview writer

Location:

issm/trunk-jpl/src/m/contrib/defleurian/paraview

Files:

• enveloppeVTK.m (modified) (2 diffs)
• enveloppeVTK.py (added)
• exportVTK.m (modified) (2 diffs)
• exportVTK.py (modified) (4 diffs)

issm/trunk-jpl/src/m/contrib/defleurian/paraview/enveloppeVTK.m

@@ -25 +25 @@
         points=[model.mesh.x model.mesh.y zeros(model.mesh.numberofvertices,1)];
         [num_of_elt]=size(model.mesh.elements,1);
-        [point_per_elt]=size(model.mesh.elements,2);
 else
         points=[model.mesh.x(IsEnveloppe) model.mesh.y(IsEnveloppe) model.mesh.z(IsEnveloppe)];
@@ -35 +34 @@
 celltype=5; %triangles
 [num_of_points,dim]=size(points);
+[point_per_elt]=size(model.mesh.elements,2);
 tot_points=model.mesh.numberofvertices;
 

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

@@ -22 +22 @@
 if dimension(model.mesh)==2,
         points=[model.mesh.x model.mesh.y zeros(model.mesh.numberofvertices,1)];
-        [num_of_points,dim]=size(points);
-        [num_of_elt]=size(model.mesh.elements,1);
-        [point_per_elt]=size(model.mesh.elements,2);
 else
         points=[model.mesh.x model.mesh.y model.mesh.z];
-        [num_of_points,dim]=size(points);
-        [num_of_elt]=size(model.mesh.elements,1);
-        [point_per_elt]=size(model.mesh.elements,2);
 end
 
+[num_of_points,dim]=size(points);
+[num_of_elt]=size(model.mesh.elements,1);
+[point_per_elt]=size(model.mesh.elements,2);
 
 %Select the type of element function of the number of nodes per elements
@@ -56 +53 @@
                 if(size(sol_struct{i},2)>num_of_timesteps);
                         num_of_timesteps=size(sol_struct{i},2);
+      outstep=model.timestepping.time_step*model.settings.output_frequency;
           end
-                outstep=model.timestepping.time_step*model.settings.output_frequency;
   end
 else

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

@@ -67 +67 @@
                 num_of_sols=len(solnames)
                 num_of_timesteps=1
-                out_freq=model.settings.output_frequency
                 #%building solutionstructure 
                 for solution in solnames:
@@ -73 +72 @@
                         if (numpy.size(res_struct.__dict__[solution])>num_of_timesteps):
                                 num_of_timesteps=numpy.size(res_struct.__dict__[solution])
-                                num_of_timesteps=int(num_of_timesteps/out_freq)+1
+                                num_of_timesteps=int(num_of_timesteps)+1
         else:
                 num_of_timesteps=1
@@ -120 +119 @@
                                 #getting the  fields in the solution
                                 if(numpy.size(res_struct.__dict__[sol])>1):
-                                        fieldnames=dict.keys(res_struct.__dict__[sol].__getitem__(timestep*out_freq-1).__dict__)
+                                        fieldnames=dict.keys(res_struct.__dict__[sol].__getitem__(timestep-1).__dict__)
                                 else:
                                         fieldnames=dict.keys(res_struct.__dict__[sol].__dict__)
@@ -126 +125 @@
                                 for field in fieldnames:
                                         if(numpy.size(res_struct.__dict__[sol])>1):
-                                                fieldstruct=res_struct.__dict__[sol].__getitem__(timestep*out_freq-1).__dict__[field]
+                                                fieldstruct=res_struct.__dict__[sol].__getitem__(timestep-1).__dict__[field]
                                         else:
                                                 fieldstruct=res_struct.__dict__[sol].__dict__[field]