OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
JamesEMcclure
2021-09-01 07:39:10 -04:00
parent bde1e7111a b36d9dea93
commit 3d4a0a1f2f
43 changed files with 6852 additions and 2902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
IO/Mesh.cpp
View File

@@ -163,7 +163,7 @@ size_t PointList::numberPointsVar( VariableType type ) const
}
std::pair<size_t, void *> PointList::pack( int level ) const
{
std::pair<size_t, void *> data_out( 0, NULL );
std::pair<size_t, void *> data_out( 0, nullptr );
if ( level == 0 ) {
data_out.first = ( 2 + 3 * points.size() ) * sizeof( double );
double *data_ptr = new double[2 + 3 * points.size()];
@@ -626,6 +626,8 @@ std::string getString( FileFormat type )
return "new(single)";
else if ( type == FileFormat::SILO )
return "silo";
else if ( type == FileFormat::HDF5 )
return "hdf5";
else
ERROR( "Invalid type" );
return "";
@@ -641,6 +643,8 @@ FileFormat getFileFormat( const std::string &type_in )
return FileFormat::NEW_SINGLE;
else if ( type == "silo" || type == "4" )
return FileFormat::SILO;
else if ( type == "hdf5" || type == "5" )
return FileFormat::HDF5;
else
ERROR( "Invalid type: " + type );
return FileFormat::SILO;