stardis

commit 35110420bc1943be37e0e63180b5279ea6528e5e
parent aa5fb217a7a0ec260ca27699fafddcf35def0423
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Sat, 12 Sep 2020 14:09:21 +0200

Add media imposed temperature in ascii green output

Diffstat:
M
doc/stardis-output.5.txt
 | 
9
++++++---
M
src/stardis-output.c
 | 
19
+++++++++++++++----

2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/doc/stardis-output.5.txt b/doc/stardis-output.5.txt
@@ -380,9 +380,9 @@ _______
 
 <sample>            ::= <end-spec> <power-count> <flux-count> <power-terms> <flux-terms>
 
-<solid>             ::= <green-id> <name> <lambda> <rho> <cp> <power>
+<solid>             ::= <green-id> <name> <lambda> <rho> <cp> <power> <imposed-temp>
 
-<fluid>             ::= <green-id> <name> <rho> <cp>
+<fluid>             ::= <green-id> <name> <rho> <cp> <imposed-temp>
 
 <t-bound>           ::= <green-id> <name> <temperature>
 
@@ -403,6 +403,9 @@ _______
 
 <power>             ::= REAL # in (-INF , INF)
 
+<imposed-temp>      ::= REAL # in [0 , INF)
+                      | "NONE" if not imposed
+
 <temperature>       ::= REAL # in [0, INF)
 
 <emissivity>        ::= REAL # in [0, 1]
@@ -411,7 +414,7 @@ _______
 
 <hc>                ::= REAL # in [0, INF)
 
-<flux>              ::= REAL # in (-INF , INF)
+<flux>              ::= REAL # in (-INF, INF)
 
 <ambient-temp>      ::= REAL # in [0, INF)
 
diff --git a/src/stardis-output.c b/src/stardis-output.c
@@ -721,8 +721,14 @@ dump_green_ascii
       const struct solid* sl;
       if(desc->type != DESC_MAT_SOLID) continue;
       sl = &desc->d.solid;
-      fprintf(stream, "%u\t%s\t%g\t%g\t%g\t%g\n",
-        i, str_cget(&sl->name), sl->lambda, sl->rho, sl->cp, sl->vpower);
+      if(sl->imposed_temperature >= 0) {
+        fprintf(stream, "%u\t%s\t%g\t%g\t%g\t%g\t%g\n",
+          i, str_cget(&sl->name), sl->lambda, sl->rho, sl->cp, sl->vpower,
+          sl->imposed_temperature);
+      } else {
+        fprintf(stream, "%u\t%s\t%g\t%g\t%g\t%g\tNONE\n",
+          i, str_cget(&sl->name), sl->lambda, sl->rho, sl->cp, sl->vpower);
+      }
     }
   }
   if(stardis->counts.fmed_count) {
@@ -733,8 +739,13 @@ dump_green_ascii
       const struct fluid* fl;
       if(desc->type != DESC_MAT_FLUID) continue;
       fl = &desc->d.fluid;
-      fprintf(stream, "%u\t%s\t%g\t%g\n",
-        i, str_cget(&fl->name), fl->rho, fl->cp);
+      if(fl->imposed_temperature >= 0) {
+        fprintf(stream, "%u\t%s\t%g\t%g\t%g\n",
+          i, str_cget(&fl->name), fl->rho, fl->cp, fl->imposed_temperature);
+      } else {
+        fprintf(stream, "%u\t%s\t%g\t%g\tNONE\n",
+          i, str_cget(&fl->name), fl->rho, fl->cp);
+      }
     }
   }