commit c70b4ba330d4410aaabd205dae4d063885877884
parent 1e09a787bac75d492d38a26312bdd16346a0aa90
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Thu, 30 Mar 2017 18:08:44 +0200
Adapt to last solver changes on outputs.
Diffstat:
9 files changed, 106 insertions(+), 127 deletions(-)
diff --git a/src/test_solstice_simulation.c b/src/test_solstice_simulation.c
@@ -40,9 +40,12 @@ enum side {
enum global_result_type {
GLOBAL_POTENTIAL,
+ GLOBAL_ABSORBED,
+ GLOBAL_COS,
GLOBAL_SHADOW,
GLOBAL_MISSING,
- GLOBAL_COS,
+ GLOBAL_ATMOSPHERE,
+ GLOBAL_REFLECTIVITY,
GLOBAL_RESULTS_COUNT__
};
@@ -258,10 +261,10 @@ read_recv(FILE* file, char name[], double E[], double SE[])
CHECK(read_line(line, sizeof(line), file), 1);
CHECK(
sscanf(line,
- "%s %*lu "
+ "%s %*lu %*lg "
"FRONT: %lg %lg %lg %lg %lg %lg %lg %lg %lg %lg "
" BACK: %lg %lg %lg %lg %lg %lg %lg %lg %lg %lg",
- name, /* ID */
+ name, /* ID, area */
&E[FRONT_INTEGRATED_ABSORBED_IRRADIANCE],
&SE[FRONT_INTEGRATED_ABSORBED_IRRADIANCE],
&E[FRONT_INTEGRATED_IRRADIANCE], &SE[FRONT_INTEGRATED_IRRADIANCE],
diff --git a/yaml/beam_down.ref b/yaml/beam_down.ref
@@ -1,96 +1,52 @@
#--- Sun direction: 90 90 (-3.7494e-33 -6.12323e-17 -1)
-4 2 5 10000 0
-500 0 # Potential
+7 2 5 10000 0
+500.043 0 # Potential
+465.484 0.0183212 # Absorbed
+0.930883 3.66351e-05 # Cos
0 0 # Shadowing
0 0 # Missing
-0.92387953251128675612818318939679 0.1 # Cos
-tower.secondary.hyperbol 10 FRONT: 0 0 465.464 0.00509812 0 0 0 0 0 0 BACK: 0 0 0 0 0 0 0 0 0 0
-tower.receptor 14 FRONT: 465.464 0.00509812 465.464 0.00509812 0 0 0 0 0.930928 1.01962e-05 BACK: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
-heliostat4.temp-heliostat150.pivot.reflector 6 100.009 0.931729 1999 0 0
-heliostat5.temp-heliostat150.pivot.reflector 30 100.009 0.929682 1986 0 0
-heliostat3.temp-heliostat150.pivot.reflector 22 100.009 0.931826 1997 0 0
-heliostat2.temp-heliostat150.pivot.reflector 26 100.009 0.931729 1994 0 0
-heliostat1.temp-heliostat150.pivot.reflector 34 100.009 0.929682 2024 0 0
-10 6 FRONT: 0 0 93.1263 1.86311 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 30 FRONT: 0 0 92.3174 1.85447 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 22 FRONT: 0 0 93.0428 1.8626 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 26 FRONT: 0 0 92.8934 1.86136 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 34 FRONT: 0 0 94.0838 1.86768 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-14 6 FRONT: 93.1263 1.86311 93.1263 1.86311 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 30 FRONT: 92.3174 1.85447 92.3174 1.85447 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 22 FRONT: 93.0428 1.8626 93.0428 1.8626 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 26 FRONT: 92.8934 1.86136 92.8934 1.86136 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 34 FRONT: 94.0838 1.86768 94.0838 1.86768 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-
-
-#--- Sun direction: 90 90 (-3.7494e-33 -6.12323e-17 -1)
-4 2 5 10000 0
-500 0 # Potential
-0 0 # Shadowing
-0 0 # Missing
-0.930928 1.01962e-05 # Cos
-tower.secondary.hyperbol 10 FRONT: 0 0 465.464 0.00509812 0 0 0 0 0 0 BACK: 0 0 0 0 0 0 0 0 0 0
-tower.receptor 14 FRONT: 465.464 0.00509812 465.464 0.00509812 0 0 0 0 0.930928 1.01962e-05 BACK: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
-heliostat4.temp-heliostat150.pivot.reflector 6 100.009 0.931729 1999 0 0
-heliostat5.temp-heliostat150.pivot.reflector 30 100.009 0.929682 1986 0 0
-heliostat3.temp-heliostat150.pivot.reflector 22 100.009 0.931826 1997 0 0
-heliostat2.temp-heliostat150.pivot.reflector 26 100.009 0.931729 1994 0 0
-heliostat1.temp-heliostat150.pivot.reflector 34 100.009 0.929682 2024 0 0
-10 6 FRONT: 0 0 93.1263 1.86311 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 30 FRONT: 0 0 92.3174 1.85447 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 22 FRONT: 0 0 93.0428 1.8626 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 26 FRONT: 0 0 92.8934 1.86136 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 34 FRONT: 0 0 94.0838 1.86768 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-14 6 FRONT: 93.1263 1.86311 93.1263 1.86311 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 30 FRONT: 92.3174 1.85447 92.3174 1.85447 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 22 FRONT: 93.0428 1.8626 93.0428 1.8626 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 26 FRONT: 92.8934 1.86136 92.8934 1.86136 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 34 FRONT: 94.0838 1.86768 94.0838 1.86768 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-
+0 0 # Atmosphere
+0 0 # Reflectivity
+tower.secondary.hyperbol 10 421.957 FRONT: 0 0 465.484 0.0183212 0 0 0 0 0 0 BACK: 0 0 0 0 0 0 0 0 0 0
+tower.receptor 14 25 FRONT: 465.484 0.0183212 465.484 0.0183212 0 0 0 0 0.930888 3.66392e-05 BACK: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+heliostat4.temp-heliostat150.pivot.reflector 6 100.009 1999 0 0 0 0
+heliostat5.temp-heliostat150.pivot.reflector 30 100.009 1986 0 0 0 0
+heliostat3.temp-heliostat150.pivot.reflector 22 100.009 1997 0 0 0 0
+heliostat2.temp-heliostat150.pivot.reflector 26 100.009 1994 0 0 0 0
+heliostat1.temp-heliostat150.pivot.reflector 34 100.009 2024 0 0 0 0
+10 6 FRONT: 0 0 93.126 1.86312 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+10 30 FRONT: 0 0 92.325 1.85463 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+10 22 FRONT: 0 0 93.051 1.86278 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+10 26 FRONT: 0 0 92.8912 1.86133 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+10 34 FRONT: 0 0 94.0913 1.86784 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+14 6 FRONT: 93.126 1.86312 93.126 1.86312 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+14 30 FRONT: 92.325 1.85463 92.325 1.85463 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+14 22 FRONT: 93.051 1.86278 93.051 1.86278 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+14 26 FRONT: 92.8912 1.86133 92.8912 1.86133 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+14 34 FRONT: 94.0913 1.86784 94.0913 1.86784 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
#--- Sun direction: 50 50 (-0.413176 -0.492404 -0.766044)
-4 2 5 10000 0
-500 0 # Potential
+7 2 5 10000 0
+500.043 0 # Potential
+136.561 1.90791 # Absorbed
+0.80038 0.000222269 # Cos
0 0 # Shadowing
-0 0 # Missing
-0.8 0.1 # Cos
-tower.secondary.hyperbol 10 FRONT: 0 0 400.231 0.107226 0 0 0 0 0 0 BACK: 0 0 0 0 0 0 0 0 0 0
-tower.receptor 14 FRONT: 136.51 1.90718 136.51 1.90718 0 0 0 0 0.272997 0.00381404 BACK: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
-heliostat4.temp-heliostat150.pivot.reflector 6 100.009 0.78531 2045 0 0
-heliostat5.temp-heliostat150.pivot.reflector 30 100.009 0.769863 1956 0 0
-heliostat3.temp-heliostat150.pivot.reflector 22 100.009 0.799943 1948 0 0
-heliostat2.temp-heliostat150.pivot.reflector 26 100.009 0.815939 2049 0 0
-heliostat1.temp-heliostat150.pivot.reflector 34 100.009 0.830503 2002 0 0
-10 6 FRONT: 0 0 80.298 1.58372 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 30 FRONT: 0 0 75.2926 1.52688 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 22 FRONT: 0 0 77.9144 1.58407 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 26 FRONT: 0 0 83.593 1.64668 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 34 FRONT: 0 0 83.1334 1.66163 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-14 6 FRONT: 22.2243 0.907335 22.2243 0.907335 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 30 FRONT: 18.2843 0.818772 18.2843 0.818772 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 22 FRONT: 24.7182 0.963099 24.7182 0.963099 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 26 FRONT: 33.4127 1.1187 33.4127 1.1187 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 34 FRONT: 37.871 1.19548 37.871 1.19548 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-
-#--- Sun direction: 50 50 (-0.413176 -0.492404 -0.766044)
-4 2 5 10000 0
-500 0 # Potential
-0 0 # Shadowing
-0 0 # Missing
-0.800401 0.000214106 # Cos
-tower.secondary.hyperbol 10 FRONT: 0 0 400.201 0.107053 0 0 0 0 0 0 BACK: 0 0 0 0 0 0 0 0 0 0
-tower.receptor 14 FRONT: 139.122 1.91583 139.122 1.91583 0 0 0 0 0.278244 0.00383167 BACK: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
-heliostat4.temp-heliostat150.pivot.reflector 6 100.009 0.78531 2059 0 0
-heliostat5.temp-heliostat150.pivot.reflector 30 100.009 0.769863 1943 0 0
-heliostat3.temp-heliostat150.pivot.reflector 22 100.009 0.799943 2010 0 0
-heliostat2.temp-heliostat150.pivot.reflector 26 100.009 0.815939 1972 0 0
-heliostat1.temp-heliostat150.pivot.reflector 34 100.009 0.830503 2016 0 0
-10 6 FRONT: 0 0 80.8477 1.58773 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 30 FRONT: 0 0 74.7922 1.52302 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 22 FRONT: 0 0 80.3943 1.60288 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 26 FRONT: 0 0 80.4516 1.62325 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 34 FRONT: 0 0 83.7147 1.66597 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-14 6 FRONT: 23.0096 0.922247 23.0096 0.922247 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 30 FRONT: 18.6692 0.826911 18.6692 0.826911 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 22 FRONT: 25.6382 0.979654 25.6382 0.979654 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 26 FRONT: 32.1072 1.09854 32.1072 1.09854 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 34 FRONT: 39.6981 1.22101 39.6981 1.22101 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+244.012 1.94769 # Missing
+0 0 # Atmosphere
+0 0 # Reflectivity
+tower.secondary.hyperbol 10 421.957 FRONT: 0 0 400.227 0.111144 0 0 0 0 0 0 BACK: 0 0 0 0 0 0 0 0 0 0
+tower.receptor 14 25 FRONT: 136.561 1.90791 136.561 1.90791 0 0 0 0 0.273098 0.0038155 BACK: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+heliostat4.temp-heliostat150.pivot.reflector 6 100.009 2045 0 0 0 0
+heliostat5.temp-heliostat150.pivot.reflector 30 100.009 1956 0 0 0 0
+heliostat3.temp-heliostat150.pivot.reflector 22 100.009 1948 0 0 0 0
+heliostat2.temp-heliostat150.pivot.reflector 26 100.009 2049 0 0 0 0
+heliostat1.temp-heliostat150.pivot.reflector 34 100.009 2002 0 0 0 0
+10 6 FRONT: 0 0 80.2952 1.58372 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+10 30 FRONT: 0 0 75.2847 1.52678 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+10 22 FRONT: 0 0 77.9198 1.58423 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+10 26 FRONT: 0 0 83.5939 1.64675 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+10 34 FRONT: 0 0 83.1332 1.66167 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
+14 6 FRONT: 22.2344 0.907756 22.2344 0.907756 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+14 30 FRONT: 18.29 0.819036 18.29 0.819036 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+14 22 FRONT: 24.7238 0.963323 24.7238 0.963323 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+14 26 FRONT: 33.4259 1.11916 33.4259 1.11916 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+14 34 FRONT: 37.8866 1.19599 37.8866 1.19599 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
diff --git a/yaml/test01.ref b/yaml/test01.ref
@@ -1,9 +1,12 @@
#--- Sun direction: 0 90 (-6.12323e-17 -0 -1)
-4 1 1 10000 0
+7 1 1 10000 0
1 0 # Potential
-0 0 # Shadowing
-0 0 # Missing
+0 0 # Absorbed
1 0 # Cos
-square_receiver 2 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0 0 0 0 0 0 0
-reflector 6 1 1 10000 0 0
+0 0 # Shadowing
+1 0 # Missing
+0 0 # Atmosphere
+0 0 # Reflectivity
+square_receiver 2 100 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0 0 0 0 0 0 0
+reflector 6 1 10000 0 0 0 0
2 6 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0 0 0 0 0
diff --git a/yaml/test02.ref b/yaml/test02.ref
@@ -1,9 +1,12 @@
#--- Sun direction: 0 90 (-6.12323e-17 -0 -1)
-4 1 1 100000 0
+7 1 1 10000 0
100 0 # Potential
-0 0 # Shadowing
-99 0.0313065 # Missing
+0.96 0.0975082 # Absorbed
1 0 # Cos
-square_receiver 2 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0.0313065 0 0 0 0 0 0
-reflector 6 100 1 10000 0 0
-2 6 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0.0313065 0 0 0 0
+0 0 # Shadowing
+99.04 0.0975082 # Missing
+0 0 # Atmosphere
+0 0 # Reflectivity
+square_receiver 2 1 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 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 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0.96 0.0975082 0.96 0.0975082 0 0 0 0
diff --git a/yaml/test02.yaml b/yaml/test02.yaml
@@ -7,7 +7,9 @@
- geometry: &small_square
- - material: { virtual: }
+ - material:
+ front: { virtual: }
+ back: { matte: { reflectivity: 0 } }
plane:
clip:
- operation: AND
diff --git a/yaml/test03.ref b/yaml/test03.ref
@@ -1,9 +1,12 @@
#--- Sun direction: 0 45 (-0.707107 -0 -0.707107)
-4 1 1 10000 0
+7 1 1 10000 0
1 0 # Potential
-0 0 # Shadowing
-0 0 # Missing
+0 0 # Absorbed
0.707107 0 # Cos
-square_receiver 2 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 0.707107 0 0 0 0 0 0 0
-reflector 6 1 0.707107 10000 0 0
+0 0 # Shadowing
+0.707107 0 # Missing
+0 0 # Atmosphere
+0 0 # Reflectivity
+square_receiver 2 100 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 0.707107 0 0 0 0 0 0 0
+reflector 6 1 10000 0 0 0 0
2 6 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 0.707107 0 0 0 0 0
diff --git a/yaml/test04.ref b/yaml/test04.ref
@@ -1,9 +1,12 @@
#--- Sun direction: 0 45 (-0.707107 -0 -0.707107)
-4 1 1 10000 0
+7 1 1 10000 0
1 0 # Potential
-0 0 # Shadowing
-0 0 # Missing
+0 0 # Absorbed
0.707107 0 # Cos
-square_receiver 2 FRONT: 0 0 0 0 0 0 0 0 0 0 BACK: 0 0 0.707107 0 0 0 0 0 0 0
-reflector 6 1 0.707107 10000 0 0
+0 0 # Shadowing
+0.707107 0 # Missing
+0 0 # Atmosphere
+0 0 # Reflectivity
+square_receiver 2 100 FRONT: 0 0 0 0 0 0 0 0 0 0 BACK: 0 0 0.707107 0 0 0 0 0 0 0
+reflector 6 1 10000 0 0 0 0
2 6 FRONT: 0 0 0 0 0 0 0 0 BACK: 0 0 0.707107 0 0 0 0 0
diff --git a/yaml/test05.ref b/yaml/test05.ref
@@ -1,9 +1,12 @@
#--- Sun direction: 0 90 (-6.12323e-17 -0 -1)
-4 1 1 10000 0
+7 1 1 10000 0
1 0 # Potential
-0 0 # Shadowing
-0 0 # Missing
+0 0 # Absorbed
1 0 # Cos
-spherical_receiver 2 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0 0 0 0 0 0 0
-reflector 6 1 1 10000 0 0
+0 0 # Shadowing
+1 0 # Missing
+0 0 # Atmosphere
+0 0 # Reflectivity
+spherical_receiver 2 50.2403 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0 0 0 0 0 0 0
+reflector 6 1 10000 0 0 0 0
2 6 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0 0 0 0 0
diff --git a/yaml/test06.ref b/yaml/test06.ref
@@ -1,9 +1,12 @@
#--- Sun direction: 0 63 (-0.45399 -0 -0.891007)
-4 1 1 10000 0
-100 0 # Potential
+7 1 1 10000 0
+111.97 0 # Potential
+0 0 # Absorbed
+0.896295 0.000571234 # Cos
0 0 # Shadowing
-0 0 # Missing
-1 0 # Cos
-reflector.ground.pivot.small_square 10 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 100 0 0 0 0 0 0 0
-reflector.ground.pivot.parabol 6 111.97 1 10000 0 0
+100 0 # Missing
+0 0 # Atmosphere
+0 0 # Reflectivity
+reflector.ground.pivot.small_square 10 1 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 100 0 0 0 0 0 0 0
+reflector.ground.pivot.parabol 6 111.97 10000 0 0 0 0
10 6 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 100 0 0 0 0 0
