commit fdb3772c72c56294c6fae3324f854ab120078108
parent e0d3c20f5dc530fad492f312e14779d4a800e139
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Thu, 21 Oct 2021 11:34:02 +0200
Changes required after T_BOUNDARY_FOR_FLUID removal from stardis (that changed output format)
Diffstat:
2 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/src/green-output.c b/src/green-output.c
@@ -424,35 +424,6 @@ dump_green_info
}
if(local_count) fprintf(stream, "</table>\n");
- local_count = 0;
- FOR_EACH(i, 0, green->counts.desc_count) {
- const struct description* desc = green->descriptions + i;
- const struct t_boundary* bd;
- if(desc->type != DESC_BOUND_T_FOR_FLUID) continue;
- if(!local_count) {
- fprintf(stream, "<h2>T boundaries for fluids</h2>\n");
- fprintf(stream, "<table>\n");
- fprintf(stream, "<tr>\n");
- fprintf(stream, " <th>Name</th>\n");
- fprintf(stream, " <th>Temperature</th>\n");
- fprintf(stream, " <th>Emissivity</th>\n");
- fprintf(stream, " <th>Specular Fraction</th>\n");
- fprintf(stream, " <th>Hc</th>\n");
- fprintf(stream, "</tr>\n");
- }
- bd = &desc->d.t_boundary;
- fprintf(stream, "<tr>\n");
- CELL(s, str_cget(&bd->name));
- ASSERT(green->table[i].imposed_T_defined);
- VAR_CELL(i, imposed_T);
- CELL(g, bd->emissivity);
- CELL(g, bd->specular_fraction);
- CELL(g, bd->hc);
- fprintf(stream, "</tr>\n");
- local_count++;
- }
- if(local_count) fprintf(stream, "</table>\n");
-
/* H boundaries tables */
local_count = 0;
FOR_EACH(i, 0, green->counts.desc_count) {
diff --git a/src/green-types.h b/src/green-types.h
@@ -346,7 +346,6 @@ enum description_type {
DESC_MAT_FLUID,
DESC_BOUND_H_FOR_FLUID,
DESC_BOUND_H_FOR_SOLID,
- DESC_BOUND_T_FOR_FLUID,
DESC_BOUND_T_FOR_SOLID,
DESC_BOUND_F_FOR_SOLID,
DESC_SOLID_FLUID_CONNECT,
@@ -360,7 +359,7 @@ enum description_type {
#define DESC_IS_H(D) \
((D) == DESC_BOUND_H_FOR_SOLID || (D) == DESC_BOUND_H_FOR_FLUID)
#define DESC_IS_T(D) \
- ((D) == DESC_BOUND_T_FOR_SOLID || (D) == DESC_BOUND_T_FOR_FLUID)
+ ((D) == DESC_BOUND_T_FOR_SOLID)
#define DESC_IS_F(D) \
((D) == DESC_BOUND_F_FOR_SOLID)
#define DESC_IS_SF(D) \
@@ -412,9 +411,6 @@ struct h_boundary {
struct t_boundary {
struct str name;
- double emissivity;
- double specular_fraction;
- double hc;
double imposed_temperature;
unsigned mat_id;
};
@@ -466,7 +462,6 @@ get_description_name
*name = &desc->d.fluid.name;
break;
case DESC_BOUND_T_FOR_SOLID:
- case DESC_BOUND_T_FOR_FLUID:
*name = &desc->d.t_boundary.name;
break;
case DESC_BOUND_H_FOR_SOLID: