solstice-pp

commit 89900a93b626443d0d9c8c5e04160084db38b02a
parent 6aa480676efe20720260d382c1971767f153788a
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Fri, 15 Dec 2017 09:44:22 +0100

Fix the parsing of the "rcvXprim" results

The "back side" estimations were not parsed.

Diffstat:
M
Makefile
 | 
2
+-
M
solpp.h
 | 
14
+++++++++++++-

2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@
 include Makefile.in
 
 INSTALL_PATH = /usr/local/bin
-SOURCES = solpp.c solppraw.c solpaths.c solmaps.c
+SOURCES = solmaps.c solpp.c solppraw.c solpaths.c
 PROG = $(SOURCES:%.c=%)
 
 PROJECTS = themis cyl
diff --git a/solpp.h b/solpp.h
@@ -390,6 +390,8 @@ read_simulation(struct simul* simul, FILE* input)
       (line,
        "%zu %zu "
        "%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf "
+       "%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf "
+       "%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf "
        "%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf",
        &rcvXprim->rcv_id, &rcvXprim->prim_id,
        GET(FRONT, in.flux),
@@ -401,7 +403,17 @@ read_simulation(struct simul* simul, FILE* input)
        GET(FRONT, abs.flux_no_mat_loss),
        GET(FRONT, abs.flux_no_atm_loss),
        GET(FRONT, abs.flux_mat_loss),
-       GET(FRONT, abs.flux_atm_loss)) == 22);
+       GET(FRONT, abs.flux_atm_loss),
+       GET(BACK, in.flux),
+       GET(BACK, in.flux_no_mat_loss),
+       GET(BACK, in.flux_no_atm_loss),
+       GET(BACK, in.flux_mat_loss),
+       GET(BACK, in.flux_atm_loss),
+       GET(BACK, abs.flux),
+       GET(BACK, abs.flux_no_mat_loss),
+       GET(BACK, abs.flux_no_atm_loss),
+       GET(BACK, abs.flux_mat_loss),
+       GET(BACK, abs.flux_atm_loss)) == 42);
     #undef GET
   }