Skip to content

Commit

Permalink
IO/VTK: declare some functions as constant
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrea-iob
andrea-iob committed Nov 19, 2023
1 parent b10a125 commit 3a1db87
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 43 deletions.
12 changes: 6 additions & 6 deletions src/IO/VTK.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ void VTK::writeTimeSeries( const std::string &outputName, const std::string &ser
* Writes collection file for parallel output.
* Is called by rank 0 in VTK::Write()
*/
void VTK::writeCollection( ) {
void VTK::writeCollection( ) const {
writeCollection(getName(), getName()) ;
}

Expand All @@ -917,7 +917,7 @@ void VTK::writeCollection( ) {
*
* \param outputName filename to be set for this output only
*/
void VTK::writeCollection( const std::string &outputName ) {
void VTK::writeCollection( const std::string &outputName ) const {
writeCollection(outputName, outputName) ;
}

Expand Down Expand Up @@ -1123,7 +1123,7 @@ void VTK::writeData( ){
* @param[in] str output stream
* @param[in] parallel flag for parallel data headers for collection files [true/false]
*/
void VTK::writeDataHeader( std::fstream &str, bool parallel ){
void VTK::writeDataHeader( std::fstream &str, bool parallel ) const {

VTKLocation location ;
std::stringstream scalars, vectors ;
Expand Down Expand Up @@ -1189,7 +1189,7 @@ void VTK::writeDataHeader( std::fstream &str, bool parallel ){
* @param[in] str output stream
* @param[in] field field to be written
*/
void VTK::writeDataArray( std::fstream &str, VTKField &field ){
void VTK::writeDataArray( std::fstream &str, const VTKField &field ) const {

str << vtk::convertDataArrayToString( field ) << std::endl ;
str << " </DataArray>" << std::endl ;
Expand All @@ -1201,7 +1201,7 @@ void VTK::writeDataArray( std::fstream &str, VTKField &field ){
* @param[in] str output stream
* @param[in] field field to be written
*/
void VTK::writePDataArray( std::fstream &str, VTKField &field ){
void VTK::writePDataArray( std::fstream &str, const VTKField &field ) const {

str << vtk::convertPDataArrayToString( field ) << std::endl ;
str << " </PDataArray>" << std::endl ;
Expand Down Expand Up @@ -1445,7 +1445,7 @@ void VTK::readDataHeader( std::fstream &str ){
* @param[in] str output stream
* @param[out] field field information
*/
bool VTK::readDataArray( std::fstream &str, VTKField &field ){
bool VTK::readDataArray( std::fstream &str, VTKField &field ) const {

std::string line ;

Expand Down
48 changes: 24 additions & 24 deletions src/IO/VTK.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,22 +383,22 @@ class VTK{
void writeTimeSeries( const std::string &outputName, double time ) const ;
void writeTimeSeries( const std::string &outputName, const std::string &seriesName, double time ) const ;

void writeCollection( ) ;
void writeCollection( const std::string &outputName ) ;
virtual void writeCollection( const std::string &outputName, const std::string &collectionName ) = 0;
void writeCollection( ) const ;
void writeCollection( const std::string &outputName ) const ;
virtual void writeCollection( const std::string &outputName, const std::string &collectionName ) const = 0;

protected:
//For Writing
virtual void writeMetaInformation() = 0 ;
virtual void writeMetaInformation() const = 0 ;
void writeData() ;

void writeDataHeader( std::fstream &, bool parallel=false ) ;
void writeDataArray( std::fstream &, VTKField &) ;
void writePDataArray( std::fstream &, VTKField &) ;
void writeDataHeader( std::fstream &, bool parallel=false ) const ;
void writeDataArray( std::fstream &, const VTKField &) const ;
void writePDataArray( std::fstream &, const VTKField &) const ;

//For Reading
void readDataHeader( std::fstream &) ;
bool readDataArray( std::fstream &, VTKField &);
bool readDataArray( std::fstream &, VTKField &) const ;

//General Purpose
std::vector<std::string> getFieldNames( const std::vector<VTKField> &fields ) const;
Expand All @@ -417,10 +417,10 @@ class VTK{
bool isASCIIActive() const;

void calcAppendedOffsets() ;
virtual uint64_t calcFieldSize( const VTKField &) =0;
virtual uint64_t calcFieldEntries( const VTKField &) =0;
virtual uint8_t calcFieldComponents( const VTKField &) =0;
void checkAllFields() ;
virtual uint64_t calcFieldSize( const VTKField &) const = 0;
virtual uint64_t calcFieldEntries( const VTKField &) const = 0;
virtual uint8_t calcFieldComponents( const VTKField &) const = 0;
void checkAllFields();

};

Expand Down Expand Up @@ -452,7 +452,7 @@ class VTKUnstructuredGrid : public VTK {
VTKUnstructuredGrid( const std::string &, const std::string &, VTKElementType elementType = VTKElementType::UNDEFINED ) ;

protected:
void writeCollection( const std::string &outputName, const std::string &collectionName ) override ;
void writeCollection( const std::string &outputName, const std::string &collectionName ) const override ;

uint64_t readConnectivityEntries( ) ;
uint64_t readFaceStreamEntries( ) ;
Expand All @@ -463,7 +463,7 @@ class VTKUnstructuredGrid : public VTK {
using VTK::setGeomData;

void readMetaInformation() override ;
void writeMetaInformation() override ;
void writeMetaInformation() const override ;

void setDimensions( uint64_t , uint64_t , uint64_t nconn = 0 , uint64_t nfacestream = 0 ) ;

Expand All @@ -474,13 +474,13 @@ class VTKUnstructuredGrid : public VTK {
template<class T>
void setGeomData( VTKUnstructuredField, VTKBaseStreamer* = nullptr );

uint64_t calcConnectivityEntries( ) ;
uint64_t calcFieldSize( const VTKField &) override ;
uint64_t calcFieldEntries( const VTKField &) override ;
uint8_t calcFieldComponents( const VTKField &) override ;
uint64_t calcConnectivityEntries( ) const ;
uint64_t calcFieldSize( const VTKField &) const override ;
uint64_t calcFieldEntries( const VTKField &) const override ;
uint8_t calcFieldComponents( const VTKField &) const override ;

private:
int getFieldGeomId( VTKUnstructuredField field ) ;
int getFieldGeomId( VTKUnstructuredField field ) const ;

};

Expand All @@ -504,13 +504,13 @@ class VTKRectilinearGrid : public VTK{
VTKRectilinearGrid( const std::string & , const std::string & , VTKFormat, int, int );

protected:
void writeCollection( const std::string &outputName, const std::string &collectionName ) override ;
void writeCollection( const std::string &outputName, const std::string &collectionName ) const override ;

public:
using VTK::setGeomData;

void readMetaInformation() override ;
void writeMetaInformation() override ;
void writeMetaInformation() const override ;

void setDimensions( int, int, int, int, int, int ) ;
void setDimensions( int, int, int ) ;
Expand All @@ -530,9 +530,9 @@ class VTKRectilinearGrid : public VTK{
void setGlobalIndex( const std::vector<extension3D_t> & ) ;
void setGlobalIndex( const std::vector<extension2D_t> & ) ;

uint64_t calcFieldSize( const VTKField &) override ;
uint64_t calcFieldEntries( const VTKField &) override ;
uint8_t calcFieldComponents( const VTKField &) override ;
uint64_t calcFieldSize( const VTKField &) const override ;
uint64_t calcFieldEntries( const VTKField &) const override ;
uint8_t calcFieldComponents( const VTKField &) const override ;
};

/*!
Expand Down
12 changes: 6 additions & 6 deletions src/IO/VTKRectilinear.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ void VTKRectilinearGrid::readMetaInformation( ){
/*!
* Writes entire VTR but the data.
*/
void VTKRectilinearGrid::writeMetaInformation( ){
void VTKRectilinearGrid::writeMetaInformation( ) const {

std::fstream str;

Expand Down Expand Up @@ -279,7 +279,7 @@ void VTKRectilinearGrid::writeMetaInformation( ){
/*!
* Writes collection file for parallel output.
*/
void VTKRectilinearGrid::writeCollection( const std::string &outputName, const std::string &collectionName ) {
void VTKRectilinearGrid::writeCollection( const std::string &outputName, const std::string &collectionName ) const {

// Only one process in a parallel output should write the collection
if (m_procs <= 1 || m_rank != 0) {
Expand Down Expand Up @@ -327,7 +327,7 @@ void VTKRectilinearGrid::writeCollection( const std::string &outputName, const s
fho.setName(outputName) ;
for( int i=0; i<m_procs; i++){
fho.setBlock(i) ;
extension3D_t &index = m_procIndex[i] ;
const extension3D_t &index = m_procIndex[i] ;

str << " <Piece Extent= \" "
<< index[0][0] << " " << index[0][1] << " "
Expand Down Expand Up @@ -499,7 +499,7 @@ void VTKRectilinearGrid::setGlobalIndex( const std::vector<extension2D_t> &loc )
* @param[in] field field
* @return size of the field
*/
uint64_t VTKRectilinearGrid::calcFieldSize( const VTKField &field ){
uint64_t VTKRectilinearGrid::calcFieldSize( const VTKField &field ) const {

uint64_t bytes = calcFieldEntries(field) ;
bytes *= VTKTypes::sizeOfType( field.getDataType() ) ;
Expand All @@ -513,7 +513,7 @@ uint64_t VTKRectilinearGrid::calcFieldSize( const VTKField &field ){
* @param[in] field field
* @return size of the field
*/
uint64_t VTKRectilinearGrid::calcFieldEntries( const VTKField &field ){
uint64_t VTKRectilinearGrid::calcFieldEntries( const VTKField &field ) const {

uint64_t entries(0) ;
const std::string &name = field.getName() ;
Expand Down Expand Up @@ -553,7 +553,7 @@ uint64_t VTKRectilinearGrid::calcFieldEntries( const VTKField &field ){
* @param[in] field field
* @return size of the field
*/
uint8_t VTKRectilinearGrid::calcFieldComponents( const VTKField &field ){
uint8_t VTKRectilinearGrid::calcFieldComponents( const VTKField &field ) const {

uint8_t comp ;
const std::string &name = field.getName() ;
Expand Down
14 changes: 7 additions & 7 deletions src/IO/VTKUnstructured.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ uint64_t VTKUnstructuredGrid::readFaceStreamEntries( ){
/*!
* Writes entire VTU but the data.
*/
void VTKUnstructuredGrid::writeMetaInformation( ){
void VTKUnstructuredGrid::writeMetaInformation( ) const {

std::fstream str ;

Expand Down Expand Up @@ -495,7 +495,7 @@ void VTKUnstructuredGrid::writeMetaInformation( ){
/*!
* Writes collection file for parallel output.
*/
void VTKUnstructuredGrid::writeCollection( const std::string &outputName, const std::string &collectionName ) {
void VTKUnstructuredGrid::writeCollection( const std::string &outputName, const std::string &collectionName ) const {

// Only one process in a parallel output should write the collection
if (m_procs <= 1 || m_rank != 0) {
Expand Down Expand Up @@ -630,7 +630,7 @@ void VTKUnstructuredGrid::readMetaInformation( ){
* Returns the size of the connectivity information
* @return size of connectivity
*/
uint64_t VTKUnstructuredGrid::calcConnectivityEntries( ){
uint64_t VTKUnstructuredGrid::calcConnectivityEntries( ) const {

return calcFieldEntries( m_geometry[getFieldGeomId(VTKUnstructuredField::CONNECTIVITY)] ) ;
}
Expand All @@ -640,7 +640,7 @@ uint64_t VTKUnstructuredGrid::calcConnectivityEntries( ){
* @param[in] field field
* @return size of the field
*/
uint64_t VTKUnstructuredGrid::calcFieldSize( const VTKField &field ){
uint64_t VTKUnstructuredGrid::calcFieldSize( const VTKField &field ) const {

uint64_t bytes = calcFieldEntries(field) ;
bytes *= VTKTypes::sizeOfType( field.getDataType() ) ;
Expand All @@ -654,7 +654,7 @@ uint64_t VTKUnstructuredGrid::calcFieldSize( const VTKField &field ){
* @param[in] field field
* @return size of the field
*/
uint64_t VTKUnstructuredGrid::calcFieldEntries( const VTKField &field ){
uint64_t VTKUnstructuredGrid::calcFieldEntries( const VTKField &field ) const {

uint64_t entries(0) ;
const std::string &name = field.getName() ;
Expand Down Expand Up @@ -703,7 +703,7 @@ uint64_t VTKUnstructuredGrid::calcFieldEntries( const VTKField &field ){
* @param[in] field field
* @return size of the field
*/
uint8_t VTKUnstructuredGrid::calcFieldComponents( const VTKField &field ){
uint8_t VTKUnstructuredGrid::calcFieldComponents( const VTKField &field ) const {

uint8_t comp ;
const std::string &name = field.getName() ;
Expand Down Expand Up @@ -746,7 +746,7 @@ uint8_t VTKUnstructuredGrid::calcFieldComponents( const VTKField &field ){
* @param[in] field field
* @return geometry index associated to the field
*/
int VTKUnstructuredGrid::getFieldGeomId( VTKUnstructuredField field ){
int VTKUnstructuredGrid::getFieldGeomId( VTKUnstructuredField field ) const {

return static_cast<std::underlying_type<VTKElementType>::type>(field) ;
}
Expand Down

0 comments on commit 3a1db87

Please sign in to comment.