[cig-commits] r4489 - in mc/3D/CitcomS/trunk/visual/Mayavi2: .
plugins
maweier at geodynamics.org
maweier at geodynamics.org
Wed Sep 6 15:33:31 PDT 2006
Author: maweier
Date: 2006-09-06 15:33:30 -0700 (Wed, 06 Sep 2006)
New Revision: 4489
Modified:
mc/3D/CitcomS/trunk/visual/Mayavi2/Citcoms_Hdf2Vtk.py
mc/3D/CitcomS/trunk/visual/Mayavi2/plugins/CitcomSHDFUgrid.py
Log:
Got rid of the iterator to change the order.
Modified: mc/3D/CitcomS/trunk/visual/Mayavi2/Citcoms_Hdf2Vtk.py
===================================================================
--- mc/3D/CitcomS/trunk/visual/Mayavi2/Citcoms_Hdf2Vtk.py 2006-09-06 22:30:19 UTC (rev 4488)
+++ mc/3D/CitcomS/trunk/visual/Mayavi2/Citcoms_Hdf2Vtk.py 2006-09-06 22:33:30 UTC (rev 4489)
@@ -162,11 +162,6 @@
print "Processing cap",capnr+1,"of",nproc_surf
cap = f.root._f_getChild("cap%02d" % capnr)
- temp_coords = [] # reset Coordinates, Velocity, Temperature Sequence
- temp_vel = []
- temp_temp = []
- temp_visc = []
-
#Information from hdf
#This information needs to be read only once
@@ -187,7 +182,7 @@
nx_redu_iter = reduce_iter(nx,nx_redu)
ny_redu_iter = reduce_iter(ny,ny_redu)
nz_redu_iter = reduce_iter(nz,nz_redu)
- vtk_i = vtk_iter(el_nx_redu,el_ny_redu,el_nz_redu)
+ #vtk_i = vtk_iter(el_nx_redu,el_ny_redu,el_nz_redu)
# read citcom data - zxy (z fastest)
for j in xrange(el_ny_redu):
@@ -199,17 +194,20 @@
for k in xrange(el_nz_redu):
k_redu = nz_redu_iter.next()
- thet , phi, r = map(float,hdf_coords[i_redu,j_redu,k_redu])
- temp_coords.append((thet,phi,r))
+ colat, lon, r = map(float,hdf_coords[i_redu,j_redu,k_redu])
+ x_coord, y_coord, z_coord = RTF2XYZ(colat,lon,r)
+ ordered_points.append((x_coord,y_coord,z_coord))
+
+ ordered_temperature.append(float(hdf_temperature[i_redu,j_redu,k_redu]))
+ ordered_visc.append(float(hdf_viscosity[i_redu,j_redu,k_redu]))
+
vel_colat, vel_lon , vel_r = map(float,hdf_velocity[i_redu,j_redu,k_redu])
- temperature = float(hdf_temperature[i_redu,j_redu,k_redu])
- visc = float(hdf_viscosity[i_redu,j_redu,k_redu])
-
- temp_vel.append((vel_colat,vel_lon,vel_r))
- temp_temp.append(temperature)
- temp_visc.append(visc)
-
+ x_velo, y_velo, z_velo = velocity2cart(vel_colat,vel_lon,vel_r, colat,lon , r)
+
+ ordered_velocity.append((x_velo,y_velo,z_velo))
+
+
##Delete Objects for GC
del hdf_coords
del hdf_velocity
@@ -223,43 +221,6 @@
###Benchmark Point 3 Start##
#start = datetime.now()
############################
-
- # rearange vtk data - xyz (x fastest).
- for n0 in xrange(el_nz_redu*el_ny_redu*el_nx_redu):
- iter = vtk_i.next()
-
- #if capnr==0:
- # print iter
-
- #print iter
- #Get Cartesian Coords from Coords
- #zxy Citcom to xyz Vtk
- colat, lon, r = temp_coords[iter]
- x_coord, y_coord, z_coord = RTF2XYZ(colat,lon,r)
- ordered_points.append((x_coord,y_coord,z_coord))
-
- #Get Vectors in Cartesian Coords from Velocity
- vel_colat,vel_lon,vel_r = temp_vel[iter]
- x_velo, y_velo, z_velo = velocity2cart(vel_colat,vel_lon,vel_r, colat,lon , r)
- ordered_velocity.append((x_velo,y_velo,z_velo))
-
- ordered_temperature.append(temp_temp[iter])
- ordered_visc.append(temp_visc[iter])
-
- ###Benchmark Point 3 Stop##
- #delta = datetime.now() - start
- #benchmarkstr += "%.5lf," % (delta.seconds + float(delta.microseconds)/1e6)
-
- ##Delete Unused Object for GC
- del temp_coords
- del temp_vel
- del temp_temp
- del temp_visc
-
-
- ###Benchmark Point 4 Start##
- #start = datetime.now()
- ############################
#Bottom Information from hdf
if bottom == True:
@@ -284,12 +245,12 @@
Set create surface to false"
surface = False
- ###Benchmark Point 4 Stop##
+ ###Benchmark Point 3 Stop##
#delta = datetime.now() - start
#benchmarkstr += "%.5lf," % (delta.seconds + float(delta.microseconds)/1e6)
- ###Benchmark Point 5 Start##
+ ###Benchmark Point 4 Start##
#start = datetime.now()
############################
@@ -310,11 +271,11 @@
- ###Benchmark Point 5 Stop##
+ ###Benchmark Point 4 Stop##
#delta = datetime.now() - start
#benchmarkstr += "%.5lf," % (delta.seconds + float(delta.microseconds)/1e6)
- ###Benchmark Point 6 Start##
+ ###Benchmark Point 5 Start##
#start = datetime.now()
############################
@@ -373,11 +334,11 @@
del hdf_surface_heatflux
del hdf_surface_velocity
- ###Benchmark Point 6 Stop##
+ ###Benchmark Point 5 Stop##
#delta = datetime.now() - start
#benchmarkstr += "%.5lf," % (delta.seconds + float(delta.microseconds)/1e6)
- ###Benchmark Point 7 Start##
+ ###Benchmark Point 6 Start##
#start = datetime.now()
############################
@@ -426,7 +387,7 @@
polygons2d.append([n0,n1,n2,n3])
i+=1
- ###Benchmark Point 7 Stop##
+ ###Benchmark Point 6 Stop##
#delta = datetime.now() - start
#benchmarkstr += "%.5lf\n" % (delta.seconds + float(delta.microseconds)/1e6)
#print benchmarkstr
@@ -435,7 +396,7 @@
#Write Data to VTK
#benchmarkstr = "\n\nIO:\n"
- ###Benchmark Point 8 Start##
+ ###Benchmark Point 7 Start##
#start = datetime.now()
############################
@@ -455,11 +416,11 @@
data.tofile(vtk_path + (vtkfile % ('surface',t)),'binary')
print "Written Surface information to file"
- ###Benchmark Point 8 Stop##
+ ###Benchmark Point 7 Stop##
#delta = datetime.now() - start
#benchmarkstr += "%.5lf," % (delta.seconds + float(delta.microseconds)/1e6)
- ###Benchmark Point 9 Start##
+ ###Benchmark Point 8 Start##
#start = datetime.now()
############################
@@ -479,13 +440,13 @@
print "Written Bottom information to file"
- ###Benchmark Point 9 Stop##
+ ###Benchmark Point 8 Stop##
#delta = datetime.now() - start
#benchmarkstr += "%.5lf," % (delta.seconds + float(delta.microseconds)/1e6)
- ###Benchmark Point 10 Start##
+ ###Benchmark Point 9 Start##
#start = datetime.now()
#General Data
@@ -503,7 +464,7 @@
data.tofile(vtk_path + (vtkfile % ('general',t)),'binary')
print "Written general data to file"
- ###Benchmark Point 10 Stop##
+ ###Benchmark Point 9 Stop##
#delta = datetime.now() - start
#benchmarkstr += "%.5lf\n" % (delta.seconds + float(delta.microseconds)/1e6)
Modified: mc/3D/CitcomS/trunk/visual/Mayavi2/plugins/CitcomSHDFUgrid.py
===================================================================
--- mc/3D/CitcomS/trunk/visual/Mayavi2/plugins/CitcomSHDFUgrid.py 2006-09-06 22:30:19 UTC (rev 4488)
+++ mc/3D/CitcomS/trunk/visual/Mayavi2/plugins/CitcomSHDFUgrid.py 2006-09-06 22:33:30 UTC (rev 4489)
@@ -1,3 +1,23 @@
+# Script to generate VTKUnstructuredGrid objects from CitcomS hdf files
+# author: Martin Weier
+# Copyright (C) 2006 California Institue of Technology
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+
from enthought.tvtk.api import tvtk
import tables #For HDF support
import numpy
@@ -75,9 +95,6 @@
vtkordered_velo = tvtk.FloatArray()
- ordered_temp = []
- ordered_visc = []
-
nx = self._nx
ny = self._ny
nz = self._nz
@@ -89,7 +106,7 @@
ordered_points = [] #reset Sequences for points
ordered_temperature = []
ordered_velocity = []
- ordered_visc = []
+ ordered_viscosity = []
for capnr in xrange(nproc_surf):
@@ -113,7 +130,7 @@
ny_redu_iter = self.reduce_iter(ny,ny_redu)
nz_redu_iter = self.reduce_iter(nz,nz_redu)
- vtk_i = self.vtk_iter(el_nx_redu,el_ny_redu,el_nz_redu)
+ #vtk_i = self.vtk_iter(el_nx_redu,el_ny_redu,el_nz_redu)
# read citcom data - zxy (z fastest)
@@ -125,51 +142,27 @@
nz_redu_iter = self.reduce_iter(nz,nz_redu)
for k in xrange(el_nz_redu):
k_redu = nz_redu_iter.next()
- thet , phi, r = map(float,hdf_coords[i_redu,j_redu,k_redu])
- temp_coords.append((thet,phi,r))
-
- vel_colat, vel_lon , vel_r = map(float,hdf_velocity[i,j,k])
- temperature = float(hdf_temperature[i,j,k])
- visc = float(hdf_viscosity[i,j,k])
- temp_vel.append((vel_colat,vel_lon,vel_r))
- temp_temp.append(temperature)
- temp_visc.append(visc)
-
+ colat, lon, r = map(float,hdf_coords[i_redu,j_redu,k_redu])
+ x_coord, y_coord, z_coord = self.RTF2XYZ(colat,lon,r)
+ ordered_points.append((x_coord,y_coord,z_coord))
+
+ ordered_temperature.append(float(hdf_temperature[i_redu,j_redu,k_redu]))
+ ordered_viscosity.append(float(hdf_viscosity[i_redu,j_redu,k_redu]))
+
+
+ vel_colat, vel_lon , vel_r = map(float,hdf_velocity[i_redu,j_redu,k_redu])
+ x_velo, y_velo, z_velo = self.velocity2cart(vel_colat,vel_lon,vel_r, colat,lon , r)
+
+ ordered_velocity.append((x_velo,y_velo,z_velo))
+
+
##Delete Objects for GC
del hdf_coords
del hdf_velocity
del hdf_temperature
del hdf_viscosity
-
-
- # rearange vtk data - xyz (x fastest).
- for n0 in xrange(el_nz_redu*el_ny_redu*el_nx_redu):
- iter = vtk_i.next()
- #print iter
- #Get Cartesian Coords from Coords
- #zxy Citcom to xyz Vtk
- colat, lon, r = temp_coords[iter]
- x_coord, y_coord, z_coord = self.RTF2XYZ(colat,lon,r)
- ordered_points.append((x_coord,y_coord,z_coord))
-
- ordered_temp.append(temp_temp[iter])
- ordered_visc.append(temp_visc[iter])
-
-
- #Get Vectors in Cartesian Coords from Velocity field
- vel_colat,vel_lon,vel_r = temp_vel[iter]
- x_velo, y_velo, z_velo = self.velocity2cart(vel_colat,vel_lon,vel_r, colat,lon , r)
- ordered_velocity.append((x_velo,y_velo,z_velo))
- ################################################
-
-
- ##Delete Unused Object for GC
- del temp_coords
- del temp_vel
- del temp_temp
- del temp_visc
#Create Connectivity info
@@ -204,8 +197,8 @@
#Store Arrays in Vtk conform Datastructures
- self.__vtkordered_temp.from_array(ordered_temp)
- self.__vtkordered_visc.from_array(ordered_visc)
+ self.__vtkordered_temp.from_array(ordered_temperature)
+ self.__vtkordered_visc.from_array(ordered_viscosity)
vtkordered_velo.from_array(ordered_velocity)
self.__vtkordered_temp.name = 'Temperature'
@@ -259,4 +252,4 @@
return self.__vtkordered_visc
def get_vtk_temperature(self):
- return self.__vtkordered_temp
\ No newline at end of file
+ return self.__vtkordered_temp
More information about the cig-commits
mailing list