WSL/SLF GitLab Repository

Commit 4c7a4908 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Fixed two bugs: one member of DEMObject was not properly serialized (for MPI)...

Fixed two bugs: one member of DEMObject was not properly serialized (for MPI) and the CNRM plugin was not properly declared.
parent 87f54e1b
......@@ -25,6 +25,7 @@
#cmakedefine PLUGIN_ARCIO
#cmakedefine PLUGIN_A3DIO
#cmakedefine PLUGIN_ARPSIO
#cmakedefine PLUGIN_CNRMIO
#cmakedefine PLUGIN_GRASSIO
#cmakedefine PLUGIN_GEOTOPIO
#cmakedefine PLUGIN_SMETIO
......
......@@ -1100,6 +1100,7 @@ std::iostream& operator<<(std::iostream& os, const DEMObject& dem) {
os.write(reinterpret_cast<const char*>(&dem.max_slope), sizeof(dem.max_slope));
os.write(reinterpret_cast<const char*>(&dem.max_curvature), sizeof(dem.max_curvature));
os.write(reinterpret_cast<const char*>(&dem.max_shade_distance), sizeof(dem.max_shade_distance));
os.write(reinterpret_cast<const char*>(&dem.update_flag), sizeof(dem.update_flag));
os.write(reinterpret_cast<const char*>(&dem.dflt_algorithm), sizeof(dem.dflt_algorithm));
os.write(reinterpret_cast<const char*>(&dem.slope_failures), sizeof(dem.slope_failures));
......@@ -1122,6 +1123,7 @@ std::iostream& operator>>(std::iostream& is, DEMObject& dem) {
is.read(reinterpret_cast<char*>(&dem.max_slope), sizeof(dem.max_slope));
is.read(reinterpret_cast<char*>(&dem.max_curvature), sizeof(dem.max_curvature));
is.read(reinterpret_cast<char*>(&dem.max_shade_distance), sizeof(dem.max_shade_distance));
is.read(reinterpret_cast<char*>(&dem.update_flag), sizeof(dem.update_flag));
is.read(reinterpret_cast<char*>(&dem.dflt_algorithm), sizeof(dem.dflt_algorithm));
is.read(reinterpret_cast<char*>(&dem.slope_failures), sizeof(dem.slope_failures));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment