solstice

commit 7249782799b6b650685d3423a5c955c31ed9a0f6
parent 24e07fad3001124806080eb9f62137aeb34935ca
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Mon, 13 Mar 2017 10:16:11 +0100

Removed per-receiver cos output (was removed solver-side).

Diffstat:
M
src/solstice_solve.c
 | 
4
+---
M
src/test_solstice_simulation.c
 | 
6
+-----
M
yaml/beam_down.ref
 | 
8
++++----
M
yaml/test01.ref
 | 
2
+-
M
yaml/test02.ref
 | 
2
+-
M
yaml/test03.ref
 | 
2
+-
M
yaml/test04.ref
 | 
3
++-
M
yaml/test05.ref
 | 
2
+-

8 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/solstice_solve.c b/src/solstice_solve.c
@@ -86,7 +86,7 @@ write_global_mc(struct solstice* solstice, struct ssol_estimator* estimator)
     }
     SSOL(instance_get_id(inst, &id));
     fprintf(solstice->output,
-      "%s %u   %g %g %g %g   %g %g %g %g   %g %g %g %g   %g %g %g %g   %g %g %g %g\n",
+      "%s %u   %g %g %g %g   %g %g %g %g   %g %g %g %g   %g %g %g %g\n",
       str_cget(name), (unsigned) id,
       front.integrated_irradiance.E, front.integrated_irradiance.SE,
       back.integrated_irradiance.E, back.integrated_irradiance.SE,
@@ -94,8 +94,6 @@ write_global_mc(struct solstice* solstice, struct ssol_estimator* estimator)
       back.reflectivity_loss.E, back.reflectivity_loss.SE,
       front.absorptivity_loss.E, front.absorptivity_loss.SE,
       back.absorptivity_loss.E, back.absorptivity_loss.SE,
-      front.cos_loss.E, front.cos_loss.SE,
-      back.cos_loss.E, back.cos_loss.SE,
       f_eff_E, f_eff_SE, b_eff_E, b_eff_SE);
   }
 
