city_generator2

commit 0130f1bb1863a7071d73248ea39bec9566ade359
parent 47bef920ec1ab49da6a46999782dff15e18b4503
Author: Benjamin Piaud <benjamin.piaud@meso-star.com>
Date:   Thu, 26 Jan 2023 20:17:07 +0100

Rename some cavity connections

Diffstat:
M
src/cg_construction_mode_0.c
 | 
6
+++---
M
src/cg_construction_mode_1.c
 | 
14
+++++++-------

2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/cg_construction_mode_0.c b/src/cg_construction_mode_0.c
@@ -293,7 +293,7 @@ build_connection
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_C_floor"));
+    ERR(str_append(&name, "_C_internal_floor"));
     cname = str_get(&name);
   }
 
@@ -303,7 +303,7 @@ build_connection
   /* cavity/wall connection */
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_C_walls"));
+    ERR(str_append(&name, "_C_internal_walls"));
     cname = str_get(&name);
   }
 
@@ -313,7 +313,7 @@ build_connection
   /* cavity/roof connection */
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_C_roof"));
+    ERR(str_append(&name, "_C_internal_roof"));
     cname = str_get(&name);
   }
 
diff --git a/src/cg_construction_mode_1.c b/src/cg_construction_mode_1.c
@@ -1026,32 +1026,32 @@ build_connection
   /* -------------------------------------------------------------------------*/
 
   /* with floor */
-  CREATE_CONNECT(habitable_cavity,floor,"_C_floor");
+  CREATE_CONNECT(habitable_cavity,floor,"_C_levels_floor");
 
   /* with wall */
-  CREATE_CONNECT(habitable_cavity,wall,"_C_walls");
+  CREATE_CONNECT(habitable_cavity,wall,"_C_levels_walls");
 
   /* with glass */
   if (data_cad->glass) {
-    CREATE_CONNECT(habitable_cavity,glass,"_C_glazing");
+    CREATE_CONNECT(habitable_cavity,glass,"_C_levels_glazing");
   }
 
   /* with internal insulation */
   if (data_cad->internal_insulation) {
-    CREATE_CONNECT(habitable_cavity,internal_insulation,"_C_internal_insulation");
+    CREATE_CONNECT(habitable_cavity,internal_insulation,"_C_levels_internal_insulation");
   }
 
   /* with roof insulation */
   if (data_cad->roof_insulation) {
-    CREATE_CONNECT(habitable_cavity,roof_insulation,"_C_roof_insulation");
+    CREATE_CONNECT(habitable_cavity,roof_insulation,"_C_levels_roof_insulation");
   } else {
     /* with roof */
-    CREATE_CONNECT(habitable_cavity,roof,"_C_roof");
+    CREATE_CONNECT(habitable_cavity,roof,"_C_levels_roof");
   }
 
   /* with intermediate floor */
   if (data_cad->intermediate_floor) {
-    CREATE_CONNECT(habitable_cavity,intermediate_floor,"_C_intermediate_floors");
+    CREATE_CONNECT(habitable_cavity,intermediate_floor,"_C_levels_intermediate_floors");
   }
 
   /* -------------------------------------------------------------------------*/