commit 806c14f4e28b2f73471c19e88d8b9fda4091d7d6
parent 00c7cadece23a06f59f3aa356b70c1275a080559
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 21 Oct 2021 15:55:06 +0200
Merge branch 'release_0.7.2'
Diffstat:
5 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
@@ -33,6 +33,11 @@ variable the install directories of its dependencies.
## Release notes
+### Version 0.7.2
+
+Fix the binary file format of the green function: the fileformat has been
+updated without incrementing the version of the serialised data.
+
### Version 0.7.1
Fix debug build.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -56,7 +56,7 @@ configure_file(${SDIS_SOURCE_DIR}/../doc/stardis.1.txt.in
set(SDIS_VERSION_MAJOR 0)
set(SDIS_VERSION_MINOR 7)
-set(SDIS_VERSION_PATCH 1)
+set(SDIS_VERSION_PATCH 2)
set(SDIS_VERSION ${SDIS_VERSION_MAJOR}.${SDIS_VERSION_MINOR}.${SDIS_VERSION_PATCH})
configure_file(${SDIS_SOURCE_DIR}/stardis-default.h.in
diff --git a/doc/stardis-output.5.txt b/doc/stardis-output.5.txt
@@ -693,25 +693,22 @@ _______
| "4" # H_BOUNDARY_FOR_SOLID between 2 defined media
| "5" # H_BOUNDARY_FOR_SOLID between 2 undefined media
| "6" # H_BOUNDARY_FOR_SOLID enclosing a fluid
- | "7" # T_BOUNDARY_FOR_FLUID between 2 defined media
- | "8" # T_BOUNDARY_FOR_FLUID between 2 undefined media
- | "9" # T_BOUNDARY_FOR_FLUID enclosing a solid
- | "10" # T_BOUNDARY_FOR_SOLID between 2 defined media
- | "11" # T_BOUNDARY_FOR_SOLID between 2 undefined media
- | "12" # T_BOUNDARY_FOR_SOLID enclosing a fluid
- | "13" # F_BOUNDARY_FOR_FLUID between 2 defined media
- | "14" # F_BOUNDARY_FOR_FLUID between 2 undefined media
- | "15" # F_BOUNDARY_FOR_SOLID enclosing a fluid
- | "16" # SOLID_FLUID_CONNECTION between 2 solids
- | "17" # SOLID_FLUID_CONNECTION between 2 fluids
- | "18" # SOLID_FLUID_CONNECTION used as boundary
- | "19" # SOLID_FLUID_CONNECTION between 2 undefined
+ | "7" # T_BOUNDARY_FOR_SOLID between 2 defined media
+ | "8" # T_BOUNDARY_FOR_SOLID between 2 undefined media
+ | "9" # T_BOUNDARY_FOR_SOLID enclosing a fluid
+ | "10" # F_BOUNDARY_FOR_FLUID between 2 defined media
+ | "11" # F_BOUNDARY_FOR_FLUID between 2 undefined media
+ | "12" # F_BOUNDARY_FOR_SOLID enclosing a fluid
+ | "13" # SOLID_FLUID_CONNECTION between 2 solids
+ | "14" # SOLID_FLUID_CONNECTION between 2 fluids
+ | "15" # SOLID_FLUID_CONNECTION used as boundary
+ | "16" # SOLID_FLUID_CONNECTION between 2 undefined
# media
- | "20" # no connexion between 2 fluids
- | "21" # no connexion between a solid and a fluid
- | "22" # no boundary around a fluid
- | "23" # no boundary around a solid
- | "24" # invalid part of a compute surface
+ | "17" # no connexion between 2 fluids
+ | "18" # no connexion between a solid and a fluid
+ | "19" # no boundary around a fluid
+ | "20" # no boundary around a solid
+ | "21" # invalid part of a compute surface
<trg-prop-conflicts> # #triangles statuses
<real3> ::= REAL REAL REAL
diff --git a/src/stardis-app.h b/src/stardis-app.h
@@ -75,7 +75,7 @@ enum properties_conflict_t {
BOUND_H_FOR_SOLID_BETWEEN_2_DEFS,
BOUND_H_FOR_SOLID_BETWEEN_2_UNDEFS,
BOUND_H_FOR_SOLID_ENCLOSING_FLUID,
- BOUND_T_FOR_SOLID_BETWEEN_2_DEFS = 10,
+ BOUND_T_FOR_SOLID_BETWEEN_2_DEFS,
BOUND_T_FOR_SOLID_BETWEEN_2_UNDEFS,
BOUND_T_FOR_SOLID_ENCLOSING_FLUID,
BOUND_F_FOR_SOLID_BETWEEN_2_DEFS,
diff --git a/src/stardis-output.c b/src/stardis-output.c
@@ -654,7 +654,7 @@ dump_green_bin
char* name_pool = NULL;
char* pool_ptr;
const char green_string[] = "GREEN_BIN_FILE:";
- const unsigned file_fmt_version = 2;
+ const unsigned file_fmt_version = 3;
/* The following type must be identical to its stardis-green counterpart! */
struct bfile_green_counts {
unsigned desc_count, smed_count, fmed_count, tbound_count, hbound_count,
