Revision: 54995
http://brlcad.svn.sourceforge.net/brlcad/?rev=54995&view=rev
Author: brlcad
Date: 2013-04-01 05:52:46 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
more floating point constant expansions to show a value after the decimal
Modified Paths:
--------------
brlcad/trunk/src/irprep/all_sf.c
brlcad/trunk/src/irprep/firpass.c
brlcad/trunk/src/irprep/ir-X.c
brlcad/trunk/src/irprep/secpass.c
brlcad/trunk/src/irprep/shapefact.c
brlcad/trunk/src/irprep/showtherm.c
Modified: brlcad/trunk/src/irprep/all_sf.c
===================================================================
--- brlcad/trunk/src/irprep/all_sf.c 2013-04-01 05:48:49 UTC (rev 54994)
+++ brlcad/trunk/src/irprep/all_sf.c 2013-04-01 05:52:46 UTC (rev 54995)
@@ -203,13 +203,13 @@
{
/* START # 110 */
info[i].name = "\0";
- info[i].lvrays = 0.;
+ info[i].lvrays = 0.0;
for (j=0; j<numreg; j++)
{
- info[i].intrays[j] = 0.;
- info[i].sf[j] = 0.;
+ info[i].intrays[j] = 0.0;
+ info[i].sf[j] = 0.0;
}
- info[i].regarea = 0.;
+ info[i].regarea = 0.0;
} /* END # 110 */
/* Get database ready by starting prep. */
@@ -217,11 +217,11 @@
/* Find the center of the bounding rpp of entire model. */
centall[X] = rtip->mdl_min[X] +
- (rtip->mdl_max[X] - rtip->mdl_min[X]) / 2.;
+ (rtip->mdl_max[X] - rtip->mdl_min[X]) / 2.0;
centall[Y] = rtip->mdl_min[Y] +
- (rtip->mdl_max[Y] - rtip->mdl_min[Y]) / 2.;
+ (rtip->mdl_max[Y] - rtip->mdl_min[Y]) / 2.0;
centall[Z] = rtip->mdl_min[Z] +
- (rtip->mdl_max[Z] - rtip->mdl_min[Z]) / 2.;
+ (rtip->mdl_max[Z] - rtip->mdl_min[Z]) / 2.0;
/* Find minimum and maximum of entire model. */
minall[X] = rtip->mdl_min[X];
@@ -236,7 +236,7 @@
+ (maxall[Y] - minall[Y]) * (maxall[Y] - minall[Y])
+ (maxall[Z] - minall[Z]) * (maxall[Z] - minall[Z]);
/* Add .5 to make sure completely outside the rpp. */
- radall = sqrt(radall) / 2. + .5;
+ radall = sqrt(radall) / 2.0 + .5;
/* Find surface area of bounding sphere. */
areaall = 4 * M_PI * radall * radall;
@@ -354,7 +354,7 @@
theta = q * 2. * M_PI;
q = BN_UNIF_DOUBLE(msr) + 0.5;
- phi = (q * 2.) - 1.;
+ phi = (q * 2.0) - 1.0;
phi = acos(phi);
rho = radall;
@@ -373,7 +373,7 @@
q = BN_UNIF_DOUBLE(msr) + 0.5;
rds = rho * sqrt(q);
- s[X] = 0.;
+ s[X] = 0.0;
s[Y] = rds * cos(theta);
s[Z] = rds * sin(theta);
@@ -452,7 +452,7 @@
{
/* START # 1070 */
/* Must divide by 2. since looking forwards & backwards. */
- info[i].regarea = info[i].lvrays / rayfir * areaall / 2.;
+ info[i].regarea = info[i].lvrays / rayfir * areaall / 2.0;
for (j=0; j<numreg; j++)
{
/* START # 1080 */
@@ -484,7 +484,7 @@
fprintf(fpw2, "Region\tArea\tEmissivity\n");
/* Area is put into square meters. */
fprintf(fpw2, "%d\t%f\n", (i + 1),
- (info[i].regarea / 1000. / 1000.));
+ (info[i].regarea / 1000. / 1000.0));
/* Count the number of shape factors. */
k = 0;
@@ -564,12 +564,12 @@
rh2 = (-1);
/* Set leave & enter points to show no hits yet. */
- lvpt[X] = (-999.);
- lvpt[Y] = (-999.);
- lvpt[Z] = (-999.);
- entpt[X] = (-999.);
- entpt[Y] = (-999.);
- entpt[Z] = (-999.);
+ lvpt[X] = (-999.0);
+ lvpt[Y] = (-999.0);
+ lvpt[Z] = (-999.0);
+ entpt[X] = (-999.0);
+ entpt[Y] = (-999.0);
+ entpt[Z] = (-999.0);
/* Set for first region. */
pp = PartHeadp->pt_forw;
@@ -594,7 +594,7 @@
lvpt[Z] = hitp->hit_point[Z];
/* Increment backwards for hitting ray. */
- info[rh1].lvrays += 1.;
+ info[rh1].lvrays += 1.0;
} /* END # 1020 */
@@ -618,9 +618,9 @@
tol[X] = lvpt[X] - entpt[X];
tol[Y] = lvpt[Y] - entpt[Y];
tol[Z] = lvpt[Z] - entpt[Z];
- if (tol[X] < 0.) tol[X] = (-tol[X]);
- if (tol[Y] < 0.) tol[Y] = (-tol[Y]);
- if (tol[Z] < 0.) tol[Z] = (-tol[Z]);
+ if (tol[X] < 0.0) tol[X] = (-tol[X]);
+ if (tol[Y] < 0.0) tol[Y] = (-tol[Y]);
+ if (tol[Z] < 0.0) tol[Z] = (-tol[Z]);
if ( (tol[X] < VDIVIDE_TOL) && (tol[Y] < VDIVIDE_TOL) && (tol[Z] <
VDIVIDE_TOL) )
{
@@ -632,12 +632,12 @@
/* START # 1040 */
/* The points are not the same; therefore, increment */
/* appropriately. */
- info[rh1].lvrays += 1.;
- info[rh1].intrays[rh2] += 1.;
+ info[rh1].lvrays += 1.0;
+ info[rh1].intrays[rh2] += 1.0;
/* Increment backwards also. */
- info[rh2].lvrays += 1.;
- info[rh2].intrays[rh1] += 1.;
+ info[rh2].lvrays += 1.0;
+ info[rh2].intrays[rh1] += 1.0;
} /* END # 1040 */
/* Find info for 1st region. */
@@ -655,7 +655,7 @@
} /* END # 1010 */
/* Increment the leaving ray since it leaves & doesn't hit anything. */
- info[rh1].lvrays += 1.;
+ info[rh1].lvrays += 1.0;
return 0;
} /* END # 1000 */
Modified: brlcad/trunk/src/irprep/firpass.c
===================================================================
--- brlcad/trunk/src/irprep/firpass.c 2013-04-01 05:48:49 UTC (rev 54994)
+++ brlcad/trunk/src/irprep/firpass.c 2013-04-01 05:52:46 UTC (rev 54995)
@@ -508,30 +508,30 @@
for (i=0; i<num; i++)
{
region[i].regname="\0";
- region[i].cumnorm[0]=0.;
- region[i].cumnorm[1]=0.;
- region[i].cumnorm[2]=0.;
- region[i].cumvol[0]=0.;
- region[i].cumvol[1]=0.;
- region[i].cumvol[2]=0.;
- region[i].centroid[0]=0.;
- region[i].centroid[1]=0.;
- region[i].centroid[2]=0.;
+ region[i].cumnorm[0]=0.0;
+ region[i].cumnorm[1]=0.0;
+ region[i].cumnorm[2]=0.0;
+ region[i].cumvol[0]=0.0;
+ region[i].cumvol[1]=0.0;
+ region[i].cumvol[2]=0.0;
+ region[i].centroid[0]=0.0;
+ region[i].centroid[1]=0.0;
+ region[i].centroid[2]=0.0;
for (k=0; k<7; k++)
{
- region[i].cumfs[k][0] = 0.;
- region[i].cumfs[k][1] = 0.;
- region[i].cumfs[k][2] = 0.;
+ region[i].cumfs[k][0] = 0.0;
+ region[i].cumfs[k][1] = 0.0;
+ region[i].cumfs[k][2] = 0.0;
}
- region[i].surarea[0]=0.;
- region[i].surarea[1]=0.;
- region[i].surarea[2]=0.;
+ region[i].surarea[0]=0.0;
+ region[i].surarea[1]=0.0;
+ region[i].surarea[2]=0.0;
for (j=0; j<num; j++)
{
region[i].adjreg[j]=0;
- region[i].ssurarea[0][j]=0.;
- region[i].ssurarea[1][j]=0.;
- region[i].ssurarea[2][j]=0.;
+ region[i].ssurarea[0][j]=0.0;
+ region[i].ssurarea[1][j]=0.0;
+ region[i].ssurarea[2][j]=0.0;
}
}
@@ -541,7 +541,7 @@
for (j=0; j<num; j++)
{
overlaps[i].ovrreg[j] = 0;
- overlaps[i].ovrdep[j] = 0.;
+ overlaps[i].ovrdep[j] = 0.0;
}
}
@@ -550,11 +550,11 @@
/* Find center of bounding rpp. */
center[X] = rtip->mdl_min[X] + (rtip->mdl_max[X]
- - rtip->mdl_min[X]) / 2.;
+ - rtip->mdl_min[X]) / 2.0;
center[Y] = rtip->mdl_min[Y] + (rtip->mdl_max[Y]
- - rtip->mdl_min[Y]) / 2.;
+ - rtip->mdl_min[Y]) / 2.0;
center[Z] = rtip->mdl_min[Z] + (rtip->mdl_max[Z]
- - rtip->mdl_min[Z]) / 2.;
+ - rtip->mdl_min[Z]) / 2.0;
/* Find length of diagonal of bounding rpp. */
diagonal = (rtip->mdl_max[X] - rtip->mdl_min[X])
@@ -563,7 +563,7 @@
* (rtip->mdl_max[Y] - rtip->mdl_min[Y])
+ (rtip->mdl_max[Z] - rtip->mdl_min[Z])
* (rtip->mdl_max[Z] - rtip->mdl_min[Z]);
- diagonal = sqrt(diagonal) / 2. + 0.5;
+ diagonal = sqrt(diagonal) / 2.0 + 0.5;
/* Find minimum and maximums. */
xmin = center[X] - diagonal;
@@ -657,11 +657,11 @@
whichview=0;
strtpt[X] = xmax;
- strtpt[Y] = ymin + gridspace / 2.;
- strtpt[Z] = zmin + gridspace / 2.;
+ strtpt[Y] = ymin + gridspace / 2.0;
+ strtpt[Z] = zmin + gridspace / 2.0;
strtdir[X] = (-1.0);
- strtdir[Y] = 0.;
- strtdir[Z] = 0.;
+ strtdir[Y] = 0.0;
+ strtdir[Z] = 0.0;
/* Put angle into radians. */
angle[X] = radians((double)GAMMA);
@@ -692,9 +692,9 @@
/* Set to show no previous shots. */
iprev=(-99);
- r[X]=xmax - center[X] + 5.;
- r[Y]=ymax - center[Y] + 5.;
- r[Z]=zmax - center[Z] + 5.;
+ r[X]=xmax - center[X] + 5.0;
+ r[Y]=ymax - center[Y] + 5.0;
+ r[Z]=zmax - center[Z] + 5.0;
(void)rotate(r, angle, t);
@@ -712,9 +712,9 @@
* (void)fflush(stdout);
*/
- lnormal[X]=0.;
- lnormal[Y]=0.;
- lnormal[Z]=0.;
+ lnormal[X]=0.0;
+ lnormal[Y]=0.0;
+ lnormal[Z]=0.0;
/* Call rt_shootray. */
(void)rt_shootray(&ap);
@@ -722,7 +722,7 @@
strtpt[Y] += gridspace;
if (strtpt[Y] > ymax)
{
- strtpt[Y] = ymin + gridspace / 2.;
+ strtpt[Y] = ymin + gridspace / 2.0;
strtpt[Z] += gridspace;
}
@@ -749,12 +749,12 @@
whichview = 1;
- strtpt[X] = xmin + gridspace / 2.;
+ strtpt[X] = xmin + gridspace / 2.0;
strtpt[Y] = ymax;
- strtpt[Z] = xmin + gridspace / 2.;
- strtdir[X] = 0.;
+ strtpt[Z] = xmin + gridspace / 2.0;
+ strtdir[X] = 0.0;
strtdir[Y] = (-1.0);
- strtdir[Z] = 0.;
+ strtdir[Z] = 0.0;
/* Angle already in radians. */
@@ -779,9 +779,9 @@
{
/* Set to show no previous shots. */
iprev = (-99);
- r[X] = xmax - center[X] + 5.;
- r[Y] = ymax - center[Y] + 5.;
- r[Z] = zmax - center[Z] + 5.;
+ r[X] = xmax - center[X] + 5.0;
+ r[Y] = ymax - center[Y] + 5.0;
+ r[Z] = zmax - center[Z] + 5.0;
(void)rotate(r, angle, t);
@@ -789,9 +789,9 @@
leavept[Y] = center[Y] + t[Y];
leavept[Z] = center[Z] + t[Z];
- lnormal[X] = 0.;
- lnormal[Y] = 0.;
- lnormal[Z] = 0.;
+ lnormal[X] = 0.0;
+ lnormal[Y] = 0.0;
+ lnormal[Z] = 0.0;
/* Call rt_shootray. */
(void)rt_shootray(&ap);
@@ -800,7 +800,7 @@
if (strtpt[X] > xmax)
{
- strtpt[X] = xmin + gridspace / 2.;
+ strtpt[X] = xmin + gridspace / 2.0;
strtpt[Z] += gridspace;
}
@@ -821,11 +821,11 @@
whichview = 2;
- strtpt[X] = xmin + gridspace / 2.;
- strtpt[Y] = ymin + gridspace / 2.;
+ strtpt[X] = xmin + gridspace / 2.0;
+ strtpt[Y] = ymin + gridspace / 2.0;
strtpt[Z] = zmax;
- strtdir[X] = 0.;
- strtdir[Y] = 0.;
+ strtdir[X] = 0.0;
+ strtdir[Y] = 0.0;
strtdir[Z] = (-1.0);
/* Angle already in radians. */
@@ -852,9 +852,9 @@
{
/* Set to show no previous shots. */
iprev = (-99);
- r[X] = xmax - center[X] + 5.;
- r[Y] = xmax - center[Y] + 5.;
- r[Z] = xmax - center[Z] + 5.;
+ r[X] = xmax - center[X] + 5.0;
+ r[Y] = xmax - center[Y] + 5.0;
+ r[Z] = xmax - center[Z] + 5.0;
(void)rotate(r, angle, t);
@@ -862,9 +862,9 @@
leavept[Y] = center[Y] + t[Y];
leavept[Z] = center[Z] + t[Z];
- lnormal[X] = 0.;
- lnormal[Y] = 0.;
- lnormal[Z] = 0.;
+ lnormal[X] = 0.0;
+ lnormal[Y] = 0.0;
+ lnormal[Z] = 0.0;
/* Call rt_shootray. */
(void)rt_shootray(&ap);
@@ -873,7 +873,7 @@
if (strtpt[X] > xmax)
{
- strtpt[X] = xmin + gridspace / 2.;
+ strtpt[X] = xmin + gridspace / 2.0;
strtpt[Y] += gridspace;
}
@@ -992,7 +992,7 @@
{
region[i].cumvol[0] = region[i].cumvol[0]
+ region[i].cumvol[1] + region[i].cumvol[2];
- region[i].cumvol[0] /= 3.;
+ region[i].cumvol[0] /= 3.0;
}
region[i].cumvol[1]=(double)flag;
@@ -1054,7 +1054,7 @@
{
region[i].surarea[0] = region[i].surarea[0]
+ region[i].surarea[1] + region[i].surarea[2];
- region[i].surarea[0] /= 3.;
+ region[i].surarea[0] /= 3.0;
}
region[i].surarea[1]=(double)flag;
@@ -1143,7 +1143,7 @@
region[i].ssurarea[0][j] = region[i].ssurarea[0][j]
+ region[i].ssurarea[1][j]
+ region[i].ssurarea[2][j];
- region[i].ssurarea[0][j] /= 3.;
+ region[i].ssurarea[0][j] /= 3.0;
}
region[i].ssurarea[1][j] = (double)flag;
}
@@ -1202,7 +1202,7 @@
region[i].cumfs[k][0] = region[i].cumfs[k][0] +
region[i].cumfs[k][1] +
region[i].cumfs[k][2];
- region[i].cumfs[k][0] /= 3.;
+ region[i].cumfs[k][0] /= 3.0;
}
region[i].cumfs[k][1] = (double)flag;
@@ -1226,9 +1226,9 @@
((-NORMTOL < region[i].cumnorm[Z]) &&
(region[i].cumnorm[Z] < NORMTOL)))
{
- region[i].cumnorm[X] = 0.;
- region[i].cumnorm[Y] = 0.;
- region[i].cumnorm[Z] = 0.;
+ region[i].cumnorm[X] = 0.0;
+ region[i].cumnorm[Y] = 0.0;
+ region[i].cumnorm[Z] = 0.0;
}
else
@@ -1244,9 +1244,9 @@
}
else
{
- region[i].cumnorm[X] = 0.;
- region[i].cumnorm[Y] = 0.;
- region[i].cumnorm[Z] = 0.;
+ region[i].cumnorm[X] = 0.0;
+ region[i].cumnorm[Y] = 0.0;
+ region[i].cumnorm[Z] = 0.0;
}
}
@@ -1653,7 +1653,7 @@
/* Convection coefficient of facet. Currently */
/* set to 1. */
- faccv = 1.;
+ faccv = 1.0;
/* Facets seen by the back & front of current */
/* facet. Will be set to 0 thereby assuming */
@@ -1669,18 +1669,18 @@
/* Shape factors for engine & track facets */
/* (between 0 & 1). Currently set to 0. */
- facshape = 0.;
+ facshape = 0.0;
/* Hub radius (m). Currently set to 0 unless engine */
/* air area exist then print engine air area in square */
/* meters. */
- facradius = 0.;
+ facradius = 0.0;
if (region[i].cumfs[2][0] > ZEROTOL)
facradius = region[i].cumfs[2][0] * (1.e-6);
/* Bearing friction constant (J) for wheels. */
/* Currently set to 0. */
- facfric = 0.;
+ facfric = 0.0;
/*
* (void)printf("facshape: %8.3f, facradius:
%8.3f, facfric: %8.3f\n",
* facshape, facradius, facfric);
Modified: brlcad/trunk/src/irprep/ir-X.c
===================================================================
--- brlcad/trunk/src/irprep/ir-X.c 2013-04-01 05:48:49 UTC (rev 54994)
+++ brlcad/trunk/src/irprep/ir-X.c 2013-04-01 05:52:46 UTC (rev 54995)
@@ -190,7 +190,7 @@
(void)fflush(stdout);
/* Set up color scale. */
- dcol = (65535. + 1.) / MAXCOL;
+ dcol = (65535.0 + 1.0) / MAXCOL;
if (icol == 0) /* Shades of gray. */
{
printf("-shades of gray ");
@@ -219,7 +219,7 @@
{
printf("- black-blue-cyan-green-yellow-white ");
(void)fflush(stdout);
- if (MAXCOL > 1280.)
+ if (MAXCOL > 1280.0)
{
printf("Maximum number of colors, %d, is ", MAXCOL);
printf("greater than 1280.\n");
@@ -229,52 +229,52 @@
dcol = 1280. / MAXCOL;
i = 0;
/* Colors (0, 0, 0) to (0, 0, 255). */
- check = 0.;
- while ( (check <= 255.) && (i < MAXCOL) )
+ check = 0.0;
+ while ( (check <= 255.0) && (i < MAXCOL) )
{
colval[i].red = (unsigned short)0;
colval[i].green = (unsigned short)0;
- colval[i].blue = (unsigned short)(check * 256.);
+ colval[i].blue = (unsigned short)(check * 256.0);
check += dcol;
i++;
}
/* Colors (0, 0, 255) to (0, 255, 255). */
- check = 0.;
- while ( (check <= 255.) && (i < MAXCOL) )
+ check = 0.0;
+ while ( (check <= 255.0) && (i < MAXCOL) )
{
colval[i].red = (unsigned short)0;
- colval[i].green = (unsigned short)(check * 256.);
+ colval[i].green = (unsigned short)(check * 256.0);
colval[i].blue = (unsigned short)(255 * 256);
check += dcol;
i++;
}
/* Colors (0, 255, 255) to (0, 255, 0). */
- check = 255.;
- while ( (check >= 0.) && (i < MAXCOL) )
+ check = 255.0;
+ while ( (check >= 0.0) && (i < MAXCOL) )
{
colval[i].red = (unsigned short)0;
colval[i].green = (unsigned short)(255 * 256);
- colval[i].blue = (unsigned short)(check * 256.);
+ colval[i].blue = (unsigned short)(check * 256.0);
check -= dcol;
i++;
}
/* Colors (0, 255, 0) to (255, 255, 0). */
- check = 0.;
- while ( (check <= 255.) && (i < MAXCOL) )
+ check = 0.0;
+ while ( (check <= 255.0) && (i < MAXCOL) )
{
- colval[i].red = (unsigned short)(check * 256.);
+ colval[i].red = (unsigned short)(check * 256.0);
colval[i].green = (unsigned short)(255 * 256);
colval[i].blue = (unsigned short)0;
check += dcol;
i++;
}
/* Colors (255, 255, 0) to (255, 255, 255). */
- check = 0.;
- while ( (check <= 255.) && (i < MAXCOL) )
+ check = 0.0;
+ while ( (check <= 255.0) && (i < MAXCOL) )
{
colval[i].red = (unsigned short)(255 * 256);
colval[i].green = (unsigned short)(255 * 256);
- colval[i].blue = (unsigned short)(check * 256.);
+ colval[i].blue = (unsigned short)(check * 256.0);
check += dcol;
i++;
}
@@ -284,7 +284,7 @@
{
printf("- black-blue-magenta-red-yellow-white ");
(void)fflush(stdout);
- if (MAXCOL > 1280.)
+ if (MAXCOL > 1280.0)
{
printf("Maximum number of colors, %d, is ", MAXCOL);
printf("greater than 1280.\n");
@@ -294,52 +294,52 @@
dcol = 1280. / MAXCOL;
i = 0;
/* Colors (0, 0, 0) to (0, 0, 255). */
- check = 0.;
- while ( (check <= 255.) && (i < MAXCOL) )
+ check = 0.0;
+ while ( (check <= 255.0) && (i < MAXCOL) )
{
colval[i].red = (unsigned short)0;
colval[i].green = (unsigned short)0;
- colval[i].blue = (unsigned short)(check * 256.);
+ colval[i].blue = (unsigned short)(check * 256.0);
check += dcol;
i++;
}
/* Colors (0, 0, 255) to (255, 0, 255). */
- check = 0.;
- while ( (check <= 255.) && (i < MAXCOL) )
+ check = 0.0;
+ while ( (check <= 255.0) && (i < MAXCOL) )
{
- colval[i].red = (unsigned short)(check * 256.);
+ colval[i].red = (unsigned short)(check * 256.0);
colval[i].green = (unsigned short)0;
colval[i].blue = (unsigned short)(255 * 256);
check += dcol;
i++;
}
/* Colors (255, 0, 255) to (255, 0, 0). */
- check = 255.;
- while ( (check >= 0.) && (i < MAXCOL) )
+ check = 255.0;
+ while ( (check >= 0.0) && (i < MAXCOL) )
{
colval[i].red = (unsigned short)(255 * 256);
colval[i].green = (unsigned short)0;
- colval[i].blue = (unsigned short)(check * 256.);
+ colval[i].blue = (unsigned short)(check * 256.0);
check -= dcol;
i++;
}
/* Colors (255, 0, 0) to (255, 255, 0). */
- check = 0.;
- while ( (check <= 255.) && (i < MAXCOL) )
+ check = 0.0;
+ while ( (check <= 255.0) && (i < MAXCOL) )
{
colval[i].red = (unsigned short)(255 * 256);
- colval[i].green = (unsigned short)(check * 256.);
+ colval[i].green = (unsigned short)(check * 256.0);
colval[i].blue = (unsigned short)0;
check += dcol;
i++;
}
/* Colors (255, 255, 0) to (255, 255, 255). */
- check = 0.;
- while ( (check <= 255.) && (i < MAXCOL) )
+ check = 0.0;
+ while ( (check <= 255.0) && (i < MAXCOL) )
{
colval[i].red = (unsigned short)(255 * 256);
colval[i].green = (unsigned short)(255 * 256);
- colval[i].blue = (unsigned short)(check * 256.);
+ colval[i].blue = (unsigned short)(check * 256.0);
check += dcol;
i++;
}
@@ -719,15 +719,15 @@
(void)sprintf(string, "%.0f", min);
XDrawString(my_display, wind_scale, my_gc,
2, 45, string, strlen(string));
- r = min + (max - min) / 4.;
+ r = min + (max - min) / 4.0;
(void)sprintf(string, "%.0f", r);
XDrawString(my_display, wind_scale, my_gc,
(MAXCOL * 2 / 4 - 8), 45, string,
strlen(string));
- r = min + (max - min) / 2.;
+ r = min + (max - min) / 2.0;
(void)sprintf(string, "%.0f", r);
XDrawString(my_display, wind_scale, my_gc,
(MAXCOL * 2 / 2 - 8), 45, string,
strlen(string));
- r = min + (max - min) * 3. / 4.;
+ r = min + (max - min) * 3. / 4.0;
(void)sprintf(string, "%.0f", r);
XDrawString(my_display, wind_scale, my_gc,
(MAXCOL * 2 * 3 / 4 - 8), 45, string,
strlen(string));
Modified: brlcad/trunk/src/irprep/secpass.c
===================================================================
--- brlcad/trunk/src/irprep/secpass.c 2013-04-01 05:48:49 UTC (rev 54994)
+++ brlcad/trunk/src/irprep/secpass.c 2013-04-01 05:52:46 UTC (rev 54995)
@@ -364,21 +364,21 @@
/* All variables 'dimensioned', now zero all variables. */
for (i=0; i<nmged; i++) {
- cond[i].centroid[0] = (double)0.;
- cond[i].centroid[1] = (double)0.;
- cond[i].centroid[2] = (double)0.;
+ cond[i].centroid[0] = (double)0.0;
+ cond[i].centroid[1] = (double)0.0;
+ cond[i].centroid[2] = (double)0.0;
cond[i].mat = (int)0;
for (j=0; j<nmged; j++) {
- cond[i].shrarea[j] = (double)0.;
- cond[i].avglen[j] = (double)0.;
- cond[i].rmslen[j] = (double)0.;
- cond[i].minlen[j] = (double)0.;
- cond[i].maxlen[j] = (double)0.;
- cond[i].numcal[j] = (double)0.;
- cond[i].rkavg[j] = (double)0.;
- cond[i].rkrms[j] = (double)0.;
- cond[i].rkmin[j] = (double)0.;
- cond[i].rkmax[j] = (double)0.;
+ cond[i].shrarea[j] = (double)0.0;
+ cond[i].avglen[j] = (double)0.0;
+ cond[i].rmslen[j] = (double)0.0;
+ cond[i].minlen[j] = (double)0.0;
+ cond[i].maxlen[j] = (double)0.0;
+ cond[i].numcal[j] = (double)0.0;
+ cond[i].rkavg[j] = (double)0.0;
+ cond[i].rkrms[j] = (double)0.0;
+ cond[i].rkmin[j] = (double)0.0;
+ cond[i].rkmax[j] = (double)0.0;
}
}
fprintf(stdout, "All variables zeroed.\n");
@@ -446,11 +446,11 @@
/* Find center of bounding rpp. */
center[X] = rtip->mdl_min[X] + (rtip->mdl_max[X] -
- rtip->mdl_min[X]) / 2.;
+ rtip->mdl_min[X]) / 2.0;
center[Y] = rtip->mdl_min[Y] + (rtip->mdl_max[Y] -
- rtip->mdl_min[Y]) / 2.;
+ rtip->mdl_min[Y]) / 2.0;
center[Z] = rtip->mdl_min[Z] + (rtip->mdl_max[Z] -
- rtip->mdl_min[Z]) / 2.;
+ rtip->mdl_min[Z]) / 2.0;
/* Find length of diagonal. */
diagonal = (rtip->mdl_max[X] - rtip->mdl_min[X])
@@ -459,7 +459,7 @@
* (rtip->mdl_max[Y] - rtip->mdl_min[Y])
+ (rtip->mdl_max[Z] - rtip->mdl_min[Z])
* (rtip->mdl_max[Z] - rtip->mdl_min[Z]);
- diagonal = sqrt(diagonal) / 2. + .5;
+ diagonal = sqrt(diagonal) / 2.0 + .5;
/* Find minimum & maximum of grid. */
xmin = center[X] - diagonal;
@@ -534,8 +534,8 @@
(void)fflush(stdout);
strtpt[X] = xmax;
- strtpt[Y] = ymin + gridspace / 2.;
- strtpt[Z] = zmin + gridspace / 2.;
+ strtpt[Y] = ymin + gridspace / 2.0;
+ strtpt[Z] = zmin + gridspace / 2.0;
strtdir[X] = (-1);
strtdir[Y] = 0;
strtdir[Z] = 0;
@@ -567,7 +567,7 @@
strtpt[Y] += gridspace;
if (strtpt[Y] > ymax) {
- strtpt[Y] = ymin + gridspace / 2.;
+ strtpt[Y] = ymin + gridspace / 2.0;
strtpt[Z] += gridspace;
}
@@ -590,12 +590,12 @@
printf("\nShooting down the 2nd axis.\n");
(void)fflush(stdout);
- strtpt[X] = xmin + gridspace / 2.;
+ strtpt[X] = xmin + gridspace / 2.0;
strtpt[Y] = ymax;
- strtpt[Z] = zmin + gridspace / 2.;
- strtdir[X] = 0.;
- strtdir[Y] = (-1.);
- strtdir[X] = 0.;
+ strtpt[Z] = zmin + gridspace / 2.0;
+ strtdir[X] = 0.0;
+ strtdir[Y] = (-1.0);
+ strtdir[X] = 0.0;
/* Rotate starting point (new pt = C + R[P - C]). */
t[X] = strtpt[X] - center [X];
@@ -624,7 +624,7 @@
strtpt[X] += gridspace;
if (strtpt[X] > xmax) {
- strtpt[X] = xmin + gridspace / 2.;
+ strtpt[X] = xmin + gridspace / 2.0;
strtpt[Z] += gridspace;
}
@@ -643,12 +643,12 @@
printf("\nShooting down the 3rd axis.\n");
(void)fflush(stdout);
- strtpt[X] = xmin + gridspace / 2.;
- strtpt[Y] = ymin + gridspace / 2.;
+ strtpt[X] = xmin + gridspace / 2.0;
+ strtpt[Y] = ymin + gridspace / 2.0;
strtpt[Z] = zmax;
- strtdir[X] = 0.;
- strtdir[Y] = 0.;
- strtdir[Z] = (-1.);
+ strtdir[X] = 0.0;
+ strtdir[Y] = 0.0;
+ strtdir[Z] = (-1.0);
/* Rotate starting points (new pt = C + R[P - C]). */
t[X] = strtpt[X] - center[X];
@@ -670,7 +670,7 @@
strtpt[X] += gridspace;
if (strtpt[X] > xmax) {
- strtpt[X] = xmin + gridspace / 2.;
+ strtpt[X] = xmin + gridspace / 2.0;
strtpt[Y] += gridspace;
}
@@ -731,8 +731,8 @@
}
} else {
- cond[i].avglen[j] = 0.;
- cond[i].rmslen[j] = 0.;
+ cond[i].avglen[j] = 0.0;
+ cond[i].rmslen[j] = 0.0;
}
}
}
@@ -803,7 +803,7 @@
lenj = cond[j].avglen[i] * 1.e-3;
if (((-ZEROTOL < ki) && (ki < ZEROTOL)) ||
((-ZEROTOL < kj) && (kj < ZEROTOL)))
- cond[i].rkavg[j] = 0.;
+ cond[i].rkavg[j] = 0.0;
else {
rki = leni / (ki * areai);
rkj = lenj / (kj * areai);
@@ -815,7 +815,7 @@
lenj = cond[j].rmslen[i] * 1.e-3;
if (((-ZEROTOL < ki) && (ki < ZEROTOL)) ||
((-ZEROTOL < kj) && (kj < ZEROTOL)))
- cond[i].rkrms[j] = 0.;
+ cond[i].rkrms[j] = 0.0;
else {
rki = leni / (ki * areai);
rkj = lenj / (kj * areai);
@@ -827,7 +827,7 @@
lenj = cond[j].minlen[i] * 1.e-3;
if (((-ZEROTOL < ki) && (ki < ZEROTOL)) ||
((-ZEROTOL < kj) && (kj < ZEROTOL)))
- cond[i].rkmin[j] = 0.;
+ cond[i].rkmin[j] = 0.0;
else {
rki = leni / (ki * areai);
rkj = lenj / (kj * areai);
@@ -839,7 +839,7 @@
lenj = cond[j].maxlen[i] * 1.e-3;
if (((-ZEROTOL < ki) && (ki < ZEROTOL)) ||
((-ZEROTOL < kj) && (kj < ZEROTOL)))
- cond[i].rkmax[j] = 0.;
+ cond[i].rkmax[j] = 0.0;
else {
rki = leni / (ki * areai);
rkj = lenj / (kj * areai);
@@ -1131,7 +1131,7 @@
dist = sqrt(dist);
cond[iprev].avglen[icur] += dist;
cond[iprev].rmslen[icur] += (dist * dist);
- cond[iprev].numcal[icur] += 1.;
+ cond[iprev].numcal[icur] += 1.0;
if ((-ZEROTOL < cond[iprev].minlen[icur]) &&
(cond[iprev].minlen[icur] < ZEROTOL)) {
@@ -1157,7 +1157,7 @@
dist = sqrt(dist);
cond[icur].avglen[iprev] += dist;
cond[icur].rmslen[iprev] += (dist * dist);
- cond[icur].numcal[iprev] += 1.;
+ cond[icur].numcal[iprev] += 1.0;
if ((-ZEROTOL < cond[icur].minlen[iprev]) &&
(cond[icur].minlen[iprev] < ZEROTOL)) {
Modified: brlcad/trunk/src/irprep/shapefact.c
===================================================================
--- brlcad/trunk/src/irprep/shapefact.c 2013-04-01 05:48:49 UTC (rev 54994)
+++ brlcad/trunk/src/irprep/shapefact.c 2013-04-01 05:52:46 UTC (rev 54995)
@@ -323,25 +323,25 @@
info[i].name = "\0";
info[i].regnum = (-1);
info[i].numchar = 0;
- info[i].lvrays = 0.;
- info[i].engarea = 0.;
+ info[i].lvrays = 0.0;
+ info[i].engarea = 0.0;
for (j=0; j<numreg; j++)
{
- info[i].intrays[j] = 0.;
+ info[i].intrays[j] = 0.0;
}
}
- nummiss = 0.;
+ nummiss = 0.0;
/* Get database ready by starting prep. */
rt_prep(rtip);
/* Find the center of the bounding rpp. */
center[X] = rtip->mdl_min[X] +
- (rtip->mdl_max[X] - rtip->mdl_min[X]) / 2.;
+ (rtip->mdl_max[X] - rtip->mdl_min[X]) / 2.0;
center[Y] = rtip->mdl_min[Y] +
- (rtip->mdl_max[Y] - rtip->mdl_min[Y]) / 2.;
+ (rtip->mdl_max[Y] - rtip->mdl_min[Y]) / 2.0;
center[Z] = rtip->mdl_min[Z] +
- (rtip->mdl_max[Z] - rtip->mdl_min[Z]) / 2.;
+ (rtip->mdl_max[Z] - rtip->mdl_min[Z]) / 2.0;
/* Put region names into structure. */
pr = BU_LIST_FIRST(region, &rtip->HeadRegion);
@@ -373,7 +373,7 @@
ap.a_level = 0; /* Recursion level for diagnostics. */
ap.a_resource = 0; /* Address for resource structure. */
- dump = 1000000.; /* Used for dumping info. */
+ dump = 1000000.0; /* Used for dumping info. */
for (r=0; r<loops; r++) /* Number of rays fired. */
{
@@ -390,7 +390,7 @@
* (rtip->mdl_max[Y] - rtip->mdl_min[Y])
+(rtip->mdl_max[Z] - rtip->mdl_min[Z])
* (rtip->mdl_max[Z] - rtip->mdl_min[Z]);
- rho = sqrt(rho) / 2. + .5;
+ rho = sqrt(rho) / 2.0 + .5;
/* find surface area of bounding sphere. */
areabs = 4. * M_PI * rho * rho;
@@ -413,7 +413,7 @@
* (void)fflush(stdout);
*/
q = BN_UNIF_DOUBLE(msr) + 0.5;
- phi = ( q * 2.) - 1.;
+ phi = ( q * 2.0) - 1.0;
phi = acos(phi);
/*
* printf("random number: %f, phi: %f\n", q, phi);
@@ -450,7 +450,7 @@
* printf("random number: %f, rad: %f\n", q, rad);
* (void)fflush(stdout);
*/
- s[X] = 0.;
+ s[X] = 0.0;
s[Y] = rad * cos(theta);
s[Z] = rad * sin(theta);
/*
@@ -548,7 +548,7 @@
{
for (j=0; j<numreg; j++)
{
- sf = 0.;
+ sf = 0.0;
if ( (info[i].lvrays < -ZEROTOL) || (ZEROTOL <
info[i].lvrays) )
sf = info[i].intrays[j] / info[i].lvrays;
@@ -559,7 +559,7 @@
}
} /* START # 3
*/
- dump = dump + 1000000.;
+ dump = dump + 1000000.0;
}
} /* END # 2 */
@@ -571,7 +571,7 @@
/* ray therefore do not divide by 2. Division by 2 is to */
/* include the backwards ray also. */
/*
- * info[i].engarea = info[i].allvrays * areabs / loops / 2.;
+ * info[i].engarea = info[i].allvrays * areabs / loops / 2.0;
*/
info[i].engarea = info[i].allvrays * areabs / (double)loops;
@@ -640,23 +640,23 @@
{
for (j=0; j<numreg; j++)
{
- rcpi = 0.;
- rcpj = 0.;
+ rcpi = 0.0;
+ rcpj = 0.0;
if ( (info[i].lvrays < -ZEROTOL) || (ZEROTOL < info[i].lvrays) )
rcpi = info[i].intrays[j] * info[i].engarea /info[i].lvrays;
if ( (info[j].lvrays < -ZEROTOL) || (ZEROTOL < info[j].lvrays) )
rcpj = info[j].intrays[i] * info[j].engarea /info[j].lvrays;
rcp_diff = rcpi - rcpj;
- if (rcp_diff < 0.) rcp_diff = (-rcp_diff);
+ if (rcp_diff < 0.0) rcp_diff = (-rcp_diff);
if ( (rcpi < -ZEROTOL) || (ZEROTOL < rcpi) )
rcp_pdiff = rcp_diff / rcpi;
- else rcp_pdiff = 0.; /* Don't divide by 0. */
+ else rcp_pdiff = 0.0; /* Don't divide by 0. */
/* Print reciprocity errors greater than 10%. */
if (rcp_pdiff > 0.1)
{
fprintf(fp2, "%d %d %f %f %f %f\n",
info[i].regnum, info[j].regnum, rcpi, rcpj,
rcp_diff,
- (rcp_pdiff * 100.));
+ (rcp_pdiff * 100.0));
(void)fflush(fp2);
}
}
@@ -682,12 +682,12 @@
(void)fflush(fp);
/* Zero sums for shape factors & rays hit. */
- totalsf = 0.;
- totalnh = 0.;
+ totalsf = 0.0;
+ totalnh = 0.0;
for (j=0; j<numreg; j++)
{
- sf = 0.;
+ sf = 0.0;
if ( (info[i].lvrays < -ZEROTOL) || (ZEROTOL <
info[i].lvrays) )
sf = info[i].intrays[j] / info[i].lvrays;
@@ -988,7 +988,7 @@
* (void)fflush(stdout);
*/
- nummiss = nummiss + 1.;
+ nummiss = nummiss + 1.0;
return 1;
}
Modified: brlcad/trunk/src/irprep/showtherm.c
===================================================================
--- brlcad/trunk/src/irprep/showtherm.c 2013-04-01 05:48:49 UTC (rev 54994)
+++ brlcad/trunk/src/irprep/showtherm.c 2013-04-01 05:52:46 UTC (rev 54995)
@@ -219,7 +219,7 @@
/* Zero all arrays. */
for (i=0; i<numreg; i++)
{
- info[i].temp = 0.;
+ info[i].temp = 0.0;
for (j=0; j<150; j++)
{
info[i].regname[j] = ' ';
@@ -464,15 +464,15 @@
rppmax[Z] = rtip->mdl_max[Z];
/* Find the center of the bounding sphere or rpp. */
- center[X] = rppmin[X] + (rppmax[X] - rppmin[X]) / 2.;
- center[Y] = rppmin[Y] + (rppmax[Y] - rppmin[Y]) / 2.;
- center[Z] = rppmin[Z] + (rppmax[Z] - rppmin[Z]) / 2.;
+ center[X] = rppmin[X] + (rppmax[X] - rppmin[X]) / 2.0;
+ center[Y] = rppmin[Y] + (rppmax[Y] - rppmin[Y]) / 2.0;
+ center[Z] = rppmin[Z] + (rppmax[Z] - rppmin[Z]) / 2.0;
/* Find the length of the radius of the bounding sphere. */
radius = (rppmax[X] - rppmin[X]) * (rppmax[X] - rppmin[X]) +
(rppmax[Y] - rppmin[Y]) * (rppmax[Y] - rppmin[Y]) +
(rppmax[Z] - rppmin[Z]) * (rppmax[Z] - rppmin[Z]);
- radius = sqrt(radius) / 2. + 1.; /* Make radius a bit longer.
*/
+ radius = sqrt(radius) / 2.0 + 1.0; /* Make radius a bit longer.
*/
printf("\nMinimum & maximum X: %f - %f\n", rppmin[X], rppmax[X]);
printf("Minimum & maximum Y: %f - %f\n", rppmin[Y], rppmax[Y]);
@@ -535,9 +535,9 @@
(void)fflush(stdout);
/* Set firing direction. Rotate (-1, 0, 0) to proper position. */
- vec[X] = (-1.) * cbeta * calpha;
- vec[Y] = (-1.) * cbeta * salpha;
- vec[Z] = (-1.) * (-1.) * sbeta;
+ vec[X] = (-1.0) * cbeta * calpha;
+ vec[Y] = (-1.0) * cbeta * salpha;
+ vec[Z] = (-1.0) * (-1.0) * sbeta;
/* Normalize. */
denom = vec[X] * vec[X] + vec[Y] * vec[Y] + vec[Z] * vec[Z];
denom = sqrt(denom);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
