solstice

commit b7165bd833b0215212645a8934167e1650ceb92c
parent 326b3440bd2099eed34002f69bf4b552ce6966d7
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Fri, 28 Jul 2017 10:28:03 +0200

Fix the simulation tests

The solstice solver did not compute properly the per primary cosine factor.
The reference files used by the simulation tests were thus wrong leading
to errors since the fix of the solstice solver.

Diffstat:
M
yaml/beam_down.ref
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
yaml/test01.ref
 | 
2
+-
M
yaml/test02.ref
 | 
10
+++++-----
M
yaml/test03.ref
 | 
10
+++++-----
M
yaml/test04.ref
 | 
10
+++++-----
M
yaml/test05.ref
 | 
2
+-
M
yaml/test06.ref
 | 
10
+++++-----
M
yaml/test07.ref
 | 
12
++++++------
M
yaml/test08.ref
 | 
10
+++++-----

9 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/yaml/beam_down.ref b/yaml/beam_down.ref
@@ -1,52 +1,52 @@
 #--- Sun direction: 90 90 (-3.7494e-33 -6.12323e-17 -1)
 7 2 5 100000 0
 500.043 0
-465.46 0.0057839
-0.930834 1.15684e-05
+465.462 0.00578398
+0.930838 1.15681e-05
 0 0
 0 0
 0 0
 0 0
-tower.secondary.hyperbol 10 421.957   0 0   465.46 0.0057839   0 0   0 0   0 0   0 0   0 0   0 0   0 0   0 0
-tower.receptor 14 25   465.46 0.0057839   465.46 0.0057839   0 0   0 0   0.93084 1.15668e-05   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1
-heliostat4.temp-heliostat150.pivot.reflector 6 100.009 19915   0 0   0 0
-heliostat5.temp-heliostat150.pivot.reflector 30 100.009 20068   0 0   0 0
-heliostat3.temp-heliostat150.pivot.reflector 22 100.009 19919   0 0   0 0
-heliostat2.temp-heliostat150.pivot.reflector 26 100.009 20054   0 0   0 0
-heliostat1.temp-heliostat150.pivot.reflector 34 100.009 20044   0 0   0 0
-10 6   0 0   92.7742 0.588324   0 0   0 0   0 0   0 0   0 0   0 0
-10 30   0 0   93.2842 0.588736   0 0   0 0   0 0   0 0   0 0   0 0
-10 22   0 0   92.8029 0.588432   0 0   0 0   0 0   0 0   0 0   0 0
-10 26   0 0   93.4242 0.589876   0 0   0 0   0 0   0 0   0 0   0 0
-10 34   0 0   93.1748 0.588486   0 0   0 0   0 0   0 0   0 0   0 0
-14 6   92.7742 0.588324   92.7742 0.588324   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
-14 30   93.2842 0.588736   93.2842 0.588736   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
-14 22   92.8029 0.588432   92.8029 0.588432   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
-14 26   93.4242 0.589876   93.4242 0.589876   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
-14 34   93.1748 0.588486   93.1748 0.588486   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+tower.secondary.hyperbol 10 421.957   0 0   465.462 0.00578398   0 0   0 0   0 0   0 0   0 0   0 0   0 0   0 0
+tower.receptor 14 25   465.462 0.00578398   465.462 0.00578398   0 0   0 0   0.930843 1.1567e-05   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1
+heliostat4.temp-heliostat150.pivot.reflector 6 100.009 19934   0.185708 0.00117696   0 0
+heliostat5.temp-heliostat150.pivot.reflector 30 100.009 20264   0.188378 0.00118168   0 0
+heliostat3.temp-heliostat150.pivot.reflector 22 100.009 19746   0.183977 0.0011729   0 0
+heliostat2.temp-heliostat150.pivot.reflector 26 100.009 20054   0.186834 0.00117966   0 0
+heliostat1.temp-heliostat150.pivot.reflector 34 100.009 20002   0.185941 0.00117593   0 0
+10 6   0 0   92.8625 0.588533   0 0   0 0   0 0   0 0   0 0   0 0
+10 30   0 0   94.198 0.590895   0 0   0 0   0 0   0 0   0 0   0 0
+10 22   0 0   91.9969 0.586504   0 0   0 0   0 0   0 0   0 0   0 0
+10 26   0 0   93.4254 0.589884   0 0   0 0   0 0   0 0   0 0   0 0
+10 34   0 0   92.9793 0.588022   0 0   0 0   0 0   0 0   0 0   0 0
+14 6   92.8625 0.588533   92.8625 0.588533   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+14 30   94.198 0.590895   94.198 0.590895   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+14 22   91.9969 0.586504   91.9969 0.586504   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+14 26   93.4254 0.589884   93.4254 0.589884   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+14 34   92.9793 0.588022   92.9793 0.588022   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
 #--- Sun direction: 50 50 (-0.413176 -0.492404 -0.766044)
 7 2 5 100000 0
 500.043 0
-135.852 0.602426
-0.800261 7.05527e-05
+135.955 0.602452
+0.800093 7.03652e-05
 0 0
