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.

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

Update 3Di driver to expose groundwater and surface water as individual meshes #477

Merged
merged 2 commits into from
Mar 20, 2024

Conversation

uclaros
Copy link
Contributor

@uclaros uclaros commented Mar 7, 2024

On the 3Di driver, in addition to the existing Mesh2D mesh, the driver now allows to open Mesh2D_groundwater and Mesh2D_surface_water individual meshes

Also fixes dataset min/max statistics which returned nan/nan, breaking the symbology in QGIS

Copy link
Contributor

@PeterPetrik PeterPetrik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::string path = test_file( "/3di/2d_groundwater/results_3di.nc" );
EXPECT_EQ( MDAL_MeshNames( path.c_str() ), "3Di:\"" + path + "\":Mesh2D;;3Di:\"" + path + "\":Mesh2D_groundwater;;3Di:\"" + path + "\":Mesh2D_surface_water" );
std::string uri = "3Di:\"" + path + "\":Mesh2D_groundwater";
// std::string uri = "3Di:\"" + path + "\":Mesh2D";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

std::string path = test_file( "/3di/2d_groundwater/results_3di.nc" );
EXPECT_EQ( MDAL_MeshNames( path.c_str() ), "3Di:\"" + path + "\":Mesh2D;;3Di:\"" + path + "\":Mesh2D_groundwater;;3Di:\"" + path + "\":Mesh2D_surface_water" );
std::string uri = "3Di:\"" + path + "\":Mesh2D_surface_water";
// std::string uri = "3Di:\"" + path + "\":Mesh2D";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove


private:
std::vector< size_t > mRequestedMeshFaceIds;
};

/**
* Driver of 3Di file format.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add few lines about the 3 meshes we support

@uclaros
Copy link
Contributor Author

uclaros commented Mar 19, 2024

Thanks for the review @PeterPetrik .
There's another PR to be made after this is merged and prior to bumping the version.

@uclaros uclaros merged commit fa0421a into master Mar 20, 2024
14 of 15 checks passed
@uclaros uclaros deleted the 3di-groundwater branch March 20, 2024 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants