solstice

commit f071bbfb90a78a8b198878749d190cee5da28d3b
parent 55f0406d0bf9cf55b9f40ba53bfe2903c3fb3465
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Mon, 13 Mar 2017 18:09:55 +0100

Change receiver efficiency definition (now using absorbed irradiance).

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

7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/solstice_solve.c b/src/solstice_solve.c
@@ -73,21 +73,21 @@ write_global_mc(struct solstice* solstice, struct ssol_estimator* estimator)
     switch(rcv->side) {
       case SRCVL_FRONT:
         SSOL(estimator_get_mc_receiver(estimator, inst, SSOL_FRONT, &front));
-        f_eff_E = front.integrated_irradiance.E * irradiance_factor;
-        f_eff_SE = front.integrated_irradiance.SE * irradiance_factor;
+        f_eff_E = front.integrated_absorbed_irradiance.E * irradiance_factor;
+        f_eff_SE = front.integrated_absorbed_irradiance.SE * irradiance_factor;
         break;
       case SRCVL_BACK:
         SSOL(estimator_get_mc_receiver(estimator, inst, SSOL_BACK, &back));
-        b_eff_E = back.integrated_irradiance.E * irradiance_factor;
-        b_eff_SE = back.integrated_irradiance.SE * irradiance_factor;
+        b_eff_E = back.integrated_absorbed_irradiance.E * irradiance_factor;
+        b_eff_SE = back.integrated_absorbed_irradiance.SE * irradiance_factor;
         break;
       case SRCVL_FRONT_AND_BACK:
         SSOL(estimator_get_mc_receiver(estimator, inst, SSOL_FRONT, &front));
         SSOL(estimator_get_mc_receiver(estimator, inst, SSOL_BACK, &back));
-        f_eff_E = front.integrated_irradiance.E * irradiance_factor;
-        f_eff_SE = front.integrated_irradiance.SE * irradiance_factor;
-        b_eff_E = back.integrated_irradiance.E * irradiance_factor;
-        b_eff_SE = back.integrated_irradiance.SE * irradiance_factor;
+        f_eff_E = front.integrated_absorbed_irradiance.E * irradiance_factor;
+        f_eff_SE = front.integrated_absorbed_irradiance.SE * irradiance_factor;
+        b_eff_E = back.integrated_absorbed_irradiance.E * irradiance_factor;
+        b_eff_SE = back.integrated_absorbed_irradiance.SE * irradiance_factor;
         break;
       default: FATAL("Unreachable code.\n"); break;
     }
diff --git a/yaml/beam_down.ref b/yaml/beam_down.ref
@@ -3,12 +3,12 @@
 0 0 # Shadowing
 0 0 # Missing
 0.92387953251128675612818318939679 0.1 # Cos
-tower.secondary.hyperbol 10   FRONT: 465.464 0.00509812   465.464 0.00509812   0 0   0 0   0.930847 1.01954e-05   BACK: 0 0   0 0   0 0   0 0   0 0
+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.930847 1.01954e-05   BACK: -1 -1   -1 -1   -1 -1   -1 -1   -1 -1
 #--- Sun direction: 50 50 (-0.413176 -0.492404 -0.766044)
 2 10000
 0 0 # Shadowing
 0 0 # Missing
 0.8 0.1 # Cos
-tower.secondary.hyperbol 10   FRONT: 400.231 0.107226   400.231 0.107226   0 0   0 0   0.800393 0.000214433   BACK: 0 0   0 0   0 0   0 0   0 0
+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
diff --git a/yaml/test01.ref b/yaml/test01.ref
@@ -3,4 +3,4 @@
 0 0 # Shadowing
 0 0 # Missing
 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   1 0
+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
diff --git a/yaml/test02.ref b/yaml/test02.ref
@@ -3,4 +3,4 @@
 0 0 # Shadowing
 99 0.0313065 # Missing
 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.01003 0.000315109
+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
diff --git a/yaml/test03.ref b/yaml/test03.ref
@@ -3,4 +3,4 @@
 0 0 # Shadowing
 0 0 # Missing
 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.707107 0
+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
diff --git a/yaml/test04.ref b/yaml/test04.ref
@@ -3,4 +3,4 @@
 0 0 # Shadowing
 0 0 # Missing
 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.707107 0
+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
diff --git a/yaml/test05.ref b/yaml/test05.ref
@@ -3,4 +3,4 @@
 0 0 # Shadowing
 0 0 # Missing
 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   1 0
+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