-245.21 0.615008
+244.612 0.615276
 0 0
 0 0
-tower.secondary.hyperbol 10 421.957   0 0   400.167 0.0352796   0 0   0 0   0 0   0 0   0 0   0 0   0 0   0 0
-tower.receptor 14 25   135.852 0.602426   135.852 0.602426   0 0   0 0   0.271681 0.00120475   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1
-heliostat4.temp-heliostat150.pivot.reflector 6 100.009 20095   0 0   0 0
-heliostat5.temp-heliostat150.pivot.reflector 30 100.009 20027   0 0   0 0
-heliostat3.temp-heliostat150.pivot.reflector 22 100.009 19777   0 0   0 0
-heliostat2.temp-heliostat150.pivot.reflector 26 100.009 19976   0 0   0 0
-heliostat1.temp-heliostat150.pivot.reflector 34 100.009 20125   0 0   0 0
-10 6   0 0   78.903 0.497568   0 0   0 0   0 0   0 0   0 0   0 0
-10 30   0 0   77.0867 0.487147   0 0   0 0   0 0   0 0   0 0   0 0
-10 22   0 0   79.1052 0.503835   0 0   0 0   0 0   0 0   0 0   0 0
-10 26   0 0   81.4942 0.515816   0 0   0 0   0 0   0 0   0 0   0 0
-10 34   0 0   83.5784 0.526554   0 0   0 0   0 0   0 0   0 0   0 0
-14 6   22.1799 0.286704   22.1799 0.286704   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
-14 30   18.6614 0.26147   18.6614 0.26147   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
-14 22   25.3271 0.308097   25.3271 0.308097   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
-14 26   31.6777 0.345324   31.6777 0.345324   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
-14 34   38.0063 0.378737   38.0063 0.378737   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+tower.secondary.hyperbol 10 421.957   0 0   400.083 0.0351855   0 0   0 0   0 0   0 0   0 0   0 0   0 0   0 0
+tower.receptor 14 25   135.955 0.602452   135.955 0.602452   0 0   0 0   0.271887 0.0012048   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1
+heliostat4.temp-heliostat150.pivot.reflector 6 100.009 20121   0.157986 0.000995464   0 0
+heliostat5.temp-heliostat150.pivot.reflector 30 100.009 20226   0.155708 0.000977921   0 0
+heliostat3.temp-heliostat150.pivot.reflector 22 100.009 19829   0.15861 0.00100856   0 0
+heliostat2.temp-heliostat150.pivot.reflector 26 100.009 20002   0.163177 0.00103199   0 0
+heliostat1.temp-heliostat150.pivot.reflector 34 100.009 19822   0.164613 0.00104696   0 0
+10 6   0 0   79.0003 0.497778   0 0   0 0   0 0   0 0   0 0   0 0
+10 30   0 0   77.8612 0.489006   0 0   0 0   0 0   0 0   0 0   0 0
+10 22   0 0   79.3121 0.504326   0 0   0 0   0 0   0 0   0 0   0 0
+10 26   0 0   81.5961 0.516042   0 0   0 0   0 0   0 0   0 0   0 0
+10 34   0 0   82.3139 0.523526   0 0   0 0   0 0   0 0   0 0   0 0
+14 6   22.5024 0.288631   22.5024 0.288631   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+14 30   18.7466 0.26204   18.7466 0.26204   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+14 22   25.423 0.308639   25.423 0.308639   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+14 26   31.5382 0.344622   31.5382 0.344622   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
+14 34   37.7451 0.377566   37.7451 0.377566   0 0   0 0   -1 -1   -1 -1   -1 -1   -1 -1
diff --git a/yaml/test01.ref b/yaml/test01.ref
@@ -8,5 +8,5 @@
 0 0
 0 0
 square_receiver 2 100   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   1 0   0 0   0 0   0 0
-reflector 6 1 10000   0 0   0 0
+reflector 6 1 10000   1 0   0 0
 2 6   -1 -1   -1 -1   -1 -1   -1 -1   0 0   1 0   0 0   0 0
diff --git a/yaml/test02.ref b/yaml/test02.ref
@@ -1,12 +1,12 @@
 #--- Sun direction: 0 90 (-6.12323e-17 -0 -1)
 7 1 1 10000 0
 100 0
-0.96 0.0975082
+0.91 0.0949589
 1 0
 0 0
-99.04 0.0975082
+99.09 0.0949589
 0 0
 0 0
-square_receiver 2 1   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0.96 0.0975082   0.96 0.0975082   0 0   0 0   0.0096 0.000975082
-reflector 6 100 10000   0 0   0 0
-2 6   -1 -1   -1 -1   -1 -1   -1 -1   0.96 0.0975082   0.96 0.0975082   0 0   0 0
+square_receiver 2 1   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0.91 0.0949589   0.91 0.0949589   0 0   0 0   0.0091 0.000949589
+reflector 6 100 10000   1 0   0 0
+2 6   -1 -1   -1 -1   -1 -1   -1 -1   0.91 0.0949589   0.91 0.0949589   0 0   0 0
diff --git a/yaml/test03.ref b/yaml/test03.ref
@@ -2,11 +2,11 @@
 7 1 1 10000 0
 1 0
 0 0
