[GRASS-SVN] r72139 - grass/trunk/imagery/i.atcorr

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Jan 25 12:46:27 PST 2018


Author: mmetz
Date: 2018-01-25 12:46:27 -0800 (Thu, 25 Jan 2018)
New Revision: 72139

Modified:
   grass/trunk/imagery/i.atcorr/i.atcorr.html
   grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update Pleiades1A

Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html	2018-01-25 19:16:54 UTC (rev 72138)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html	2018-01-25 20:46:27 UTC (rev 72139)
@@ -674,11 +674,11 @@
 <tr><td>137</td><td>Spot7 NIR band  (760nm - 890nm)</td></tr>
 <tr><td>138</td><td>Spot7 Pan band  (455nm - 745nm)</td></tr>
 
-<tr><td>139</td><td><b>Pleiades1A</b> Blue band (430nm - 550nm)</td></tr>
-<tr><td>140</td><td>Pleiades1A Green band  (490nm - 610nm)</td></tr>
-<tr><td>141</td><td>Pleiades1A Red band  (600nm - 720nm)</td></tr>
-<tr><td>142</td><td>Pleiades1A NIR band  (750nm - 950nm)</td></tr>
-<tr><td>143</td><td>Pleiades1A Pan band  (480nm - 830nm)</td></tr>
+<tr><td>139</td><td><b>Pleiades1A</b> Blue band (433nm - 560nm)</td></tr>
+<tr><td>140</td><td>Pleiades1A Green band (500nm - 617nm)</td></tr>
+<tr><td>141</td><td>Pleiades1A Red band (590nm - 722nm)</td></tr>
+<tr><td>142</td><td>Pleiades1A NIR band (740nm - 945nm)</td></tr>
+<tr><td>143</td><td>Pleiades1A Pan band (460nm - 845nm)</td></tr>
 
 <tr><td>144</td><td><b>Pleiades1B </b> Blue band (430nm - 550nm)</td></tr>
 <tr><td>145</td><td>Pleiades1B Green band  (490nm - 610nm)</td></tr>

Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp	2018-01-25 19:16:54 UTC (rev 72138)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp	2018-01-25 20:46:27 UTC (rev 72139)
@@ -3802,163 +3802,154 @@
 void IWave::pleiades1a(int iwa)
 {
 
-    /* pleiades1a Blue of pleiades1a */
-    static const float sr1[209] = {
-		.0100, .0296, .0886, .1300, .1355, .2482, .4389, .5185,
-		.4758, .5178, .6596, .7786, .7959, .7725, .7796, .8094,
-		.8324, .8437, .8410, .8332, .8250, .8246, .8369, .8711,
-		.9167, .9474, .9601, .9669, .9748, .9730, .9684, .9664,
-		.9744, .9903, 1.0000, .9938, .9817, .9813, .9671, .8859,
-		.7175, .4994, .3052, .1740, .0953, .0549, .0349, .0264,
-		.0232, .0225, .0212, .0175, .0120, .0074, .0047, .0034,
-		.0026, .0020, .0015, .0011, .0007, .0005, .0004, .0004,
-		.0005, .0010, .0014, .0014, .0009, .0003, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0001, .0002, .0005, .0008, .0010, .0007,
-		.0005, .0004, .0006, .0012, .0016, .0017, .0010, .0004,
-		.0002, .0001, .0001, .0001, .0001, .0000, .0000, .0001,
-		.0001, .0000, .0001, .0001, .0001, .0001, .0002, .0002,
-		.0004, .0005, .0007, .0008, .0007, .0005, .0004, .0003,
-		.0003, .0003, .0002, .0002, .0002, .0003, .0003, .0004,
-		.0005, .0006, .0008, .0012, .0018, .0031, .0056, .0105,
-		.0168, .0214, .0218, .0179, .0138, .0108, .0090, .0081,
-		.0080, .0081, .0090, .0103, .0127, .0164, .0224, .0311,
-		.0416, .0503, .0537, .0489, .0395, .0294, .0215, .0164,
-		.0130, .0109, .0095, .0085, .0078, .0075, .0073, .0074,
-		.0075, .0077, .0079, .0079, .0078, .0073, .0067, .0058,
-		.0049
+    /* Pleiades1a blue of pleiades1a */
+    static const float sr1[208] = {
+        .0100, .0296, .0886, .1300, .1355, .2482, .4389, .5185,
+        .4758, .5178, .6596, .7786, .7959, .7725, .7796, .8094,
+        .8324, .8437, .8410, .8332, .8250, .8246, .8369, .8711,
+        .9167, .9474, .9601, .9669, .9748, .9730, .9684, .9664,
+        .9744, .9903, 1.0000, .9938, .9817, .9813, .9671, .8859,
+        .7175, .4994, .3052, .1740, .0953, .0549, .0349, .0264,
+        .0232, .0225, .0212, .0175, .0120, .0074, .0047, .0034,
+        .0026, .0020, .0015, .0011, .0007, .0005, .0004, .0004,
+        .0005, .0010, .0014, .0014, .0009, .0003, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0001, .0002, .0005, .0008, .0010, .0007,
+        .0005, .0004, .0006, .0012, .0016, .0017, .0010, .0004,
+        .0002, .0001, .0001, .0001, .0001, .0000, .0000, .0001,
+        .0001, .0000, .0001, .0001, .0001, .0001, .0002, .0002,
+        .0004, .0005, .0007, .0008, .0007, .0005, .0004, .0003,
+        .0003, .0003, .0002, .0002, .0002, .0003, .0003, .0004,
+        .0005, .0006, .0008, .0012, .0018, .0031, .0056, .0105,
+        .0168, .0214, .0218, .0179, .0138, .0108, .0090, .0081,
+        .0080, .0081, .0090, .0103, .0127, .0164, .0224, .0311,
+        .0416, .0503, .0537, .0489, .0395, .0294, .0215, .0164,
+        .0130, .0109, .0095, .0085, .0078, .0075, .0073, .0074,
+        .0075, .0077, .0079, .0079, .0078, .0073, .0067, .0058
+
     };
 	
-    /* Pleiades1a Green of pleiades1a */
-    static const float sr2[209] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0001, .0001, .0001, .0001, .0002, .0003, .0004,
-		.0005, .0008, .0046, .0086, .0145, .0246, .0486, .1109,
-		.2379, .4375, .6562, .8184, .8944, .9165, .9230, .9287,
-		.9374, .9507, .9616, .9692, .9772, .9815, .9834, .9876,
-		.9958, 1.0000, .9973, .9849, .9679, .9538, .9542, .9675,
-		.9818, .9868, .9724, .9345, .8829, .8441, .8255, .8103,
-		.7517, .6227, .4368, .2572, .1376, .0778, .0485, .0346,
-		.0270, .0215, .0162, .0108, .0061, .0031, .0016, .0008,
-		.0005, .0003, .0002, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0002, .0002, .0002,
-		.0002, .0001, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0001, .0002, .0002,
-		.0002, .0001, .0001, .0001, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0001, .0000, .0000, .0001, .0001, .0001,
-		.0002, .0004, .0010, .0042, .0067, .0079, .0069, .0030,
-		.0011, .0007, .0006, .0005, .0005, .0005, .0006, .0008,
-		.0011, .0017, .0031, .0056, .0092, .0126, .0146, .0143,
-		.0119, .0091, .0069, .0057, .0053, .0054, .0061, .0068,
-		.0084, .0108, .0141, .0186, .0234, .0276, .0301, .0304,
-		.0290, .0269, .0250, .0240, .0235, .0239, .0248, .0260,
-		.0271, .0270, .0257, .0230, .0191, .0150, .0111, .0081,
-		.0058
+    /* Pleiades1a green of pleiades1a */
+    static const float sr2[191] = {
+        .0001, .0001, .0001, .0001, .0002, .0003, .0004, .0005,
+        .0008, .0046, .0086, .0145, .0246, .0486, .1109, .2379,
+        .4375, .6562, .8184, .8944, .9165, .9230, .9287, .9374,
+        .9507, .9616, .9692, .9772, .9815, .9834, .9876, .9958,
+        1.0000, .9973, .9849, .9679, .9538, .9542, .9675, .9818,
+        .9868, .9724, .9345, .8829, .8441, .8255, .8103, .7517,
+        .6227, .4368, .2572, .1376, .0778, .0485, .0346, .0270,
+        .0215, .0162, .0108, .0061, .0031, .0016, .0008, .0005,
+        .0003, .0002, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0002, .0002, .0002, .0002,
+        .0001, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0001, .0002, .0002, .0002,
+        .0001, .0001, .0001, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0001, .0000, .0000, .0001, .0001, .0001, .0002,
+        .0004, .0010, .0042, .0067, .0079, .0069, .0030, .0011,
+        .0007, .0006, .0005, .0005, .0005, .0006, .0008, .0011,
+        .0017, .0031, .0056, .0092, .0126, .0146, .0143, .0119,
+        .0091, .0069, .0057, .0053, .0054, .0061, .0068, .0084,
+        .0108, .0141, .0186, .0234, .0276, .0301, .0304, .0290,
+        .0269, .0250, .0240, .0235, .0239, .0248, .0260, .0271,
+        .0270, .0257, .0230, .0191, .0150, .0111, .0081
     };
 	
-    /* Pleiades1a Red of pleiades1a */
-    static const float sr3[209] = {
-		.0097, .0035, .0035, .0114, .0267, .0374, .0905, .0908,
-		.0400, .0209, .0081, .0027, .0011, .0006, .0005, .0006,
-		.0010, .0019, .0015, .0006, .0003, .0003, .0003, .0003,
-		.0005, .0008, .0005, .0002, .0001, .0001, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0002, .0002, .0003, .0004, .0006, .0010, .0033,
-		.0100, .0182, .0331, .0625, .1184, .2220, .3759, .5579,
-		.7347, .8643, .9326, .9533, .9627, .9534, .9444, .9463,
-		.9569, .9700, .9846, .9956, .9999, 1.0000, .9970, .9951,
-		.9890, .9864, .9814, .9690, .9551, .9378, .9176, .8929,
-		.8669, .8448, .8226, .7893, .7378, .6630, .5666, .4496,
-		.3262, .2196, .1417, .0926, .0620, .0457, .0356, .0311,
-		.0295, .0234, .0190, .0159, .0132, .0108, .0084, .0064,
-		.0047, .0034, .0024, .0017, .0013, .0010, .0007, .0006,
-		.0005, .0004, .0004, .0003, .0003, .0003, .0003, .0003,
-		.0003, .0003, .0003, .0004, .0005, .0005, .0006, .0007,
-		.0007, .0007, .0006, .0005, .0004, .0004, .0002, .0003,
-		.0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
-		.0002, .0002, .0003, .0003, .0003, .0005, .0005, .0007,
-		.0008, .0011, .0014, .0019, .0025, .0034, .0042, .0054,
-		.0063, .0069, .0071, .0070, .0066, .0068, .0067, .0069,
-		.0071, .0074, .0081, .0087, .0097, .0107, .0120, .0137,
-		.0160, .0181, .0207, .0237, .0270, .0311, .0353, .0399,
-		.0439, .0463, .0455, .0409, .0333, .0251, .0179, .0125,
-		.0086
+    /* Pleiades1a red of pleiades1a */
+    static const float sr3[208] = {
+        .0097, .0035, .0035, .0114, .0267, .0374, .0905, .0908,
+        .0400, .0209, .0081, .0027, .0011, .0006, .0005, .0006,
+        .0010, .0019, .0015, .0006, .0003, .0003, .0003, .0003,
+        .0005, .0008, .0005, .0002, .0001, .0001, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0002, .0002, .0003, .0004, .0006, .0010, .0033,
+        .0100, .0182, .0331, .0625, .1184, .2220, .3759, .5579,
+        .7347, .8643, .9326, .9533, .9627, .9534, .9444, .9463,
+        .9569, .9700, .9846, .9956, .9999, 1.0000, .9970, .9951,
+        .9890, .9864, .9814, .9690, .9551, .9378, .9176, .8929,
+        .8669, .8448, .8226, .7893, .7378, .6630, .5666, .4496,
+        .3262, .2196, .1417, .0926, .0620, .0457, .0356, .0311,
+        .0295, .0234, .0190, .0159, .0132, .0108, .0084, .0064,
+        .0047, .0034, .0024, .0017, .0013, .0010, .0007, .0006,
+        .0005, .0004, .0004, .0003, .0003, .0003, .0003, .0003,
+        .0003, .0003, .0003, .0004, .0005, .0005, .0006, .0007,
+        .0007, .0007, .0006, .0005, .0004, .0004, .0002, .0003,
+        .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+        .0002, .0002, .0003, .0003, .0003, .0005, .0005, .0007,
+        .0008, .0011, .0014, .0019, .0025, .0034, .0042, .0054,
+        .0063, .0069, .0071, .0070, .0066, .0068, .0067, .0069,
+        .0071, .0074, .0081, .0087, .0097, .0107, .0120, .0137,
+        .0160, .0181, .0207, .0237, .0270, .0311, .0353, .0399,
+        .0439, .0463, .0455, .0409, .0333, .0251, .0179, .0125
+
     };
 	
-    /* pleiades1a NIR of pleiades1a */
-    static const float sr4[209] = {
-		.0024, .0017, .0021, .0021, .0013, .0007, .0006, .0006,
-		.0008, .0012, .0021, .0024, .0013, .0006, .0004, .0003,
-		.0003, .0003, .0003, .0005, .0009, .0010, .0007, .0004,
-		.0003, .0002, .0002, .0003, .0004, .0006, .0007, .0007,
-		.0006, .0004, .0003, .0003, .0003, .0003, .0004, .0005,
-		.0006, .0007, .0009, .0009, .0009, .0008, .0007, .0006,
-		.0005, .0006, .0006, .0008, .0014, .0024, .0027, .0014,
-		.0006, .0004, .0002, .0002, .0002, .0002, .0002, .0002,
-		.0003, .0007, .0014, .0013, .0006, .0002, .0001, .0001,
-		.0000, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0002, .0002, .0002, .0002,
-		.0002, .0001, .0001, .0001, .0001, .0001, .0001, .0000,
-		.0000, .0000, .0001, .0001, .0001, .0001, .0001, .0002,
-		.0002, .0003, .0004, .0005, .0006, .0008, .0010, .0012,
-		.0014, .0016, .0018, .0019, .0021, .0023, .0025, .0038,
-		.0045, .0054, .0067, .0084, .0108, .0152, .0214, .0295,
-		.0417, .0591, .0841, .1200, .1685, .2344, .3148, .4102,
-		.5131, .6196, .7196, .8080, .8783, .9313, .9662, .9859,
-		.9959, 1.0000, .9979, .9931, .9853, .9735, .9606, .9494,
-		.9376, .9313, .9284, .9275, .9289, .9299, .9302, .9309,
-		.9315, .9278, .9226, .9162, .9073, .8975, .8845, .8736,
-		.8604, .8494, .8370, .8259, .8132, .7983, .7852, .7720,
-		.7580, .7433, .7273, .7098, .6906, .6694, .6464, .6221,
-		.5966, .5716, .5472, .5225, .4996, .4771, .4563, .4366,
-		.4164, .3950, .3688, .3351, .2940, .2473, .1978, .1498,
-		.1077, .0744, .0496, .0331, .0218, .0147, .0104, .0077,
-		.0062
+    /* Pleiades1a nir of pleiades1a */
+    static const float sr4[208] = {
+        .0024, .0017, .0021, .0021, .0013, .0007, .0006, .0006,
+        .0008, .0012, .0021, .0024, .0013, .0006, .0004, .0003,
+        .0003, .0003, .0003, .0005, .0009, .0010, .0007, .0004,
+        .0003, .0002, .0002, .0003, .0004, .0006, .0007, .0007,
+        .0006, .0004, .0003, .0003, .0003, .0003, .0004, .0005,
+        .0006, .0007, .0009, .0009, .0009, .0008, .0007, .0006,
+        .0005, .0006, .0006, .0008, .0014, .0024, .0027, .0014,
+        .0006, .0004, .0002, .0002, .0002, .0002, .0002, .0002,
+        .0003, .0007, .0014, .0013, .0006, .0002, .0001, .0001,
+        .0000, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0002, .0002, .0002, .0002,
+        .0002, .0001, .0001, .0001, .0001, .0001, .0001, .0000,
+        .0000, .0000, .0001, .0001, .0001, .0001, .0001, .0002,
+        .0002, .0003, .0004, .0005, .0006, .0008, .0010, .0012,
+        .0014, .0016, .0018, .0019, .0021, .0023, .0025, .0038,
+        .0045, .0054, .0067, .0084, .0108, .0152, .0214, .0295,
+        .0417, .0591, .0841, .1200, .1685, .2344, .3148, .4102,
+        .5131, .6196, .7196, .8080, .8783, .9313, .9662, .9859,
+        .9959, 1.0000, .9979, .9931, .9853, .9735, .9606, .9494,
+        .9376, .9313, .9284, .9275, .9289, .9299, .9302, .9309,
+        .9315, .9278, .9226, .9162, .9073, .8975, .8845, .8736,
+        .8604, .8494, .8370, .8259, .8132, .7983, .7852, .7720,
+        .7580, .7433, .7273, .7098, .6906, .6694, .6464, .6221,
+        .5966, .5716, .5472, .5225, .4996, .4771, .4563, .4366,
+        .4164, .3950, .3688, .3351, .2940, .2473, .1978, .1498,
+        .1077, .0744, .0496, .0331, .0218, .0147, .0104, .0077
+
     };
 	
-    /* Pleiades1a Pan of pleiades1a */
-    static const float sr5[209] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0004, .0008, .0030, .0061, .0130, .0240, .0422, .0718,
-		.1152, .1739, .2443, .3204, .3941, .4553, .5016, .5325,
-		.5538, .5684, .5825, .5968, .6108, .6233, .6336, .6422,
-		.6502, .6571, .6641, .6708, .6766, .6809, .6830, .6835,
-		.6832, .6832, .6847, .6893, .6965, .7074, .7194, .7324,
-		.7450, .7555, .7639, .7717, .7777, .7827, .7872, .7914,
-		.7950, .7975, .7998, .8008, .8004, .8003, .8001, .8013,
-		.8037, .8078, .8137, .8211, .8304, .8391, .8483, .8565,
-		.8635, .8690, .8739, .8769, .8801, .8826, .8851, .8895,
-		.8940, .8995, .9057, .9125, .9190, .9246, .9290, .9339,
-		.9375, .9416, .9450, .9481, .9511, .9533, .9561, .9582,
-		.9602, .9610, .9632, .9650, .9675, .9730, .9775, .9829,
-		.9875, .9928, .9967, .9995, 1.0000, .9944, .9883, .9812,
-		.9752, .9701, .9661, .9633, .9625, .9622, .9634, .9655,
-		.9672, .9673, .9678, .9654, .9634, .9580, .9534, .9487,
-		.9424, .9359, .9300, .9245, .9191, .9142, .9089, .9041,
-		.8981, .8928, .8871, .8829, .8773, .8735, .8695, .8665,
-		.8661, .8589, .8478, .8332, .8137, .7867, .7491, .6982,
-		.6307, .5507, .4617, .3696, .2824, .2075, .1465, .1010,
-		.0687, .0471, .0324, .0247, .0174, .0127, .0117, .0087,
-		.0082, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    /* Pleiades1a pan of pleiades1a */
+    static const float sr5[162] = {
+        .0000, .0004, .0008, .0030, .0061, .0130, .0240, .0422,
+        .0718, .1152, .1739, .2443, .3204, .3941, .4553, .5016,
+        .5325, .5538, .5684, .5825, .5968, .6108, .6233, .6336,
+        .6422, .6502, .6571, .6641, .6708, .6766, .6809, .6830,
+        .6835, .6832, .6832, .6847, .6893, .6965, .7074, .7194,
+        .7324, .7450, .7555, .7639, .7717, .7777, .7827, .7872,
+        .7914, .7950, .7975, .7998, .8008, .8004, .8003, .8001,
+        .8013, .8037, .8078, .8137, .8211, .8304, .8391, .8483,
+        .8565, .8635, .8690, .8739, .8769, .8801, .8826, .8851,
+        .8895, .8940, .8995, .9057, .9125, .9190, .9246, .9290,
+        .9339, .9375, .9416, .9450, .9481, .9511, .9533, .9561,
+        .9582, .9602, .9610, .9632, .9650, .9675, .9730, .9775,
+        .9829, .9875, .9928, .9967, .9995, 1.0000, .9944, .9883,
+        .9812, .9752, .9701, .9661, .9633, .9625, .9622, .9634,
+        .9655, .9672, .9673, .9678, .9654, .9634, .9580, .9534,
+        .9487, .9424, .9359, .9300, .9245, .9191, .9142, .9089,
+        .9041, .8981, .8928, .8871, .8829, .8773, .8735, .8695,
+        .8665, .8661, .8589, .8478, .8332, .8137, .7867, .7491,
+        .6982, .6307, .5507, .4617, .3696, .2824, .2075, .1465,
+        .1010, .0687, .0471, .0324, .0247, .0174, .0127, .0117,
+        .0087, .0082
     };
 	
-    static const float wli[5] = {0.430, 0.430, 0.430, 0.430, 0.430};
-    static const float wls[5] = {0.950, 0.950, 0.950, 0.950, 0.950};
+    static const float wli[5] = {0.4300, 0.4725, 0.4300, 0.4300, 0.4475};
+    static const float wls[5] = {0.9500, 0.9500, 0.9500, 0.9500, 0.8525};
 
     ffu.wlinf = (float)wli[iwa-1];
     ffu.wlsup = (float)wls[iwa-1];
@@ -3968,15 +3959,15 @@
 
     switch(iwa)
     {
-    case 1: for(i = 0; i < 209; i++)  ffu.s[72+i] = sr1[i];
+    case 1: for(i = 0; i < 208; i++)  ffu.s[72+i] = sr1[i];
         break;
-    case 2: for(i = 0; i < 209; i++)  ffu.s[72+i] = sr2[i];
+    case 2: for(i = 0; i < 191; i++)  ffu.s[89+i] = sr2[i];
         break;
-    case 3: for(i = 0; i < 209; i++)  ffu.s[72+i] = sr3[i];
+    case 3: for(i = 0; i < 208; i++)  ffu.s[72+i] = sr3[i];
         break;
-    case 4: for(i = 0; i < 209; i++)  ffu.s[72+i] = sr4[i];
+    case 4: for(i = 0; i < 208; i++)  ffu.s[72+i] = sr4[i];
         break;
-    case 5: for(i = 0; i < 209; i++)  ffu.s[72+i] = sr5[i];
+    case 5: for(i = 0; i < 162; i++)  ffu.s[79+i] = sr5[i];
         break;
     }
 }



More information about the grass-commit mailing list