diff --git a/src/test_solstice_simulation.c b/src/test_solstice_simulation.c
@@ -144,8 +144,6 @@ enum result_type {
   BACK_REFLECTIVITY_LOSS,
   FRONT_ABSORPTIVITY_LOSS,
   BACK_ABSORPTIVITY_LOSS,
-  FRONT_COS_LOSS,
-  BACK_COS_LOSS,
   FRONT_EFFICIENCY,
   BACK_EFFICIENCY,
   MAX_RESULTS_COUNT__
@@ -206,7 +204,7 @@ read_recv(const char* line, char name[], double E[], double SE[])
   NCHECK(SE, NULL);
 
   n = sscanf(line,
-    "%s%*u%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg",
+    "%s%*u%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg%lg",
      name,
      &E[FRONT_INTEGRATED_IRRADIANCE], &SE[FRONT_INTEGRATED_IRRADIANCE],
      &E[BACK_INTEGRATED_IRRADIANCE], &SE[BACK_INTEGRATED_IRRADIANCE],
@@ -214,8 +212,6 @@ read_recv(const char* line, char name[], double E[], double SE[])
      &E[BACK_REFLECTIVITY_LOSS], &SE[BACK_REFLECTIVITY_LOSS],
      &E[FRONT_ABSORPTIVITY_LOSS], &SE[FRONT_ABSORPTIVITY_LOSS],
      &E[BACK_ABSORPTIVITY_LOSS], &SE[BACK_ABSORPTIVITY_LOSS],
-     &E[FRONT_COS_LOSS], &SE[FRONT_COS_LOSS],
-     &E[BACK_COS_LOSS], &SE[BACK_COS_LOSS],
      &E[FRONT_EFFICIENCY], &SE[FRONT_EFFICIENCY],
      &E[BACK_EFFICIENCY], &SE[BACK_EFFICIENCY]);
 
diff --git a/yaml/beam_down.ref b/yaml/beam_down.ref
@@ -1,12 +1,12 @@
 #--- Sun direction: 0 90 (-3.7494e-33 -6.12323e-17 -1)
 2 10000
-tower.secondary.hyperbol 10   465.464 0.00509812 0 0   0 0 0 0   0 0 0 0   34.5362 0.00509812 0 0   0.930847 1.01954e-05 0 0
-tower.receptor 14   465.464 0.00509812 -1 -1   0 0 -1 -1   0 0 -1 -1   34.5362 0.00509812 -1 -1   0.930847 1.01954e-05 -1 -1
+tower.secondary.hyperbol 10   465.464 0.00509812 0 0   0 0 0 0   0 0 0 0   0.930847 1.01954e-05 0 0
+tower.receptor 14   465.464 0.00509812 -1 -1   0 0 -1 -1   0 0 -1 -1   0.930847 1.01954e-05 -1 -1
 0 0
 0 0
 #--- Sun direction: 50 50 (-0.413176 -0.492404 -0.766044)
 2 10000
-tower.secondary.hyperbol 10   400.231 0.107226 0 0   0 0 0 0   0 0 0 0   99.7686 0.107226 0 0   0.800393 0.000214433 0 0
-tower.receptor 14   136.51 1.90718 -1 -1   0 0 -1 -1   0 0 -1 -1   32.9896 0.464742 -1 -1   0.272997 0.00381404 -1 -1
+tower.secondary.hyperbol 10   400.231 0.107226 0 0   0 0 0 0   0 0 0 0   0.800393 0.000214433 0 0
+tower.receptor 14   136.51 1.90718 -1 -1   0 0 -1 -1   0 0 -1 -1   0.272997 0.00381404 -1 -1
 0 0
 0 0
diff --git a/yaml/test01.ref b/yaml/test01.ref
@@ -1,5 +1,5 @@
 #--- Sun direction: 0 90 (-6.12323e-17 -0 -1)
 1 10000
-square_receiver 2   -1 -1 1 0   -1 -1 0 0   -1 -1 0 0   -1 -1 0 0   -1 -1 1 0
+square_receiver 2   -1 -1 1 0   -1 -1 0 0   -1 -1 0 0   -1 -1 1 0
 0 0
 0 0
diff --git a/yaml/test02.ref b/yaml/test02.ref
@@ -1,5 +1,5 @@
 #--- Sun direction: 0 90 (-6.12323e-17 -0 -1)
 1 100000
-square_receiver 2   -1 -1 1 0.0313065   -1 -1 0 0   -1 -1 0 0   -1 -1 0 0   -1 -1 0.01003 0.000315109
+square_receiver 2   -1 -1 1 0.0313065   -1 -1 0 0   -1 -1 0 0   -1 -1 0.01003 0.000315109
 0 0
 99 0.0313065
diff --git a/yaml/test03.ref b/yaml/test03.ref
@@ -1,5 +1,5 @@
 #--- Sun direction: 0 45 (-0.707107 -0 -0.707107)
 1 10000
-square_receiver 2   -1 -1 0.707107 0   -1 -1 0 0   -1 -1 0 0   -1 -1 0.292893 0   -1 -1 0.707107 0
+square_receiver 2   -1 -1 0.707107 0   -1 -1 0 0   -1 -1 0 0   -1 -1 0.707107 0
 0 0
 0 0
diff --git a/yaml/test04.ref b/yaml/test04.ref
@@ -1,4 +1,5 @@
 #--- Sun direction: 0 45 (-0.707107 -0 -0.707107)
 1 10000
-square_receiver 2   0 0 0.707107 0   0 0 0 0   0 0 0 0   0 0 0.292893 0   0 0 0.707107 0
+square_receiver 2   0 0 0.707107 0   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
@@ -1,5 +1,5 @@
 #--- Sun direction: 0 90 (-6.12323e-17 -0 -1)
 1 10000
-spherical_receiver 2   -1 -1 1 0   -1 -1 0 0   -1 -1 0 0   -1 -1 0 0   -1 -1 1 0
+spherical_receiver 2   -1 -1 1 0   -1 -1 0 0   -1 -1 0 0   -1 -1 1 0
 0 0
 0 0