-0.707107 0
+0.707107 2.44511e-09
 0 0
-0.707107 0
+0.707107 2.44511e-09
 0 0
 0 0
-square_receiver 2 100   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   0.707107 0   0 0   0 0   0 0
-reflector 6 1 10000   0 0   0 0
-2 6   -1 -1   -1 -1   -1 -1   -1 -1   0 0   0.707107 0   0 0   0 0
+square_receiver 2 100   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   0.707107 2.44511e-09   0 0   0 0   0 0
+reflector 6 1 10000   0.707107 2.44511e-09   0 0
+2 6   -1 -1   -1 -1   -1 -1   -1 -1   0 0   0.707107 2.44511e-09   0 0   0 0
diff --git a/yaml/test04.ref b/yaml/test04.ref
@@ -2,11 +2,11 @@
 7 1 1 10000 0
 1 0
 0 0
-0.707107 0
+0.707107 2.44511e-09
 0 0
-0.707107 0
+0.707107 2.44511e-09
 0 0
 0 0
-square_receiver 2 100   0 0   0 0   0 0   0 0   0 0   0 0   0.707107 0   0 0   0 0   0 0
-reflector 6 1 10000   0 0   0 0
-2 6   0 0   0 0   0 0   0 0   0 0   0.707107 0   0 0   0 0
+square_receiver 2 100   0 0   0 0   0 0   0 0   0 0   0 0   0.707107 2.44511e-09   0 0   0 0   0 0
+reflector 6 1 10000   0.707107 2.44511e-09   0 0
+2 6   0 0   0 0   0 0   0 0   0 0   0.707107 2.44511e-09   0 0   0 0
diff --git a/yaml/test05.ref b/yaml/test05.ref
@@ -8,5 +8,5 @@
 0 0
 0 0
 spherical_receiver 2 50.2403   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   1 0   0 0   0 0   0 0
-reflector 6 1 10000   0 0   0 0
+reflector 6 1 10000   1 0   0 0
 2 6   -1 -1   -1 -1   -1 -1   -1 -1   0 0   1 0   0 0   0 0
diff --git a/yaml/test06.ref b/yaml/test06.ref
@@ -2,11 +2,11 @@
 7 1 1 10000 0
 111.97 0
 0 0
-0.896295 0.000571234
+0.896777 0.000575378
 0 0
-100 0
+100 2.33602e-08
 0 0
 0 0
-reflector.ground.pivot.small_square 10 1   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   100 0   0 0   0 0   0 0
-reflector.ground.pivot.parabol 6 111.97 10000   0 0   0 0
-10 6   -1 -1   -1 -1   -1 -1   -1 -1   0 0   100 0   0 0   0 0
+reflector.ground.pivot.small_square 10 1   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   100 2.33602e-08   0 0   0 0   0 0
+reflector.ground.pivot.parabol 6 111.97 10000   0.896777 0.000575378   0 0
+10 6   -1 -1   -1 -1   -1 -1   -1 -1   0 0   100 2.33602e-08   0 0   0 0
diff --git a/yaml/test07.ref b/yaml/test07.ref
@@ -1,12 +1,12 @@
 #--- Sun direction: 0 90 (-6.12323e-17 -0 -1)
 7 1 1 10000 0
-56.3503 0
+56.3501 0
 0 0
-0.666607 0.00232391
+0.66742 0.00232559
 0 0
-28.093 0
+28.093 5.04637e-08
 0 0
 0 0
-square_receiver 2 100   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   28.093 0   0 0   0 0   0 0
-reflector 6 56.3503 10000   0 0   0 0
-2 6   -1 -1   -1 -1   -1 -1   -1 -1   0 0   28.093 0   0 0   0 0
+square_receiver 2 100   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   28.0902 0.00280916   0 0   0 0   0 0
+reflector 6 56.3501 10000   0.66742 0.00232559   0 0
+2 6   -1 -1   -1 -1   -1 -1   -1 -1   0 0   28.0902 0.00280916   0 0   0 0
diff --git a/yaml/test08.ref b/yaml/test08.ref
@@ -2,11 +2,11 @@
 7 1 1 10000 0
 85.5109 0
 0 0
-0.917875 0.000431307
+0.918392 0.000433033
 0 0
-78.4137 2.52319e-08
+78.4137 0
 0 0
 0 0
-reflector.pivot.small_square 6 1   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   78.4137 2.52319e-08   0 0   0 0   0 0
-reflector.pivot.parabol 2 85.5109 10000   0 0   0 0
-6 2   -1 -1   -1 -1   -1 -1   -1 -1   0 0   78.4137 2.52319e-08   0 0   0 0
+reflector.pivot.small_square 6 1   -1 -1   -1 -1   -1 -1   -1 -1   -1 -1   0 0   78.4137 0   0 0   0 0   0 0
+reflector.pivot.parabol 2 85.5109 10000   0.918392 0.000433033   0 0
+6 2   -1 -1   -1 -1   -1 -1   -1 -1   0 0   78.4137 0   0 0   0 0