From c147da1a727c80a152e3837fbcf55d5bd25e8518 Mon Sep 17 00:00:00 2001
From: Axel Modave <axel.modave@gmail.com>
Date: Tue, 17 Jun 2014 12:35:13 +0000
Subject: [PATCH] new plugin Scal2Tens (evolution of Scal2Vec) --- Scal2Vec in
deprecated (no longer available in the GUI - available for scripts)
---
Plugin/PluginManager.cpp | 2 ++
Plugin/Scal2Tens.cpp | 20 ++++++++--------
Plugin/Scal2Vec.cpp | 49 +++++++++++++++++++---------------------
Plugin/Scal2Vec.h | 2 +-
4 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/Plugin/PluginManager.cpp b/Plugin/PluginManager.cpp
index 573a9391e8..bf4593b7f9 100644
--- a/Plugin/PluginManager.cpp
+++ b/Plugin/PluginManager.cpp
@@ -247,6 +247,8 @@ void PluginManager::registerDefaultPlugins()
("DiscretizationError", GMSH_RegisterDiscretizationErrorPlugin()));
allPlugins.insert(std::pair<std::string, GMSH_Plugin*>
("Scal2Tens", GMSH_RegisterScal2TensPlugin()));
+ allPlugins.insert(std::pair<std::string, GMSH_Plugin*>
+ ("Scal2Vec", GMSH_RegisterScal2VecPlugin()));
allPlugins.insert(std::pair<std::string, GMSH_Plugin*>
("NewView", GMSH_RegisterNewViewPlugin()));
allPlugins.insert(std::pair<std::string, GMSH_Plugin*>
diff --git a/Plugin/Scal2Tens.cpp b/Plugin/Scal2Tens.cpp
index 4cca612cd0..a03e660600 100644
--- a/Plugin/Scal2Tens.cpp
+++ b/Plugin/Scal2Tens.cpp
@@ -8,16 +8,16 @@
#include "shapeFunctions.h"
StringXNumber Scal2TensOptions_Number[] = {
- {GMSH_FULLRC, "NumberOfComponents", NULL, 3.},
- {GMSH_FULLRC, "Comp0", NULL, -1.},
- {GMSH_FULLRC, "Comp1", NULL, -1.},
- {GMSH_FULLRC, "Comp2", NULL, -1.},
- {GMSH_FULLRC, "Comp3", NULL, -1.},
- {GMSH_FULLRC, "Comp4", NULL, -1.},
- {GMSH_FULLRC, "Comp5", NULL, -1.},
- {GMSH_FULLRC, "Comp6", NULL, -1.},
- {GMSH_FULLRC, "Comp7", NULL, -1.},
- {GMSH_FULLRC, "Comp8", NULL, -1.}
+ {GMSH_FULLRC, "NumberOfComponents", NULL, 9},
+ {GMSH_FULLRC, "View0", NULL, -1},
+ {GMSH_FULLRC, "View1", NULL, -1},
+ {GMSH_FULLRC, "View2", NULL, -1},
+ {GMSH_FULLRC, "View3", NULL, -1},
+ {GMSH_FULLRC, "View4", NULL, -1},
+ {GMSH_FULLRC, "View5", NULL, -1},
+ {GMSH_FULLRC, "View6", NULL, -1},
+ {GMSH_FULLRC, "View7", NULL, -1},
+ {GMSH_FULLRC, "View8", NULL, -1}
};
StringXString Scal2TensOptions_String[] = {
diff --git a/Plugin/Scal2Vec.cpp b/Plugin/Scal2Vec.cpp
index 8a8bccb129..a72e91622d 100644
--- a/Plugin/Scal2Vec.cpp
+++ b/Plugin/Scal2Vec.cpp
@@ -8,9 +8,9 @@
#include "shapeFunctions.h"
StringXNumber Scal2VecOptions_Number[] = {
- {GMSH_FULLRC, "ViewX", NULL, -1.},
- {GMSH_FULLRC, "ViewY", NULL, -1.},
- {GMSH_FULLRC, "ViewZ", NULL, -1.}
+ {GMSH_FULLRC, "ViewX", NULL, -1},
+ {GMSH_FULLRC, "ViewY", NULL, -1},
+ {GMSH_FULLRC, "ViewZ", NULL, -1}
};
StringXString Scal2VecOptions_String[] = {
@@ -30,9 +30,7 @@ std::string GMSH_Scal2VecPlugin::getHelp() const
return "Plugin(Scal2Vec) converts the scalar fields into a vectorial field. "
"The new view 'NameNewView' contains it. "
"If the number of a view is -1, the value of the corresponding "
- "component of the vector field is 0."
- "\n\n"
- "DEPRECATE: Use plugin 'Scal2Tens' instead.'";
+ "component of the vector field is 0.";
}
int GMSH_Scal2VecPlugin::getNbOptions() const
@@ -61,7 +59,6 @@ PView *GMSH_Scal2VecPlugin::execute(PView *v)
int iViewX = (int)Scal2VecOptions_Number[0].def;
int iViewY = (int)Scal2VecOptions_Number[1].def;
int iViewZ = (int)Scal2VecOptions_Number[2].def;
- std::string nameNewView = Scal2VecOptions_String[0].def;
// Load data
PView *vRef = 0, *vX = 0, *vY = 0, *vZ = 0;
@@ -100,29 +97,30 @@ PView *GMSH_Scal2VecPlugin::execute(PView *v)
PViewDataList *dataNew = getDataList(vNew);
int step0 = dataRef->getFirstNonEmptyTimeStep();
- for(int ent = 0; ent < dataRef->getNumEntities(step0); ent++){
- for(int ele = 0; ele < dataRef->getNumElements(step0, ent); ele++){
- if(dataRef->skipElement(step0, ent, ele)) continue;
+ for (int ent = 0; ent < dataRef->getNumEntities(step0); ent++){
+ for (int ele = 0; ele < dataRef->getNumElements(step0, ent); ele++){
+ if (dataRef->skipElement(step0, ent, ele)) continue;
int numComp = 3; // The 3 components of the new view: x,y,z
int type = dataRef->getType(step0, ent, ele);
int numNodes = dataRef->getNumNodes(step0, ent, ele);
std::vector<double> *out = dataNew->incrementList(numComp, type, numNodes); // Pointer in data of the new view
- if(!out) continue;
+ if (!out) continue;
double x[8], y[8], z[8], valX, valY, valZ;
- for(int nod = 0; nod < numNodes; nod++)
+ for (int nod = 0; nod < numNodes; nod++)
dataRef->getNode(step0, ent, ele, nod, x[nod], y[nod], z[nod]);
int dim = dataRef->getDimension(step0, ent, ele);
elementFactory factory;
element *element = factory.create(numNodes, dim, x, y, z);
- if(!element) continue;
- for(int nod = 0; nod < numNodes; nod++) out->push_back(x[nod]); // Save coordinates (x,y,z)
- for(int nod = 0; nod < numNodes; nod++) out->push_back(y[nod]);
- for(int nod = 0; nod < numNodes; nod++) out->push_back(z[nod]);
- for(int step = step0; step < dataRef->getNumTimeSteps(); step++){
- for(int nod = 0; nod < numNodes; nod++){
- if(vX) vX->getData()->getValue(step, ent, ele, nod, 0, valX); else valX = 0;
- if(vY) vY->getData()->getValue(step, ent, ele, nod, 0, valY); else valY = 0;
- if(vZ) vZ->getData()->getValue(step, ent, ele, nod, 0, valZ); else valZ = 0;
+ if (!element) continue;
+ for (int nod=0; nod<numNodes; nod++) out->push_back(x[nod]); // Save coordinates (x,y,z)
+ for (int nod=0; nod<numNodes; nod++) out->push_back(y[nod]);
+ for (int nod=0; nod<numNodes; nod++) out->push_back(z[nod]);
+ for (int step=step0; step < dataRef->getNumTimeSteps(); step++) {
+ if (!dataRef->hasTimeStep(step)) continue;
+ for (int nod=0; nod<numNodes; nod++) {
+ if (vX) vX->getData()->getValue(step, ent, ele, nod, 0, valX); else valX = 0;
+ if (vY) vY->getData()->getValue(step, ent, ele, nod, 0, valY); else valY = 0;
+ if (vZ) vZ->getData()->getValue(step, ent, ele, nod, 0, valZ); else valZ = 0;
out->push_back(valX); // Save values (fx,fy,fz)
out->push_back(valY);
out->push_back(valZ);
@@ -132,13 +130,12 @@ PView *GMSH_Scal2VecPlugin::execute(PView *v)
}
}
- for(int step = step0; step < dataRef->getNumTimeSteps(); step++){
- if(dataRef->hasTimeStep(step)){
- double time = dataRef->getTime(step);
- dataNew->Time.push_back(time);
- }
+ for (int step=step0; step < dataRef->getNumTimeSteps(); step++) {
+ if (!dataRef->hasTimeStep(step)) continue;
+ dataNew->Time.push_back(dataRef->getTime(step));
}
+ std::string nameNewView = Scal2VecOptions_String[0].def;
dataNew->setName(nameNewView);
dataNew->setFileName(nameNewView + ".pos");
dataNew->finalize();
diff --git a/Plugin/Scal2Vec.h b/Plugin/Scal2Vec.h
index cc5dd2c02d..d83ee6cffd 100644
--- a/Plugin/Scal2Vec.h
+++ b/Plugin/Scal2Vec.h
@@ -20,7 +20,7 @@ class GMSH_Scal2VecPlugin : public GMSH_PostPlugin
std::string getName() const { return "Scal2Vec"; }
std::string getShortHelp() const
{
- return "Convert some scalar fields into a vector field [DEPRECATE]";
+ return "Convert some scalar fields into a vector field";
}
std::string getHelp() const;
int getNbOptions() const;
--
GitLab