name update

Author: Golnesa

threedigrid_builder/base/lines.py

@@ -40,8 +40,8 @@ class Line:
     frict_value2: float  # For 1D-2Dgw: resistance factor-in (hydr. cond / thickness)
     veg_coef1: float  # the product of vegetation properties (except height)
     veg_coef2: float  # the product of vegetation properties (except height)
-    veg_hght1: float  # the vegetaion height
-    veg_hght2: float  # the vegetaion height
+    veg_height1: float  # the vegetaion height
+    veg_height2: float  # the vegetaion height
     cross_weight: float  # For 1D-2Dgw: the exchange length (tables: cross_width)
     discharge_coefficient_positive: float
     discharge_coefficient_negative: float

threedigrid_builder/grid/cross_section_locations.py

@@ -47,8 +47,8 @@ def apply_to_lines(self, lines, channels, extrapolate=False):
         - frict_value2: the friction value of the second cross section location
         - veg_coef1: the product of vegetation properties of the first cross section location (except height)
         - veg_coef2: the product of vegetation properties of the second cross section location (except height)
-        - veg_hght1: the vegetation height of the first cross section
-        - veg_hght2: the vegetation height of the second cross section
+        - veg_height1: the vegetation height of the first cross section
+        - veg_height2: the vegetation height of the second cross section
         - invert_level_start_point: 'reference_level' interpolated at the line end
         - invert_level_end_point: 'reference_level' interpolated at the line start
         - dpumax: the largest of the two invert levels
@@ -86,10 +86,10 @@ def apply_to_lines(self, lines, channels, extrapolate=False):
             * self.vegetation_drag_coefficient[idx2]
         )
         lines.veg_coef2[np.isnan(lines.veg_coef2)] = 0.0
-        lines.veg_hght1 = self.vegetation_height[idx1]
-        lines.veg_hght1[np.isnan(lines.veg_hght1)] = 0.0
-        lines.veg_hght2 = self.vegetation_height[idx2]
-        lines.veg_hght2[np.isnan(lines.veg_hght2)] = 0.0
+        lines.veg_height1 = self.vegetation_height[idx1]
+        lines.veg_height1[np.isnan(lines.veg_height1)] = 0.0
+        lines.veg_height2 = self.vegetation_height[idx2]
+        lines.veg_height2[np.isnan(lines.veg_height2)] = 0.0
 
         # Compute invert levels and start and end
         lines.invert_level_start_point = compute_bottom_level(

threedigrid_builder/interface/gridadmin.py

@@ -444,8 +444,8 @@ def write_lines(self, lines: Lines, cross_sections):
         self.write_dataset(group, "frict_value2", lines.frict_value2)
         self.write_dataset(group, "veg_coef1", lines.veg_coef1)
         self.write_dataset(group, "veg_coef2", lines.veg_coef2)
-        self.write_dataset(group, "veg_hght1", lines.veg_hght1)
-        self.write_dataset(group, "veg_hght2", lines.veg_hght2)
+        self.write_dataset(group, "veg_height1", lines.veg_height1)
+        self.write_dataset(group, "veg_height2", lines.veg_height2)
         self.write_dataset(group, "cross_weight", lines.cross_weight)
         self.write_dataset(
             group, "hydraulic_resistance_in", lines.hydraulic_resistance_in

threedigrid_builder/tests/test_cross_section_locations.py

@@ -171,8 +171,8 @@ def test_apply_to_lines(channels, channel_lines, locations):
     assert_equal(channel_lines.frict_value2, [30.0, 0.02, 35.0, 35.0, 35.0, 0.03, 0.03])
     assert_almost_equal(channel_lines.veg_coef1, [0.5, 0.0, 0.2, 0.2, 0.2, 0.0, 0.0])
     assert_almost_equal(channel_lines.veg_coef2, [0.5, 0.0, 0.15, 0.15, 0.15, 0.0, 0.0])
-    assert_almost_equal(channel_lines.veg_hght1, [0.2, 0.0, 1.0, 1.0, 1.0, 0.0, 0.0])
-    assert_almost_equal(channel_lines.veg_hght2, [0.2, 0.0, 1.0, 1.0, 1.0, 0.0, 0.0])
+    assert_almost_equal(channel_lines.veg_height1, [0.2, 0.0, 1.0, 1.0, 1.0, 0.0, 0.0])
+    assert_almost_equal(channel_lines.veg_height2, [0.2, 0.0, 1.0, 1.0, 1.0, 0.0, 0.0])
     assert_almost_equal(
         channel_lines.cross_weight, [1.0, 1.0, 1.0, 0.65, 0.0, 1.0, 1.0]
     )