Skip to content
Snippets Groups Projects
Commit 89e3ade8 authored by Hkorb's avatar Hkorb
Browse files

small updates to probe

parent 5a51b26b
No related branches found
No related tags found
1 merge request!170Kernel templetization and efficiency improvements
......@@ -5,8 +5,7 @@
#include "PreCollisionInteractor/PreCollisionInteractor.h"
#include "PointerDefinitions.h"
#include "WbWriter.h"
#include "WbWriterVtkXMLBinary.h"
#include "WbWriterVtkXmlBinary.h"
enum class PostProcessingVariable{
// HowTo add new PostProcessingVariable: Add enum here, LAST has to stay last
......@@ -20,6 +19,9 @@ enum class PostProcessingVariable{
LAST,
};
std::vector<std::string> getPostProcessingVariableNames(PostProcessingVariable variable);
struct ProbeStruct{
uint nPoints, nArrays, vals;
uint *pointIndicesH, *pointIndicesD;
......@@ -68,8 +70,8 @@ public:
void addPostProcessingVariable(PostProcessingVariable _variable);
private:
virtual WbWriter* getWriter(){ return WbWriterVtkXmlBinary::getInstance(); };
protected:
virtual WbWriterVtkXmlBinary* getWriter(){ return WbWriterVtkXmlBinary::getInstance(); };
virtual void findPoints(Parameter* para, GridProvider* gridProvider, std::vector<int>& probeIndices_level,
std::vector<real>& distX_level, std::vector<real>& distY_level, std::vector<real>& distZ_level,
std::vector<real>& pointCoordsX_level, std::vector<real>& pointCoordsY_level, std::vector<real>& pointCoordsZ_level,
......@@ -87,8 +89,8 @@ private:
std::vector<std::string> getVarNames();
std::string makeGridFileName(int level, int id, int t, uint part);
std::string makeParallelFileName(int id, int t);
private:
protected:
const std::string probeName;
const std::string outputPath;
......@@ -100,7 +102,6 @@ private:
uint tStartAvg;
uint tStartOut;
uint tOut;
};
#endif
\ No newline at end of file
......@@ -228,6 +228,7 @@ static constexpr float c290o1 = 290.0f;
static constexpr float c367o1 = 367.0f;
static constexpr float Op0000002 = 0.0000002f;
static constexpr float c4o10 = 0.4f;
static constexpr float c10eM30 = 1e-30f;
static constexpr float c10eM10 = 1e-10f;
static constexpr float smallSingle = 0.0000000002f;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment