commit 620a4b879258ab2294bd04ec7baf32974790d089
parent 9311acd3891974d2406a6bff4798cab5d67291c7
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 21 Oct 2021 16:04:13 +0200
Merge branch 'release_0.3'
Diffstat:
5 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/README.md b/README.md
@@ -24,9 +24,13 @@ variable the install directories of its dependencies.
## Release notes
+### Version 0.3
+
+Manage fileformat updates introduced by Stardis 0.7.
+
### Version 0.2.1
-- Fix a bug that could cause a crash.
+Fix a bug that could cause a crash.
### Version 0.2
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -41,8 +41,8 @@ configure_file(${GREEN_SOURCE_DIR}/../doc/sgreen.1.txt.in
${CMAKE_CURRENT_BINARY_DIR}/doc/sgreen.1.txt @ONLY)
set(GREEN_VERSION_MAJOR 0)
-set(GREEN_VERSION_MINOR 2)
-set(GREEN_VERSION_PATCH 1)
+set(GREEN_VERSION_MINOR 3)
+set(GREEN_VERSION_PATCH 0)
set(GREEN_VERSION ${GREEN_VERSION_MAJOR}.${GREEN_VERSION_MINOR}.${GREEN_VERSION_PATCH})
configure_file(${GREEN_SOURCE_DIR}/green-default.h.in
diff --git a/src/green-input.c b/src/green-input.c
@@ -65,7 +65,7 @@ read_green_function
unsigned i;
char* pool_ptr;
const char expected_green_string[] = "GREEN_BIN_FILE:";
- const unsigned expected_file_fmt_version = 2;
+ const unsigned expected_file_fmt_version = 3;
char green_string[sizeof(expected_green_string)];
unsigned file_fmt_version;
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:
