diff options
Diffstat (limited to 'src/PJ_robin.c')
| -rw-r--r-- | src/PJ_robin.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/src/PJ_robin.c b/src/PJ_robin.c index 8f6371e7..93330072 100644 --- a/src/PJ_robin.c +++ b/src/PJ_robin.c @@ -20,47 +20,47 @@ struct COEFS { }; static const struct COEFS X[] = { - {1, 2.2199e-17, -7.15515e-05, 3.1103e-06}, - {0.9986, -0.000482243, -2.4897e-05, -1.3309e-06}, - {0.9954, -0.00083103, -4.48605e-05, -9.86701e-07}, - {0.99, -0.00135364, -5.9661e-05, 3.6777e-06}, - {0.9822, -0.00167442, -4.49547e-06, -5.72411e-06}, - {0.973, -0.00214868, -9.03571e-05, 1.8736e-08}, - {0.96, -0.00305085, -9.00761e-05, 1.64917e-06}, - {0.9427, -0.00382792, -6.53386e-05, -2.6154e-06}, - {0.9216, -0.00467746, -0.00010457, 4.81243e-06}, - {0.8962, -0.00536223, -3.23831e-05, -5.43432e-06}, - {0.8679, -0.00609363, -0.000113898, 3.32484e-06}, - {0.835, -0.00698325, -6.40253e-05, 9.34959e-07}, - {0.7986, -0.00755338, -5.00009e-05, 9.35324e-07}, - {0.7597, -0.00798324, -3.5971e-05, -2.27626e-06}, - {0.7186, -0.00851367, -7.01149e-05, -8.6303e-06}, - {0.6732, -0.00986209, -0.000199569, 1.91974e-05}, - {0.6213, -0.010418, 8.83923e-05, 6.24051e-06}, - {0.5722, -0.00906601, 0.000182, 6.24051e-06}, - {0.5322, -0.00677797, 0.000275608, 6.24051e-06} + {1.0f, 2.2199e-17f, -7.15515e-05f, 3.1103e-06f}, + {0.9986f, -0.000482243f, -2.4897e-05f, -1.3309e-06f}, + {0.9954f, -0.00083103f, -4.48605e-05f, -9.86701e-07f}, + {0.99f, -0.00135364f, -5.9661e-05f, 3.6777e-06f}, + {0.9822f, -0.00167442f, -4.49547e-06f, -5.72411e-06f}, + {0.973f, -0.00214868f, -9.03571e-05f, 1.8736e-08f}, + {0.96f, -0.00305085f, -9.00761e-05f, 1.64917e-06f}, + {0.9427f, -0.00382792f, -6.53386e-05f, -2.6154e-06f}, + {0.9216f, -0.00467746f, -0.00010457f, 4.81243e-06f}, + {0.8962f, -0.00536223f, -3.23831e-05f, -5.43432e-06f}, + {0.8679f, -0.00609363f, -0.000113898f, 3.32484e-06f}, + {0.835f, -0.00698325f, -6.40253e-05f, 9.34959e-07f}, + {0.7986f, -0.00755338f, -5.00009e-05f, 9.35324e-07f}, + {0.7597f, -0.00798324f, -3.5971e-05f, -2.27626e-06f}, + {0.7186f, -0.00851367f, -7.01149e-05f, -8.6303e-06f}, + {0.6732f, -0.00986209f, -0.000199569f, 1.91974e-05f}, + {0.6213f, -0.010418f, 8.83923e-05f, 6.24051e-06f}, + {0.5722f, -0.00906601f, 0.000182f, 6.24051e-06f}, + {0.5322f, -0.00677797f, 0.000275608f, 6.24051e-06f} }; static const struct COEFS Y[] = { - {-5.20417e-18, 0.0124, 1.21431e-18, -8.45284e-11}, - {0.062, 0.0124, -1.26793e-09, 4.22642e-10}, - {0.124, 0.0124, 5.07171e-09, -1.60604e-09}, - {0.186, 0.0123999, -1.90189e-08, 6.00152e-09}, - {0.248, 0.0124002, 7.10039e-08, -2.24e-08}, - {0.31, 0.0123992, -2.64997e-07, 8.35986e-08}, - {0.372, 0.0124029, 9.88983e-07, -3.11994e-07}, - {0.434, 0.0123893, -3.69093e-06, -4.35621e-07}, - {0.4958, 0.0123198, -1.02252e-05, -3.45523e-07}, - {0.5571, 0.0121916, -1.54081e-05, -5.82288e-07}, - {0.6176, 0.0119938, -2.41424e-05, -5.25327e-07}, - {0.6769, 0.011713, -3.20223e-05, -5.16405e-07}, - {0.7346, 0.0113541, -3.97684e-05, -6.09052e-07}, - {0.7903, 0.0109107, -4.89042e-05, -1.04739e-06}, - {0.8435, 0.0103431, -6.4615e-05, -1.40374e-09}, - {0.8936, 0.00969686, -6.4636e-05, -8.547e-06}, - {0.9394, 0.00840947, -0.000192841, -4.2106e-06}, - {0.9761, 0.00616527, -0.000256, -4.2106e-06}, - {1, 0.00328947, -0.000319159, -4.2106e-06} + {-5.20417e-18f, 0.0124f, 1.21431e-18f, -8.45284e-11f}, + {0.062f, 0.0124f, -1.26793e-09f, 4.22642e-10f}, + {0.124f, 0.0124f, 5.07171e-09f, -1.60604e-09f}, + {0.186f, 0.0123999f, -1.90189e-08f, 6.00152e-09f}, + {0.248f, 0.0124002f, 7.10039e-08f, -2.24e-08f}, + {0.31f, 0.0123992f, -2.64997e-07f, 8.35986e-08f}, + {0.372f, 0.0124029f, 9.88983e-07f, -3.11994e-07f}, + {0.434f, 0.0123893f, -3.69093e-06f, -4.35621e-07f}, + {0.4958f, 0.0123198f, -1.02252e-05f, -3.45523e-07f}, + {0.5571f, 0.0121916f, -1.54081e-05f, -5.82288e-07f}, + {0.6176f, 0.0119938f, -2.41424e-05f, -5.25327e-07f}, + {0.6769f, 0.011713f, -3.20223e-05f, -5.16405e-07f}, + {0.7346f, 0.0113541f, -3.97684e-05f, -6.09052e-07f}, + {0.7903f, 0.0109107f, -4.89042e-05f, -1.04739e-06f}, + {0.8435f, 0.0103431f, -6.4615e-05f, -1.40374e-09f}, + {0.8936f, 0.00969686f, -6.4636e-05f, -8.547e-06f}, + {0.9394f, 0.00840947f, -0.000192841f, -4.2106e-06f}, + {0.9761f, 0.00616527f, -0.000256f, -4.2106e-06f}, + {1.0f, 0.00328947f, -0.000319159f, -4.2106e-06f} }; #define FXC 0.8487 @@ -78,7 +78,7 @@ static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ double dphi; (void) P; - i = floor((dphi = fabs(lp.phi)) * C1); + i = (int)floor((dphi = fabs(lp.phi)) * C1); if( i < 0 ) F_ERROR; if (i >= NODES) i = NODES - 1; @@ -107,7 +107,7 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ } } else { /* general problem */ /* in Y space, reduce to table interval */ - i = floor(lp.phi * NODES); + i = (int)floor(lp.phi * NODES); if( i < 0 || i >= NODES ) I_ERROR; for (;;) { @@ -119,7 +119,7 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ /* first guess, linear interp */ t = 5. * (lp.phi - T.c0)/(Y[i+1].c0 - T.c0); /* make into root */ - T.c0 -= lp.phi; + T.c0 = (float)(T.c0 - lp.phi); for (;;) { /* Newton-Raphson reduction */ t -= t1 = V(T,t) / DV(T,t); if (fabs(t1) < EPS) |