Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose Face sumax for the 3Di driver #482

Merged
merged 2 commits into from
Mar 21, 2024
Merged

Expose Face sumax for the 3Di driver #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ee5f7b
expose face-sumax variable
uclaros Mar 7, 2024
241717c
bump version
uclaros Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`, ...)

Expand Down
1 change: 0 additions & 1 deletion mdal/frmts/mdal_3di.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
2 changes: 1 addition & 1 deletion mdal/mdal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
20 changes: 10 additions & 10 deletions tests/test_3di.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 ) );
Expand Down
Loading