<p><b>dwj07@fsu.edu</b> 2012-04-25 09:53:59 -0600 (Wed, 25 Apr 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Rescaling cells and vertices using the same scalings.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/tools/mpas_draw/mpas_draw.cpp
===================================================================
--- branches/tools/mpas_draw/mpas_draw.cpp 2012-04-25 15:07:06 UTC (rev 1807)
+++ branches/tools/mpas_draw/mpas_draw.cpp 2012-04-25 15:53:59 UTC (rev 1808)
@@ -32,8 +32,7 @@
void setup_ranges();
void build_range(int id);
-void rescale_cells();
-void rescale_vertices();
+void rescale_cells_and_vertices();
void draw_cells();
void draw_triangles();
@@ -692,8 +691,7 @@
netcdf_mpas_read_xyzcell ( filename, ncells, xcell, ycell, zcell );
netcdf_mpas_read_xyzvertex ( filename, nvertices, xvertex, yvertex, zvertex );
- rescale_cells();
- rescale_vertices();
+ rescale_cells_and_vertices();
netcdf_mpas_read_verticesoncell ( filename, maxedges, ncells, verticesoncell );
netcdf_mpas_read_verticesonedge ( filename, nedges, verticesonedge );
@@ -1202,12 +1200,12 @@
}
}/*}}}*/
-void rescale_cells(){/*{{{*/
+void rescale_cells_and_vertices(){/*{{{*/
//****************************************************************************80
//
// Purpose:
//
- // RESCALE_CELLS scales xcell, ycell, and zcell arrays to have a norm of 1
+ // RESCALE_CELLS_AND_VERTICES scales xcell, ycell, and zcell arrays to have a norm of 1
//
// Licensing:
//
@@ -1224,7 +1222,7 @@
int i;
- int cell;
+ int cell, vertex;
double norm;
xyz_min[0] = r8vec_min ( ncells, xcell, missing_value);
xyz_max[0] = r8vec_max ( ncells, xcell, missing_value);
@@ -1239,14 +1237,14 @@
if ( xyz_range[0] == 0.0 ){
cout << "</font>
<font color="red">";
- cout << "rescale_cells(): - Fatal error!</font>
<font color="blue">";
+ cout << "rescale_cells_and_vertices(): - Fatal error!</font>
<font color="black">";
cout << " The X data range is 0.</font>
<font color="black">";
exit ( 1 );
}
if ( xyz_range[1] == 0.0 ){
cout << "</font>
<font color="red">";
- cout << "rescale_cells(): - Fatal error!</font>
<font color="blue">";
+ cout << "rescale_cells_and_vertices(): - Fatal error!</font>
<font color="black">";
cout << " The Y data range is 0.</font>
<font color="gray">";
exit ( 1 );
}
@@ -1254,7 +1252,7 @@
if(on_sphere){
if ( xyz_range[2] == 0.0 ){
cout << "</font>
<font color="red">";
- cout << "rescale_cells(): - Fatal error!</font>
<font color="blue">";
+ cout << "rescale_cells_and_vertices(): - Fatal error!</font>
<font color="black">";
cout << " The Z data range is 0.</font>
<font color="gray">";
exit ( 1 );
}
@@ -1287,82 +1285,6 @@
zcell[cell] = (zcell[cell] - xyz_center[2]) / norm;
}
-}/*}}}*/
-void rescale_vertices(){/*{{{*/
- //****************************************************************************80
- //
- // Purpose:
- //
- // RESCALE_VERTICES scales xvertex, yvertex, and zvertex arrays to have a norm of 1
- //
- // Licensing:
- //
- // This code is distributed under the GNU LGPL license.
- //
- // Modified:
- //
- // 30 December 2010
- //
- // Author:
- //
- // John Burkardt, Doug Jacobsen
- //
-
- int i;
- int vertex;
- double norm;
- xyz_min[0] = r8vec_min ( nvertices, xvertex, missing_value );
- xyz_max[0] = r8vec_max ( nvertices, xvertex, missing_value );
- xyz_min[1] = r8vec_min ( nvertices, yvertex, missing_value );
- xyz_max[1] = r8vec_max ( nvertices, yvertex, missing_value );
- xyz_min[2] = r8vec_min ( nvertices, zvertex, missing_value );
- xyz_max[2] = r8vec_max ( nvertices, zvertex, missing_value );
-
- xyz_range[0] = xyz_max[0] - xyz_min[0];
- xyz_range[1] = xyz_max[1] - xyz_min[1];
- xyz_range[2] = xyz_max[2] - xyz_min[2];
-
- if ( xyz_range[0] == 0.0 ){
- cout << "</font>
<font color="red">";
- cout << "rescale_vertices(): - Fatal error!</font>
<font color="red">";
- cout << " The X data range is 0.</font>
<font color="red">";
- exit ( 1 );
- }
-
- if ( xyz_range[1] == 0.0 ){
- cout << "</font>
<font color="red">";
- cout << "rescale_vertices(): - Fatal error!</font>
<font color="red">";
- cout << " The Y data range is 0.</font>
<font color="red">";
- exit ( 1 );
- }
- if(on_sphere){
- if ( xyz_range[2] == 0.0 ){
- cout << "</font>
<font color="red">";
- cout << "rescale_vertices(): - Fatal error!</font>
<font color="red">";
- cout << " The Z data range is 0.</font>
<font color="red">";
- exit ( 1 );
- }
- }
-
- xyz_scale = 0.0;
- for (i = 0; i < 3; i++ )
- {
- xyz_center[i] = ( xyz_min[i] + xyz_max[i] ) / 2.0;
- xyz_scale = std::max ( xyz_scale, ( xyz_max[i] - xyz_min[i] ) / 2.0 );
- }
-
- if(on_sphere){
- xyz_scale = sphere_radius;
- }
- //
- // A sphere doesn't need this rescaling.
- // A box does!
- //
-// xyz_scale = sqrt ( 3.0 ) * xyz_scale;
- //
- // Translate the data so it is centered.
- // Scale the data so it fits in the unit cube.
- //
for ( vertex = 0; vertex < nvertices; vertex++ )
{
norm = xyz_scale;
</font>
</pre>