OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

DamarisVar: remove unused base class DamarisVarBase

Browse Source 
no reason to pay the price of virtual dispatch when nothing
use the base class
This commit is contained in:
Arne Morten Kvarving 2024-01-30 09:58:37 +01:00
parent bee1555d25
commit 498f1b6b50
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/utils/DamarisVar.cpp
View File

@ -125,8 +125,9 @@ DamarisVar<T>::~DamarisVar()
commitVariableDamarisShmem(); commitVariableDamarisShmem();
clearVariableDamarisShmem(); clearVariableDamarisShmem();
} }
if (this->hasError()) if (this->hasError()) {
printError(); // flush out any error messages printError(); // flush out any error messages
}
} }
template<class T> template<class T>

35
opm/simulators/utils/DamarisVar.hpp
View File

@ -88,21 +88,6 @@ namespace DamarisOutput
std::string ReturnXMLForVariable(); std::string ReturnXMLForVariable();
}; };
class DamarisVarBase
{
public:
virtual ~DamarisVarBase() = default;
virtual void printError() const = 0;
virtual bool hasError() const = 0;
virtual void setDamarisParameterAndShmem(const std::vector<int>& paramSizeVal) = 0;
virtual void setDamarisParameter(const std::vector<int>& paramSizeVal) = 0;
virtual void setDamarisPosition(const std::vector<int64_t>& positionsVals) = 0;
virtual void setPointersToDamarisShmem() = 0;
virtual void commitVariableDamarisShmem() = 0;
virtual void clearVariableDamarisShmem() = 0;
virtual const std::string& variable_name() const = 0;
}; // class DamarisVarBase
/** /**
* class to store a Damaris variable representation for the XML file * class to store a Damaris variable representation for the XML file
* (can be used with \ref class DamarisKeywords). * (can be used with \ref class DamarisKeywords).
@ -112,7 +97,7 @@ namespace DamarisOutput
* *
*/ */
template <typename T> template <typename T>
class DamarisVar : public DamarisVarBase class DamarisVar
{ {
int num_params_; //!< Each paramater name string will need a value and they int num_params_; //!< Each paramater name string will need a value and they
//!< are set in SetDamarisParameter() //!< are set in SetDamarisParameter()
@ -254,9 +239,9 @@ namespace DamarisOutput
parameters_set_ = true; parameters_set_ = true;
} }
void printError() const override; void printError() const;
bool hasError() const override bool hasError() const
{ {
return has_error_; return has_error_;
} }
@ -274,7 +259,7 @@ namespace DamarisOutput
} }
} }
const std::string& variable_name() const override const std::string& variable_name() const
{ {
return variable_name_; return variable_name_;
} }
@ -293,7 +278,7 @@ namespace DamarisOutput
* *
* *
*/ */
void setDamarisParameterAndShmem(const std::vector<int>& paramSizeVal) override void setDamarisParameterAndShmem(const std::vector<int>& paramSizeVal)
{ {
this->setDamarisParameter(paramSizeVal); this->setDamarisParameter(paramSizeVal);
this->setPointersToDamarisShmem(); this->setPointersToDamarisShmem();
@ -323,7 +308,7 @@ namespace DamarisOutput
* /implicit : Implicitly uses the array of paramater names: * /implicit : Implicitly uses the array of paramater names:
* \ref param_names_ * \ref param_names_
*/ */
void setDamarisParameter(const std::vector<int>& paramSizeVal) override; void setDamarisParameter(const std::vector<int>& paramSizeVal);
/** /**
* Method to set the Damaris position values. * Method to set the Damaris position values.
@ -335,7 +320,7 @@ namespace DamarisOutput
* /implicit : Implicitly uses the variable name: \ref * /implicit : Implicitly uses the variable name: \ref
* variable_name_ * variable_name_
*/ */
void setDamarisPosition(const std::vector<int64_t>& positionsVals) override; void setDamarisPosition(const std::vector<int64_t>& positionsVals);
/** /**
* Method to set the internal pointer (data_ptr_) to the Damaris shared * Method to set the internal pointer (data_ptr_) to the Damaris shared
@ -345,7 +330,7 @@ namespace DamarisOutput
* string \ref variable_name_ /implicit : Implicitly uses the * string \ref variable_name_ /implicit : Implicitly uses the
* class data element : \ref data_ptr_ * class data element : \ref data_ptr_
*/ */
void setPointersToDamarisShmem() override; void setPointersToDamarisShmem();
/** /**
* Method to commit the memory of the data written to the Damaris variable - * Method to commit the memory of the data written to the Damaris variable -
@ -354,7 +339,7 @@ namespace DamarisOutput
* /implicit : Implicitly uses the variable name string \ref * /implicit : Implicitly uses the variable name string \ref
* variable_name_ * variable_name_
*/ */
void commitVariableDamarisShmem() override; void commitVariableDamarisShmem();
/** /**
* Method to release the memory of the data written to the Damaris variable - * Method to release the memory of the data written to the Damaris variable -
@ -364,7 +349,7 @@ namespace DamarisOutput
* /implicit : Implicitly uses the variable name string \ref * /implicit : Implicitly uses the variable name string \ref
* variable_name_ * variable_name_
*/ */
void clearVariableDamarisShmem() override; void clearVariableDamarisShmem();
private: private:
/** /**