[GRASS-SVN] r73188 - grass/trunk/imagery/i.atcorr
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Aug 26 13:02:25 PDT 2018
Author: mmetz
Date: 2018-08-26 13:02:25 -0700 (Sun, 26 Aug 2018)
New Revision: 73188
Modified:
grass/trunk/imagery/i.atcorr/abstra.cpp
grass/trunk/imagery/i.atcorr/atmosmodel.cpp
Log:
i.atcorr: keep float constants as float, not double
Modified: grass/trunk/imagery/i.atcorr/abstra.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/abstra.cpp 2018-08-26 19:59:27 UTC (rev 73187)
+++ grass/trunk/imagery/i.atcorr/abstra.cpp 2018-08-26 20:02:25 UTC (rev 73188)
@@ -11,7 +11,7 @@
{
- static const double acr[2048] = { .011482f, .13183f,
+ static const float acr[2048] = { .011482f, .13183f,
-.0038755f, 3.4491e-6f, -.0069899f, 9.3146e-6f, 15300.f, 15310.f,
.0015124f, .19547f, .0028474f, -4.7616e-6f, .0017802f, -1.079e-5f,
15310.f, 15320.f, .0092482f, .16207f, -.0025675f, 1.271e-5f, -.0027267f,
@@ -348,7 +348,7 @@
{
- static const double acr[2048] = { 4.6416e-4f, .04653f,
+ static const float acr[2048] = { 4.6416e-4f, .04653f,
.011484f, -5.0228e-5f, .0057564f, -2.8823e-5f, 12740.f, 12750.f,
2.6026e-5f, .069686f, .0050381f, -3.0969e-5f, .0023565f, -2.6498e-5f,
12750.f, 12760.f, 2.1016e-4f, .078469f, -.0024738f, -2.0423e-6f,
@@ -681,7 +681,7 @@
{
- static const double acr[2048] = { .037011f, .34865f,
+ static const float acr[2048] = { .037011f, .34865f,
.0071795f, -2.429e-5f, .0061217f, -2.5788e-5f, 10180.f, 10190.f,
.096531f, .1963f, .0044353f, -2.7769e-5f, .0020496f, -1.902e-5f,
10190.f, 10200.f, .11553f, .22356f, .0057418f, -2.861e-5f, .005252f,
@@ -1011,7 +1011,7 @@
{
- static const double acr[2048] = { .092641f, .26739f,
+ static const float acr[2048] = { .092641f, .26739f,
.0074828f, -3.6295e-5f, .0065918f, -3.6255e-5f, 7620.f, 7630.f, .24311f,
.19859f, .0029686f, -1.983e-5f, .0023399f, -1.6807e-5f, 7630.f, 7640.f,
.12025f, .11463f, .005982f, -3.2695e-5f, .00555f, -2.817e-5f, 7640.f,
@@ -1325,7 +1325,7 @@
{
- static const double acr[2048] = { .32591f, .48473f,
+ static const float acr[2048] = { .32591f, .48473f,
.010062f, 1.8245e-5f, .01189f, -1.2621e-5f, 5060.f, 5070.f, .73059f,
.13181f, .010626f, 7.3795e-6f, .011376f, -1.7764e-5f, 5070.f, 5080.f,
.39211f, .39522f, .01459f, -6.8376e-6f, .016326f, -3.165e-5f, 5080.f,
@@ -1641,7 +1641,7 @@
{
- static const double acr[2048] = { 5.2155e-5f, .1088f,
+ static const float acr[2048] = { 5.2155e-5f, .1088f,
.024708f, 5.6434e-5f, .028126f, -3.6504e-5f, 2500.f, 2510.f, 2.6024e-4f,
.21216f, .025876f, 3.0026e-5f, .030504f, -6.2253e-5f, 2510.f, 2520.f,
1.2221e-4f, .091374f, .023862f, -7.9891e-5f, .020651f, -8.5449e-5f,
@@ -1956,7 +1956,7 @@
{
- static const double acr[2048] = { 4.1135e-5f, .13491f,
+ static const float acr[2048] = { 4.1135e-5f, .13491f,
.019511f, -8.8592e-5f, .017169f, -8.6383e-5f, 7620.f, 7630.f, 0.f, 0.f,
0.f, 0.f, 0.f, 0.f, 7630.f, 7640.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7640.f,
7650.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7650.f, 7660.f, 0.f, 0.f, 0.f, 0.f,
@@ -2260,7 +2260,7 @@
{
- static const double acr[2048] = { .37011f, .18132f,
+ static const float acr[2048] = { .37011f, .18132f,
.0098385f, -4.992e-5f, .0096965f, -3.9497e-5f, 5060.f, 5070.f, 1.7202f,
.2316f, .0029954f, -2.2435e-5f, .0029757f, -9.2488e-6f, 5070.f, 5080.f,
3.3606f, .25416f, -.0016977f, -4.0846e-6f, -.0013656f, 1.1658e-5f,
@@ -2567,7 +2567,7 @@
- static const double acr[2048] = { 1.1446e-5f, .0020117f,
+ static const float acr[2048] = { 1.1446e-5f, .0020117f,
-.0041334f, 3.2304e-6f, -.0069982f, 9.0084e-6f, 2500.f, 2510.f,
1.9234e-5f, .0019311f, -.0017326f, -5.8646e-6f, -.0045311f,
-6.0352e-7f, 2510.f, 2520.f, 9.202e-6f, .0017952f, .0034861f,
@@ -2877,7 +2877,7 @@
{
- static const double acr[2048] = { .062007f, 2.4365f,
+ static const float acr[2048] = { .062007f, 2.4365f,
-5.9503e-4f, -8.1198e-6f, -.0039418f, -2.4624e-6f, 2500.f, 2510.f,
.023839f, 2.3534f, .0037377f, -6.15e-6f, .0015592f, -1.2727e-5f, 2510.f,
2520.f, .0090127f, 1.2172f, -.0014733f, -4.7053e-6f, -.0042092f,
@@ -3176,7 +3176,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 15300.f, 15310.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 15310.f, 15320.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 15320.f, 15330.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -3507,7 +3507,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 12740.f, 12750.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 12750.f, 12760.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 12760.f, 12770.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -3838,7 +3838,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 10180.f, 10190.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 10190.f, 10200.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 10200.f, 10210.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -4170,7 +4170,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 7620.f, 7630.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7630.f, 7640.f, 0.f,
0.f,
0.f, 0.f, 0.f, 0.f, 7640.f, 7650.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7650.f,
@@ -4465,7 +4465,7 @@
{
- static const double acr[2048] = { .072211f, .24584f,
+ static const float acr[2048] = { .072211f, .24584f,
.0096738f, -5.1958e-5f, .0067533f, -4.7277e-5f, 5060.f, 5070.f, .21388f,
.25456f, .0043318f, -3.1058e-5f, .0012217f, -2.5614e-5f, 5070.f, 5080.f,
.57556f, .33263f, -2.6597e-4f, -1.2844e-5f, -.0033007f, -7.3238e-6f,
@@ -4755,7 +4755,7 @@
{
- static const double acr[2048] = { 2.0198f, 1.2223f,
+ static const float acr[2048] = { 2.0198f, 1.2223f,
.021725f, -7.4064e-5f, .021102f, -6.8716e-5f, 2500.f, 2510.f, 5.563f,
.51358f, .018526f, -8.1387e-5f, .020173f, -7.5293e-5f, 2510.f, 2520.f,
30.587f, .41845f, .010994f, -5.2858e-5f, .012658f, -4.4443e-5f, 2520.f,
@@ -5058,7 +5058,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 15300.f, 15310.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 15310.f, 15320.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 15320.f, 15330.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -5390,7 +5390,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 12740.f, 12750.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 12750.f, 12760.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 12760.f, 12770.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -5719,7 +5719,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 10180.f, 10190.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 10190.f, 10200.f,
0.f,
@@ -6049,7 +6049,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 7620.f, 7630.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7630.f, 7640.f, 0.f,
0.f,
0.f, 0.f, 0.f, 0.f, 7640.f, 7650.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7650.f,
@@ -6343,7 +6343,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 5060.f, 5070.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 5070.f, 5080.f, 0.f,
0.f,
0.f, 0.f, 0.f, 0.f, 5080.f, 5090.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 5090.f,
@@ -6637,7 +6637,7 @@
{
- static const double acr[2048] = { 1.4454f, .47807f,
+ static const float acr[2048] = { 1.4454f, .47807f,
.0052823f, -3.0056e-5f, .002903f, -2.686e-5f, 2500.f, 2510.f, 8.7736f,
.49348f, 3.8511e-4f, -6.0533e-6f, 1.0891e-4f, -9.3895e-6f, 2510.f,
2520.f, 5.7188f, .51082f, 3.239e-4f, -7.2399e-6f, 1.6424e-4f,
@@ -6940,7 +6940,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 15300.f, 15310.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 15310.f, 15320.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 15320.f, 15330.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -7271,7 +7271,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 12740.f, 12750.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 12750.f, 12760.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 12760.f, 12770.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -7599,7 +7599,7 @@
void moca4 (double a[8], const long int inu)
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 10180.f, 10190.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 10190.f, 10200.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 10200.f, 10210.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -7931,7 +7931,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 7620.f, 7630.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7630.f, 7640.f, 0.f,
0.f,
0.f, 0.f, 0.f, 0.f, 7640.f, 7650.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7650.f,
@@ -8237,7 +8237,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 5060.f, 5070.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 5070.f, 5080.f, 0.f,
0.f,
0.f, 0.f, 0.f, 0.f, 5080.f, 5090.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 5090.f,
@@ -8534,7 +8534,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 2500.f, 2510.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 2510.f, 2520.f, 0.f,
0.f,
0.f, 0.f, 0.f, 0.f, 2520.f, 2530.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 2530.f,
@@ -8844,7 +8844,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 15300.f, 15310.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 15310.f, 15320.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 15320.f, 15330.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -9169,7 +9169,7 @@
void oxyg5 (double a[8], const long int inu)
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 12740.f, 12750.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 12750.f, 12760.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 12760.f, 12770.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -9503,7 +9503,7 @@
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 10180.f, 10190.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 10190.f, 10200.f,
0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 10200.f, 10210.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
@@ -9830,7 +9830,7 @@
void
oxyg3 (double a[8], const long int inu)
{
- static const double acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
+ static const float acr[2048] = { 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 7620.f, 7630.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7630.f, 7640.f, 0.f,
0.f,
0.f, 0.f, 0.f, 0.f, 7640.f, 7650.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 7650.f,
Modified: grass/trunk/imagery/i.atcorr/atmosmodel.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/atmosmodel.cpp 2018-08-26 19:59:27 UTC (rev 73187)
+++ grass/trunk/imagery/i.atcorr/atmosmodel.cpp 2018-08-26 20:02:25 UTC (rev 73188)
@@ -8,7 +8,7 @@
void AtmosModel::tropic()
{
- static const double z1[34] =
+ static const float z1[34] =
{
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f, 10.f, 11.f,
12.f, 13.f, 14.f, 15.f, 16.f, 17.f, 18.f, 19.f, 20.f, 21.f,
@@ -15,7 +15,7 @@
22.f, 23.f, 24.f, 25.f, 30.f, 35.f, 40.f, 45.f, 50.f, 70.f, 100.f, 99999.f
};
- static const double p1[34] =
+ static const float p1[34] =
{
1013.f, 904.f, 805.f, 715.f, 633.f, 559.f, 492.f, 432.f, 378.f,
329.f, 286.f, 247.f, 213.f, 182.f, 156.f, 132.f, 111.f, 93.7f,
@@ -23,7 +23,7 @@
3.05f, 1.59f, .854f, .0579f, 3e-4f, 0.f
};
- static const double t1[34] =
+ static const float t1[34] =
{
300.f, 294.f, 288.f, 284.f, 277.f, 270.f, 264.f, 257.f, 250.f,
244.f, 237.f, 230.f, 224.f, 217.f, 210.f, 204.f, 197.f, 195.f,
@@ -31,7 +31,7 @@
243.f, 254.f, 265.f, 270.f, 219.f, 210.f, 210.f
};
- static const double wh1[34] =
+ static const float wh1[34] =
{
19.f, 13.f, 9.3f, 4.7f, 2.2f, 1.5f, .85f, .47f, .25f, .12f, .05f,
@@ -41,7 +41,7 @@
3.6e-4f, 1.1e-4f, 4.3e-5f, 1.9e-5f, 6.3e-6f, 1.4e-7f, 1e-9f, 0.f
};
- static const double wo1[34] =
+ static const float wo1[34] =
{
5.6e-5f, 5.6e-5f, 5.4e-5f, 5.1e-5f, 4.7e-5f, 4.5e-5f,
4.3e-5f, 4.1e-5f, 3.9e-5f, 3.9e-5f, 3.9e-5f, 4.1e-5f, 4.3e-5f, 4.5e-5f,
@@ -63,7 +63,7 @@
void AtmosModel::midsum()
{
- static const double z1[34] =
+ static const float z1[34] =
{
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f, 10.f, 11.f,
12.f, 13.f, 14.f, 15.f, 16.f, 17.f, 18.f, 19.f, 20.f, 21.f, 22.f, 23.f,
@@ -70,7 +70,7 @@
24.f, 25.f, 30.f, 35.f, 40.f, 45.f, 50.f, 70.f, 100.f, 99999.f
};
- static const double p1[34] =
+ static const float p1[34] =
{
1013.f, 902.f, 802.f, 710.f, 628.f, 554.f, 487.f, 426.f,
372.f, 324.f, 281.f, 243.f, 209.f, 179.f, 153.f, 130.f, 111.f, 95.f,
@@ -78,7 +78,7 @@
3.33f, 1.76f, .951f, .0671f, 3e-4f, 0.f
};
- static const double t1[34] =
+ static const float t1[34] =
{
294.f, 290.f, 285.f, 279.f, 273.f, 267.f, 261.f, 255.f,
248.f, 242.f, 235.f, 229.f, 222.f, 216.f, 216.f, 216.f, 216.f, 216.f,
@@ -86,7 +86,7 @@
270.f, 276.f, 218.f, 210.f, 210.f
};
- static const double wh1[34] =
+ static const float wh1[34] =
{
14.f, 9.3f, 5.9f, 3.3f, 1.9f, 1.f, .61f, .37f, .21f, .12f,
.064f, .022f, .006f, .0018f, .001f, 7.6e-4f, 6.4e-4f, 5.6e-4f, 5e-4f,
@@ -94,7 +94,7 @@
1.1e-4f, 4.3e-5f, 1.9e-5f, 1.3e-6f, 1.4e-7f, 1e-9f, 0.f
};
- static const double wo1[34] =
+ static const float wo1[34] =
{
6e-5f, 6e-5f, 6e-5f, 6.2e-5f, 6.4e-5f, 6.6e-5f, 6.9e-5f,
7.5e-5f, 7.9e-5f, 8.6e-5f, 9e-5f, 1.1e-4f, 1.2e-4f, 1.5e-4f, 1.8e-4f,
@@ -116,7 +116,7 @@
void AtmosModel::midwin()
{
- static const double z1[34] =
+ static const float z1[34] =
{
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f, 10.f, 11.f,
12.f, 13.f, 14.f, 15.f, 16.f, 17.f, 18.f, 19.f, 20.f, 21.f, 22.f, 23.f,
@@ -123,7 +123,7 @@
24.f, 25.f, 30.f, 35.f, 40.f, 45.f, 50.f, 70.f, 100.f, 99999.f
};
- static const double p1[34] =
+ static const float p1[34] =
{
1018.f, 897.3f, 789.7f, 693.8f, 608.1f, 531.3f, 462.7f,
401.6f, 347.3f, 299.2f, 256.8f, 219.9f, 188.2f, 161.f, 137.8f, 117.8f,
@@ -131,7 +131,7 @@
11.1f, 5.18f, 2.53f, 1.29f, .682f, .0467f, 3e-4f, 0.f
};
- static const double t1[34] =
+ static const float t1[34] =
{
272.2f, 268.7f, 265.2f, 261.7f, 255.7f, 249.7f, 243.7f,
237.7f, 231.7f, 225.7f, 219.7f, 219.2f, 218.7f, 218.2f, 217.7f, 217.2f,
@@ -139,7 +139,7 @@
215.2f, 217.4f, 227.8f, 243.2f, 258.5f, 265.7f, 230.7f, 210.2f, 210.f
};
- static const double wh1[34] =
+ static const float wh1[34] =
{
3.5f, 2.5f, 1.8f, 1.2f, .66f, .38f, .21f, .085f, .035f,
.016f, .0075f, .0069f, .006f, .0018f, .001f, 7.6e-4f, 6.4e-4f, 5.6e-4f,
@@ -147,7 +147,7 @@
3.6e-4f, 1.1e-4f, 4.3e-5f, 1.9e-5f, 6.3e-6f, 1.4e-7f, 1e-9f, 0.f
};
- static const double wo1[34] =
+ static const float wo1[34] =
{
6e-5f, 5.4e-5f, 4.9e-5f, 4.9e-5f, 4.9e-5f, 5.8e-5f,
6.4e-5f, 7.7e-5f, 9e-5f, 1.2e-4f, 1.6e-4f, 2.1e-4f, 2.6e-4f, 3e-4f,
@@ -169,7 +169,7 @@
void AtmosModel::subsum()
{
- static const double z1[34] =
+ static const float z1[34] =
{
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f, 10.f, 11.f,
12.f, 13.f, 14.f, 15.f, 16.f, 17.f, 18.f, 19.f, 20.f, 21.f, 22.f, 23.f,
@@ -176,7 +176,7 @@
24.f, 25.f, 30.f, 35.f, 40.f, 45.f, 50.f, 70.f, 100.f, 99999.f
};
- static const double p1[34] =
+ static const float p1[34] =
{
1010.f, 896.f, 792.9f, 700.f, 616.f, 541.f, 473.f, 413.f,
359.f, 310.7f, 267.7f, 230.f, 197.7f, 170.f, 146.f, 125.f, 108.f, 92.8f,
@@ -184,7 +184,7 @@
3.4f, 1.81f, .987f, .0707f, 3e-4f, 0.f
};
- static const double t1[34] =
+ static const float t1[34] =
{
287.f, 282.f, 276.f, 271.f, 266.f, 260.f, 253.f, 246.f,
239.f, 232.f, 225.f, 225.f, 225.f, 225.f, 225.f, 225.f, 225.f, 225.f,
@@ -192,7 +192,7 @@
274.f, 277.f, 216.f, 210.f, 210.f
};
- static const double wh1[34] =
+ static const float wh1[34] =
{
9.1f, 6.f, 4.2f, 2.7f, 1.7f, 1.f, .54f, .29f, .13f, .042f,
.015f, .0094f, .006f, .0018f, .001f, 7.6e-4f, 6.4e-4f, 5.6e-4f, 5e-4f,
@@ -200,7 +200,7 @@
1.1e-4f, 4.3e-5f, 1.9e-5f, 6.3e-6f, 1.4e-7f, 1e-9f, 0.f
};
- static const double wo1[34] =
+ static const float wo1[34] =
{
4.9e-5f, 5.4e-5f, 5.6e-5f, 5.8e-5f, 6e-5f, 6.4e-5f,
7.1e-5f, 7.5e-5f, 7.9e-5f, 1.1e-4f, 1.3e-4f, 1.8e-4f, 2.1e-4f, 2.6e-4f,
@@ -222,7 +222,7 @@
void AtmosModel::subwin()
{
- static const double z1[34] =
+ static const float z1[34] =
{
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f, 10.f, 11.f,
12.f, 13.f, 14.f, 15.f, 16.f, 17.f, 18.f, 19.f, 20.f, 21.f, 22.f, 23.f,
@@ -229,7 +229,7 @@
24.f, 25.f, 30.f, 35.f, 40.f, 45.f, 50.f, 70.f, 100.f, 99999.f
};
- static const double p1[34] =
+ static const float p1[34] =
{
1013.f, 887.8f, 777.5f, 679.8f, 593.2f, 515.8f, 446.7f,
385.3f, 330.8f, 282.9f, 241.8f, 206.7f, 176.6f, 151.f, 129.1f, 110.3f,
@@ -237,7 +237,7 @@
22.56f, 10.2f, 4.701f, 2.243f, 1.113f, .5719f, .04016f, 3e-4f, 0.f
};
- static const double t1[34] =
+ static const float t1[34] =
{
257.1f, 259.1f, 255.9f, 252.7f, 247.7f, 240.9f, 234.1f,
227.3f, 220.6f, 217.2f, 217.2f, 217.2f, 217.2f, 217.2f, 217.2f, 217.2f,
@@ -245,7 +245,7 @@
211.2f, 216.f, 222.2f, 234.7f, 247.f, 259.3f, 245.7f, 210.f, 210.f
};
- static const double wh1[34] =
+ static const float wh1[34] =
{
1.2f, 1.2f, .94f, .68f, .41f, .2f, .098f, .054f, .011f,
.0084f, .0055f, .0038f, .0026f, .0018f, .001f, 7.6e-4f, 6.4e-4f, 5.6e-4f,
@@ -253,7 +253,7 @@
3.6e-4f, 1.1e-4f, 4.3e-5f, 1.9e-5f, 6.3e-6f, 1.4e-7f, 1e-9f, 0.f
};
- static const double wo1[34] =
+ static const float wo1[34] =
{
4.1e-5f, 4.1e-5f, 4.1e-5f, 4.3e-5f, 4.5e-5f, 4.7e-5f,
4.9e-5f, 7.1e-5f, 9e-5f, 1.6e-4f, 2.4e-4f, 3.2e-4f, 4.3e-4f, 4.7e-4f,
@@ -275,7 +275,7 @@
void AtmosModel::us62()
{
- static const double z1[34] =
+ static const float z1[34] =
{
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f, 10.f, 11.f,
12.f, 13.f, 14.f, 15.f, 16.f, 17.f, 18.f, 19.f, 20.f, 21.f, 22.f, 23.f,
@@ -282,7 +282,7 @@
24.f, 25.f, 30.f, 35.f, 40.f, 45.f, 50.f, 70.f, 100.f, 99999.f
};
- static const double p1[34] =
+ static const float p1[34] =
{
1013.f, 898.6f, 795.f, 701.2f, 616.6f, 540.5f, 472.2f,
411.1f, 356.5f, 308.f, 265.f, 227.f, 194.f, 165.8f, 141.7f, 121.1f,
@@ -290,7 +290,7 @@
11.97f, 5.746f, 2.871f, 1.491f, .7978f, .0552f, 3.008e-4f, 0.f
};
- static const double t1[34] =
+ static const float t1[34] =
{
288.1f, 281.6f, 275.1f, 268.7f, 262.2f, 255.7f, 249.2f,
242.7f, 236.2f, 229.7f, 223.2f, 216.8f, 216.6f, 216.6f, 216.6f, 216.6f,
@@ -298,7 +298,7 @@
221.6f, 226.5f, 236.5f, 253.4f, 264.2f, 270.6f, 219.7f, 210.f, 210.f
};
- static const double wh1[34] =
+ static const float wh1[34] =
{
5.9f, 4.2f, 2.9f, 1.8f, 1.1f, .64f, .38f, .21f, .12f,
.046f, .018f, .0082f, .0037f, .0018f, 8.4e-4f, 7.2e-4f, 6.1e-4f, 5.2e-4f,
@@ -306,7 +306,7 @@
3.8e-4f, 1.6e-4f, 6.7e-5f, 3.2e-5f, 1.2e-5f, 1.5e-7f, 1e-9f, 0.f
};
- static const double wo1[34] =
+ static const float wo1[34] =
{
5.4e-5f, 5.4e-5f, 5.4e-5f, 5e-5f, 4.6e-5f, 4.6e-5f,
4.5e-5f, 4.9e-5f, 5.2e-5f, 7.1e-5f, 9e-5f, 1.3e-4f, 1.6e-4f, 1.7e-4f,
More information about the grass-commit
mailing list