commit 43c357521c14d3377d880bdc93aff8cd3bcc208d
parent e9ab4e881a78d4992fe23000adb968355f6648e1
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Thu, 27 Apr 2017 15:04:32 +0200
Remove decorative words from output.
That is FRONT and BACK delimiters.
Diffstat:
11 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/solstice_solve.c b/src/solstice_solve.c
@@ -102,8 +102,8 @@ write_mc_global(struct solstice* solstice, struct ssol_estimator* estimator)
SSOL(instance_get_area(inst, &area));
fprintf(solstice->output,
"%s %u %g "
- "FRONT: %g %g %g %g %g %g %g %g %g %g "
- "BACK: %g %g %g %g %g %g %g %g %g %g\n",
+ "%g %g %g %g %g %g %g %g %g %g "
+ "%g %g %g %g %g %g %g %g %g %g\n",
str_cget(name), (unsigned)id, area,
front.integrated_absorbed_irradiance.E, front.integrated_absorbed_irradiance.SE,
front.integrated_irradiance.E, front.integrated_irradiance.SE,
@@ -176,8 +176,8 @@ write_mc_global(struct solstice* solstice, struct ssol_estimator* estimator)
}
fprintf(solstice->output,
"%u %u "
- "FRONT: %g %g %g %g %g %g %g %g "
- "BACK: %g %g %g %g %g %g %g %g\n",
+ "%g %g %g %g %g %g %g %g "
+ "%g %g %g %g %g %g %g %g\n",
(unsigned) rcv_id, (unsigned) prim_id,
front.integrated_absorbed_irradiance.E, front.integrated_absorbed_irradiance.SE,
front.integrated_irradiance.E, front.integrated_irradiance.SE,
diff --git a/src/test_solstice_simulation.c b/src/test_solstice_simulation.c
@@ -262,8 +262,8 @@ read_recv(FILE* file, char name[], double E[], double SE[])
CHECK(
sscanf(line,
"%s %*u %*g "
- "FRONT: %lg %lg %lg %lg %lg %lg %lg %lg %lg %lg "
- " BACK: %lg %lg %lg %lg %lg %lg %lg %lg %lg %lg",
+ "%lg %lg %lg %lg %lg %lg %lg %lg %lg %lg "
+ "%lg %lg %lg %lg %lg %lg %lg %lg %lg %lg",
name, /* ID, area */
&E[FRONT_INTEGRATED_ABSORBED_IRRADIANCE],
&SE[FRONT_INTEGRATED_ABSORBED_IRRADIANCE],
@@ -296,7 +296,7 @@ read_primary
CHECK(
sscanf(line,
"%s %*u "
- "%lg %*u %lg "
+ "%lg %*lu %lg "
"%lg %lg\n",
name, /* ID */
area, /* count, */ cos,
@@ -324,8 +324,8 @@ read_recvXprim
CHECK(
sscanf(line,
"%lu %lu "
- "FRONT: %lg %lg %lg %lg %lg %lg %lg %lg "
- " BACK: %lg %lg %lg %lg %lg %lg %lg %lg",
+ "%lg %lg %lg %lg %lg %lg %lg %lg "
+ "%lg %lg %lg %lg %lg %lg %lg %lg",
rcv_id, prim_id,
&E[FRONT_INTEGRATED_ABSORBED_IRRADIANCE],
&SE[FRONT_INTEGRATED_ABSORBED_IRRADIANCE],
diff --git a/yaml/beam_down.ref b/yaml/beam_down.ref
@@ -7,23 +7,23 @@
0 0
0 0
0 0
-tower.secondary.hyperbol 10 421.957 FRONT: 0 0 465.46 0.0057839 0 0 0 0 0 0 BACK: 0 0 0 0 0 0 0 0 0 0
-tower.receptor 14 25 FRONT: 465.46 0.0057839 465.46 0.0057839 0 0 0 0 0.93084 1.15668e-05 BACK: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+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 FRONT: 0 0 92.7742 0.588324 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 30 FRONT: 0 0 93.2842 0.588736 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 22 FRONT: 0 0 92.8029 0.588432 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 26 FRONT: 0 0 93.4242 0.589876 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 34 FRONT: 0 0 93.1748 0.588486 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-14 6 FRONT: 92.7742 0.588324 92.7742 0.588324 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 30 FRONT: 93.2842 0.588736 93.2842 0.588736 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 22 FRONT: 92.8029 0.588432 92.8029 0.588432 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 26 FRONT: 93.4242 0.589876 93.4242 0.589876 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 34 FRONT: 93.1748 0.588486 93.1748 0.588486 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+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
#--- Sun direction: 50 50 (-0.413176 -0.492404 -0.766044)
7 2 5 100000 0
500.043 0
@@ -33,20 +33,20 @@ heliostat1.temp-heliostat150.pivot.reflector 34 100.009 20044 0 0 0 0
245.21 0.615008
0 0
0 0
-tower.secondary.hyperbol 10 421.957 FRONT: 0 0 400.167 0.0352796 0 0 0 0 0 0 BACK: 0 0 0 0 0 0 0 0 0 0
-tower.receptor 14 25 FRONT: 135.852 0.602426 135.852 0.602426 0 0 0 0 0.271681 0.00120475 BACK: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+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 FRONT: 0 0 78.903 0.497568 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 30 FRONT: 0 0 77.0867 0.487147 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 22 FRONT: 0 0 79.1052 0.503835 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 26 FRONT: 0 0 81.4942 0.515816 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-10 34 FRONT: 0 0 83.5784 0.526554 0 0 0 0 BACK: 0 0 0 0 0 0 0 0
-14 6 FRONT: 22.1799 0.286704 22.1799 0.286704 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 30 FRONT: 18.6614 0.26147 18.6614 0.26147 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 22 FRONT: 25.3271 0.308097 25.3271 0.308097 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 26 FRONT: 31.6777 0.345324 31.6777 0.345324 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
-14 34 FRONT: 38.0063 0.378737 38.0063 0.378737 0 0 0 0 BACK: -1 -1 -1 -1 -1 -1 -1 -1
+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
diff --git a/yaml/test01.ref b/yaml/test01.ref
@@ -7,6 +7,6 @@
1 0
0 0
0 0
-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
+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
-2 6 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0 0 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
@@ -7,6 +7,6 @@
99.04 0.0975082
0 0
0 0
-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
+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 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0.96 0.0975082 0.96 0.0975082 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
diff --git a/yaml/test03.ref b/yaml/test03.ref
@@ -7,6 +7,6 @@
0.707107 0
0 0
0 0
-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
+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 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 0.707107 0 0 0 0 0
+2 6 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0.707107 0 0 0 0 0
diff --git a/yaml/test04.ref b/yaml/test04.ref
@@ -7,6 +7,6 @@
0.707107 0
0 0
0 0
-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
+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 FRONT: 0 0 0 0 0 0 0 0 BACK: 0 0 0.707107 0 0 0 0 0
+2 6 0 0 0 0 0 0 0 0 0 0 0.707107 0 0 0 0 0
diff --git a/yaml/test05.ref b/yaml/test05.ref
@@ -7,6 +7,6 @@
1 0
0 0
0 0
-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
+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
-2 6 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 1 0 0 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
@@ -7,6 +7,6 @@
100 0
0 0
0 0
-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.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 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 100 0 0 0 0 0
+10 6 -1 -1 -1 -1 -1 -1 -1 -1 0 0 100 0 0 0 0 0
diff --git a/yaml/test07.ref b/yaml/test07.ref
@@ -7,6 +7,6 @@
28.093 0
0 0
0 0
-square_receiver 2 100 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 28.093 0 0 0 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 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 28.093 0 0 0 0 0
+2 6 -1 -1 -1 -1 -1 -1 -1 -1 0 0 28.093 0 0 0 0 0
diff --git a/yaml/test08.ref b/yaml/test08.ref
@@ -7,6 +7,6 @@
78.4137 2.52319e-08
0 0
0 0
-reflector.pivot.small_square 6 1 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 78.4137 2.52319e-08 0 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 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 78.4137 2.52319e-08 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
