Skip to content

Commit a4b9ccb

Browse files
mlietzowmlietzow
committed
Merge branch 'develop-basic' into master-basic
2 parents ebd05f4 + f210a7d commit a4b9ccb

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

‎src/MathFunctions_t.cpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@ TEST_CASE("CMathFunctions::calcWVMie::BH", "[MathFunctions][CMathFunctions]")
8686
REQUIRE(std::abs(qsca - 3.10543) < 1e-5);
8787
// REQUIRE(abs(qbk - 2.92534) < 1e-5);
8888

89-
double BH_S11[nr_theta] = {
89+
double BH_S11[] = {
9090
0.100000e+01, 0.785390e+00, 0.356897e+00, 0.766119e-01, 0.355355e-01, 0.701845e-01, 0.574313e-01, 0.219660e-01, 0.125959e-01, 0.173750e-01,
9191
0.124601e-01, 0.679093e-02, 0.954239e-02, 0.863419e-02, 0.227421e-02, 0.543998e-02, 0.160243e-01, 0.188852e-01, 0.195254e-01, 0.301676e-01,
9292
0.383189e-01};
93-
double BH_S12[nr_theta] = {
93+
double BH_S12[] = {
9494
0.000000e+00,-0.459811e-02,-0.458541e-01,-0.364744e+00,-0.534997e+00, 0.959953e-02, 0.477927e-01,-0.440604e+00,-0.831996e+00, 0.341670e-01,
9595
0.230462e+00,-0.713472e+00,-0.756255e+00,-0.281215e+00,-0.239612e+00,-0.850804e+00,-0.706334e+00,-0.891081e+00,-0.783319e+00,-0.196194e+00,
9696
0.000000e+00};
97-
double BH_S33[nr_theta] = {
97+
double BH_S33[] = {
9898
0.100000e+01, 0.999400e+00, 0.986022e+00, 0.843603e+00, 0.686967e+00, 0.959825e+00, 0.985371e+00, 0.648043e+00, 0.203255e+00, 0.795354e+00,
9999
0.937497e+00,-0.717397e-02,-0.394748e-01, 0.536251e+00, 0.967602e+00, 0.187531e+00, 0.495254e+00, 0.453277e+00,-0.391613e+00,-0.962069e+00,
100100
-0.100000e+01};
101-
double BH_S34[nr_theta] = {
101+
double BH_S34[] = {
102102
0.000000e+00, 0.343261e-01, 0.160184e+00, 0.394076e+00,-0.491787e+00,-0.280434e+00, 0.163584e+00, 0.621216e+00,-0.516208e+00,-0.605182e+00,
103103
0.260742e+00, 0.700647e+00,-0.653085e+00,-0.795835e+00, 0.795798e-01,-0.490882e+00,-0.505781e+00,-0.226817e-01, 0.482752e+00, 0.189556e+00,
104104
0.000000e+00};
@@ -141,12 +141,12 @@ TEST_CASE("CMathFunctions::calcWVMie::W1", "[MathFunctions][CMathFunctions]")
141141
REQUIRE(std::abs(qsca - 2.881999) < 1e-6);
142142
REQUIRE(std::abs(gsca - 0.742913) < 1e-6);
143143

144-
double W_S11[nr_theta] = {
144+
double W_S11[] = {
145145
0.520856e+04, 0.428132e+04, 0.234775e+04, 0.818121e+03, 0.149547e+03, 0.139195e+02, 0.768071e+02, 0.128393e+03, 0.789487e+02, 0.293697e+02,
146146
0.518546e+02, 0.631908e+02, 0.341567e+02, 0.256714e+02, 0.320167e+02, 0.235919e+02, 0.194168e+02, 0.184988e+02, 0.917521e+01, 0.963035e+01,
147147
0.136986e+02, 0.485859e+01, 0.280440e+01, 0.853248e+01, 0.439826e+01, 0.570995e+01, 0.113872e+02, 0.304142e+01, 0.675713e+01, 0.242055e+02,
148148
0.159589e+02, 0.161562e+02, 0.582167e+02, 0.679231e+02, 0.286866e+02, 0.249122e+02, 0.423766e+02};
149-
double W_S12[nr_theta] = {
149+
double W_S12[] = {
150150
0.0000,-0.0239,-0.0963,-0.2080,-0.2887, 0.4685, 0.0005,-0.0892,-0.0767, 0.7251,
151151
0.4834,-0.0592,-0.0163, 0.9793, 0.3242,-0.3951, 0.5014, 0.9514,-0.0269, 0.1127,
152152
0.7525, 0.7257, 0.8993, 0.5987,-0.4844, 0.3364, 0.9396, 0.6460, 0.6282, 0.9286,
@@ -162,12 +162,12 @@ TEST_CASE("CMathFunctions::calcWVMie::W1", "[MathFunctions][CMathFunctions]")
162162
REQUIRE(std::abs(qsca - 2.094388) < 1e-6);
163163
REQUIRE(std::abs(gsca - 0.818246) < 1e-6);
164164

165-
double W_S11[nr_theta] = {
165+
double W_S11[] = {
166166
0.275508e+08, 0.106440e+06, 0.586911e+05, 0.258367e+05, 0.202131e+05, 0.192755e+05, 0.159327e+05, 0.538269e+04, 0.866710e+04, 0.540267e+04,
167167
0.305275e+04, 0.510959e+04, 0.167021e+04, 0.202680e+04, 0.960828e+03, 0.122361e+04, 0.394465e+03, 0.254063e+03, 0.505356e+03, 0.507283e+03,
168168
0.131614e+03, 0.222694e+03, 0.133922e+03, 0.705029e+02, 0.401041e+02, 0.100503e+03, 0.167811e+03, 0.232785e+03, 0.243533e+03, 0.235398e+03,
169169
0.186086e+03, 0.121783e+04, 0.353283e+04, 0.239888e+04, 0.272592e+04, 0.622951e+03, 0.434048e+04};
170-
double W_S12[nr_theta] = {
170+
double W_S12[] = {
171171
0.0000,-0.0107, 0.0098, 0.0712,-0.0248,-0.0730,-0.0540, 0.2001, 0.0919,-0.1301,
172172
0.4545, 0.1026, 0.4679,-0.2130, 0.7357,-0.0054, 0.8365,-0.2535,-0.0016,-0.4214,
173173
-0.5649,-0.3412, 0.3830,-0.0700,-0.8726, 0.1822, 0.5235, 0.4015, 0.3292, 0.0578,
@@ -183,12 +183,12 @@ TEST_CASE("CMathFunctions::calcWVMie::W1", "[MathFunctions][CMathFunctions]")
183183
REQUIRE(std::abs(qsca - 2.013945) < 1e-6);
184184
REQUIRE(std::abs(gsca - 0.827882) < 1e-6);
185185

186-
double W_S11[nr_theta] = {
186+
double W_S11[] = {
187187
0.253568e+12, 0.482785e+07, 0.883654e+06, 0.163897e+07, 0.136169e+07, 0.113470e+07, 0.103882e+07, 0.929666e+06, 0.863859e+06, 0.766220e+06,
188188
0.266763e+06, 0.324223e+06, 0.282935e+06, 0.237449e+06, 0.160593e+06, 0.525112e+05, 0.789951e+05, 0.306843e+05, 0.248427e+05, 0.214530e+05,
189189
0.106283e+05, 0.152392e+05, 0.197453e+05, 0.912219e+04, 0.714740e+04, 0.791914e+04, 0.952024e+04, 0.109979e+05, 0.666722e+04, 0.168603e+05,
190190
0.211737e+05, 0.559288e+04, 0.208814e+06, 0.267605e+06, 0.392870e+06, 0.224420e+06, 0.257577e+07};
191-
double W_S12[nr_theta] = {
191+
double W_S12[] = {
192192
0.0000,-0.0455,-0.1300,-0.0275, 0.0909, 0.0469, 0.0701, 0.0406,-0.0202,-0.0694,
193193
0.5051, 0.1317,-0.0010,-0.1018,-0.0523, 0.3454,-0.0192,-0.3916, 0.0127,-0.8087,
194194
-0.8588,-0.6411,-0.6625,-0.5131, 0.3474,-0.4821,-0.2850,-0.2910, 0.3604,-0.3089,
@@ -204,12 +204,12 @@ TEST_CASE("CMathFunctions::calcWVMie::W1", "[MathFunctions][CMathFunctions]")
204204
REQUIRE(std::abs(qsca - 2.008650) < 1e-6);
205205
REQUIRE(std::abs(gsca - 0.829592) < 1e-6);
206206

207-
double W_S11[nr_theta] = {
207+
double W_S11[] = {
208208
0.157609e+15, 0.394653e+08, 0.229931e+08, 0.339037e+08, 0.262577e+08, 0.236482e+08, 0.155814e+08, 0.323654e+08, 0.234225e+08, 0.178268e+08,
209209
0.673414e+07, 0.586469e+07, 0.709207e+07, 0.262123e+07, 0.310573e+07, 0.158540e+07, 0.219096e+07, 0.101618e+07, 0.567675e+06, 0.323205e+06,
210210
0.241279e+06, 0.249034e+06, 0.143024e+06, 0.417106e+06, 0.253470e+06, 0.199198e+06, 0.273150e+06, 0.254040e+06, 0.185353e+06, 0.363299e+06,
211211
0.272294e+06, 0.256060e+06, 0.130619e+08, 0.372204e+07, 0.453092e+07, 0.205242e+07, 0.237786e+09};
212-
double W_S12[nr_theta] = {
212+
double W_S12[] = {
213213
0.0000,-0.0223, 0.1179, 0.1247, 0.0279, 0.1168, 0.2597,-0.0712,-0.0175,-0.0512,
214214
0.5594, 0.3873, 0.0148, 0.8293, 0.0368, 0.0580,-0.1909,-0.3772,-0.4089,-0.7399,
215215
-0.7719,-0.6412, 0.9228,-0.8142,-0.1234, 0.0435,-0.3815,-0.1249,-0.1602,-0.6980,
@@ -252,12 +252,12 @@ TEST_CASE("CMathFunctions::calcWVMie::W2", "[MathFunctions][CMathFunctions]")
252252
REQUIRE(std::abs(qsca - 1.235144) < 1e-6);
253253
REQUIRE(std::abs(gsca - 0.922350) < 1e-6);
254254

255-
double W_S11[nr_theta] = {
255+
double W_S11[] = {
256256
0.379171e+04, 0.300320e+04, 0.141624e+04, 0.313014e+03, 0.124235e+02, 0.296988e+02, 0.273164e+02, 0.112113e+02, 0.109517e+02, 0.607843e+01,
257257
0.220902e+01, 0.632075e+01, 0.646946e+01, 0.225394e+01, 0.215826e+01, 0.392848e+01, 0.299433e+01, 0.163623e+01, 0.183556e+01, 0.209544e+01,
258258
0.166228e+01, 0.137914e+01, 0.153058e+01, 0.147431e+01, 0.116521e+01, 0.135300e+01, 0.174359e+01, 0.136826e+01, 0.798073e+00, 0.974236e+00,
259259
0.133396e+01, 0.141816e+01, 0.148012e+01, 0.126487e+01, 0.106733e+01, 0.172292e+01, 0.231818e+01};
260-
double W_S12[nr_theta] = {
260+
double W_S12[] = {
261261
0.0000,-0.0014,-0.0068,-0.0301,-0.6183,-0.2518,-0.2817,-0.7359,-0.6378,-0.5132,
262262
-0.9235,-0.7194,-0.6077,-0.1744,-0.2426,-0.7454,-0.6373, 0.3019,-0.0893,-0.8614,
263263
-0.6653, 0.2706, 0.0790,-0.7132,-0.8966, 0.1033, 0.3819,-0.0370,-0.6271, 0.0599,
@@ -273,12 +273,12 @@ TEST_CASE("CMathFunctions::calcWVMie::W2", "[MathFunctions][CMathFunctions]")
273273
REQUIRE(std::abs(qsca - 1.132134) < 1e-6);
274274
REQUIRE(std::abs(gsca - 0.950392) < 1e-6);
275275

276-
double W_S11[nr_theta] = {
276+
double W_S11[] = {
277277
0.273645e+08, 0.911574e+05, 0.130172e+05, 0.314304e+04, 0.121824e+04, 0.911319e+03, 0.801673e+03, 0.629347e+03, 0.465786e+03, 0.370932e+03,
278278
0.317391e+03, 0.269848e+03, 0.230451e+03, 0.202758e+03, 0.180401e+03, 0.162813e+03, 0.149203e+03, 0.138475e+03, 0.130113e+03, 0.123599e+03,
279279
0.118559e+03, 0.114659e+03, 0.111687e+03, 0.109437e+03, 0.107749e+03, 0.106503e+03, 0.105600e+03, 0.104961e+03, 0.104521e+03, 0.104229e+03,
280280
0.104044e+03, 0.103935e+03, 0.103877e+03, 0.103850e+03, 0.103840e+03, 0.103837e+03, 0.103837e+03};
281-
double W_S12[nr_theta] = {
281+
double W_S12[] = {
282282
0.0000,-0.0247,-0.0848,-0.2375,-0.4798,-0.5484,-0.5537,-0.6268,-0.7490,-0.8418,
283283
-0.8905,-0.9395,-0.9797,-0.9960,-0.9944,-0.9750,-0.9395,-0.8885,-0.8273,-0.7576,
284284
-0.6831,-0.6072,-0.5316,-0.4586,-0.3897,-0.3257,-0.2673,-0.2148,-0.1684,-0.1278,
@@ -294,12 +294,12 @@ TEST_CASE("CMathFunctions::calcWVMie::W2", "[MathFunctions][CMathFunctions]")
294294
REQUIRE(std::abs(qsca - 1.106932) < 1e-6);
295295
REQUIRE(std::abs(gsca - 0.950880) < 1e-6);
296296

297-
double W_S11[nr_theta] = {
297+
double W_S11[] = {
298298
0.255002e+12, 0.103489e+07, 0.270449e+06, 0.145265e+06, 0.101955e+06, 0.803929e+05, 0.646676e+05, 0.528211e+05, 0.436516e+05, 0.364909e+05,
299299
0.308618e+05, 0.264252e+05, 0.229245e+05, 0.201609e+05, 0.179799e+05, 0.162601e+05, 0.149061e+05, 0.138426e+05, 0.130097e+05, 0.123601e+05,
300300
0.118559e+05, 0.114671e+05, 0.111696e+05, 0.109441e+05, 0.107752e+05, 0.106505e+05, 0.105601e+05, 0.104961e+05, 0.104520e+05, 0.104227e+05,
301301
0.104042e+05, 0.103933e+05, 0.103874e+05, 0.103846e+05, 0.103836e+05, 0.103834e+05, 0.103834e+05};
302-
double W_S12[nr_theta] = {
302+
double W_S12[] = {
303303
0.0000,-0.0682,-0.1681,-0.2830,-0.3931,-0.4861,-0.5789,-0.6682,-0.7517,-0.8267,
304304
-0.8909,-0.9417,-0.9765,-0.9939,-0.9928,-0.9737,-0.9379,-0.8878,-0.8265,-0.7571,
305305
-0.6829,-0.6069,-0.5315,-0.4586,-0.3897,-0.3258,-0.2674,-0.2149,-0.1684,-0.1279,
@@ -315,12 +315,12 @@ TEST_CASE("CMathFunctions::calcWVMie::W2", "[MathFunctions][CMathFunctions]")
315315
REQUIRE(std::abs(qsca - 1.099193) < 1e-6);
316316
REQUIRE(std::abs(gsca - 0.950650) < 1e-6);
317317

318-
double W_S11[nr_theta] = {
318+
double W_S11[] = {
319319
0.157315e+15, 0.772728e+07, 0.417917e+07, 0.311291e+07, 0.245545e+07, 0.197572e+07, 0.160555e+07, 0.131668e+07, 0.109011e+07, 0.911909e+06,
320320
0.771474e+06, 0.660667e+06, 0.573177e+06, 0.504089e+06, 0.449555e+06, 0.406550e+06, 0.372691e+06, 0.346095e+06, 0.325266e+06, 0.309020e+06,
321321
0.296412e+06, 0.286689e+06, 0.279248e+06, 0.273608e+06, 0.269384e+06, 0.266266e+06, 0.264005e+06, 0.262403e+06, 0.261300e+06, 0.260568e+06,
322322
0.260105e+06, 0.259832e+06, 0.259684e+06, 0.259616e+06, 0.259591e+06, 0.259585e+06, 0.259585e+06};
323-
double W_S12[nr_theta] = {
323+
double W_S12[] = {
324324
0.0000,-0.1103,-0.1975,-0.2927,-0.3902,-0.4856,-0.5788,-0.6680,-0.7513,-0.8264,
325325
-0.8906,-0.9414,-0.9763,-0.9936,-0.9926,-0.9735,-0.9378,-0.8878,-0.8264,-0.7570,
326326
-0.6829,-0.6069,-0.5315,-0.4586,-0.3897,-0.3258,-0.2674,-0.2149,-0.1684,-0.1279,

0 commit comments

Comments
 (0)