Expose Face sumax for the 3Di driver (#482)

* expose face-sumax variable * bump version
lutraconsulting · Mar 21, 2024 · 1b47ae7 · 1b47ae7
1 parent fa0421a
commit 1b47ae7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -124,6 +124,7 @@ QGIS contains internal copy of MDAL library in following versions:
 | 3.28.4  | 1.0.2   | |
 | 3.30.0  | 1.0.2   | |
 | 3.36.0  | 1.1.0   | Mike21 format support read/write |
+| 3.38.0  | 1.2.0   | Groundwater / surface water meshes for 3Di format |
 
 versions `X.Y.9Z` are development versions or alpha/beta releases (e.g. `0.4.90`, `0.4.91`, ...)
 

diff --git a/mdal/frmts/mdal_3di.cpp b/mdal/frmts/mdal_3di.cpp
@@ -329,7 +329,6 @@ std::set<std::string> MDAL::Driver3Di::ignoreNetCDFVariables()
     ignore_variables.insert( mesh + "Face_zcc" );
     ignore_variables.insert( mesh + "Contour_x" );
     ignore_variables.insert( mesh + "Contour_y" );
-    ignore_variables.insert( mesh + "Face_sumax" );
 
     ignore_variables.insert( mesh + "Line_id" );
     ignore_variables.insert( mesh + "Line_xcc" );

diff --git a/mdal/mdal.cpp b/mdal/mdal.cpp
@@ -21,7 +21,7 @@ static const char *EMPTY_STR = "";
 
 const char *MDAL_Version()
 {
-  return "1.1.0";
+  return "1.2.0";
 }
 
 MDAL_Status MDAL_LastStatus()

diff --git a/tests/test_3di.cpp b/tests/test_3di.cpp
@@ -80,7 +80,7 @@ TEST( Mesh3DiTest, Mesh2Dgroundwater )
   // ///////////
   // Bed elevation dataset
   // ///////////
-  ASSERT_EQ( 9, MDAL_M_datasetGroupCount( m ) );
+  ASSERT_EQ( 10, MDAL_M_datasetGroupCount( m ) );
 
   MDAL_DatasetGroupH g = MDAL_M_datasetGroup( m, 0 );
   ASSERT_NE( g, nullptr );
@@ -128,7 +128,7 @@ TEST( Mesh3DiTest, Mesh2Dgroundwater )
   // ///////////
   // Scalar Dataset
   // ///////////
-  g = MDAL_M_datasetGroup( m, 6 );
+  g = MDAL_M_datasetGroup( m, 7 );
   ASSERT_NE( g, nullptr );
 
   meta_count = MDAL_G_metadataCount( g );
@@ -179,7 +179,7 @@ TEST( Mesh3DiTest, Mesh2Dgroundwater )
   // ///////////
   // Vector Dataset
   // ///////////
-  g = MDAL_M_datasetGroup( m, 3 );
+  g = MDAL_M_datasetGroup( m, 4 );
   ASSERT_NE( g, nullptr );
 
   meta_count = MDAL_G_metadataCount( g );
@@ -298,7 +298,7 @@ TEST( Mesh3DiTest, Mesh2Dsurface_water )
   // ///////////
   // Bed elevation dataset
   // ///////////
-  ASSERT_EQ( 9, MDAL_M_datasetGroupCount( m ) );
+  ASSERT_EQ( 10, MDAL_M_datasetGroupCount( m ) );
 
   MDAL_DatasetGroupH g = MDAL_M_datasetGroup( m, 0 );
   ASSERT_NE( g, nullptr );
@@ -346,7 +346,7 @@ TEST( Mesh3DiTest, Mesh2Dsurface_water )
   // ///////////
   // Scalar Dataset
   // ///////////
-  g = MDAL_M_datasetGroup( m, 6 );
+  g = MDAL_M_datasetGroup( m, 7 );
   ASSERT_NE( g, nullptr );
 
   meta_count = MDAL_G_metadataCount( g );
@@ -397,7 +397,7 @@ TEST( Mesh3DiTest, Mesh2Dsurface_water )
   // ///////////
   // Vector Dataset
   // ///////////
-  g = MDAL_M_datasetGroup( m, 3 );
+  g = MDAL_M_datasetGroup( m, 4 );
   ASSERT_NE( g, nullptr );
 
   meta_count = MDAL_G_metadataCount( g );
@@ -513,7 +513,7 @@ TEST( Mesh3DiTest, Mesh2D4cells301steps )
   // ///////////
   // Bed elevation dataset
   // ///////////
-  ASSERT_EQ( 7, MDAL_M_datasetGroupCount( m ) );
+  ASSERT_EQ( 8, MDAL_M_datasetGroupCount( m ) );
 
   MDAL_DatasetGroupH g = MDAL_M_datasetGroup( m, 0 );
   ASSERT_NE( g, nullptr );
@@ -554,7 +554,7 @@ TEST( Mesh3DiTest, Mesh2D4cells301steps )
   // ///////////
   // Scalar Dataset
   // ///////////
-  g = MDAL_M_datasetGroup( m, 5 );
+  g = MDAL_M_datasetGroup( m, 6 );
   ASSERT_NE( g, nullptr );
 
   meta_count = MDAL_G_metadataCount( g );
@@ -596,7 +596,7 @@ TEST( Mesh3DiTest, Mesh2D4cells301steps )
   // ///////////
   // Vector Dataset
   // ///////////
-  g = MDAL_M_datasetGroup( m, 2 );
+  g = MDAL_M_datasetGroup( m, 3 );
   ASSERT_NE( g, nullptr );
 
   meta_count = MDAL_G_metadataCount( g );
@@ -658,7 +658,7 @@ TEST( Mesh3DiTest, Mesh2D16cells7steps )
   int f_count = MDAL_M_faceCount( m );
   EXPECT_EQ( 16, f_count );
 
-  ASSERT_EQ( 7, MDAL_M_datasetGroupCount( m ) );
+  ASSERT_EQ( 8, MDAL_M_datasetGroupCount( m ) );
   MDAL_DatasetGroupH g = MDAL_M_datasetGroup( m, 5 );
   ASSERT_NE( g, nullptr );
   ASSERT_EQ( 7, MDAL_G_datasetCount( g ) );