Skip to content
Snippets Groups Projects
Commit 285727df authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

option to forceInterpolation

parent 323f21c1
No related branches found
No related tags found
No related merge requests found
...@@ -17,9 +17,7 @@ endif(DEFINED CMAKE_BUILD_TYPE) ...@@ -17,9 +17,7 @@ endif(DEFINED CMAKE_BUILD_TYPE)
project(gmsh CXX C) project(gmsh CXX C)
option(ENABLE_ACIS "Enable ACIS geometrical models" ON) option(ENABLE_ACIS "Enable ACIS geometrical models" ON)
option(ENABLE_ANN "Enable ANN to compute Approximate Nearest option(ENABLE_ANN "Enable ANN to compute Approximate Nearest Neighbors" ON)
Neighbors" ON)
option(ENABLE_RBF "Enable RBF project" OFF)
option(ENABLE_BAMG "Enable Bamg mesh generator" ON) option(ENABLE_BAMG "Enable Bamg mesh generator" ON)
option(ENABLE_BFGS "Enable BFGS" ON) option(ENABLE_BFGS "Enable BFGS" ON)
option(ENABLE_BLAS_LAPACK "Use BLAS/Lapack for basic linear algebra" ON) option(ENABLE_BLAS_LAPACK "Use BLAS/Lapack for basic linear algebra" ON)
...@@ -50,6 +48,7 @@ option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ON) ...@@ -50,6 +48,7 @@ option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ON)
option(ENABLE_PLUGINS "Build the post-processing plugins" ON) option(ENABLE_PLUGINS "Build the post-processing plugins" ON)
option(ENABLE_POST "Build the post-processing module" ON) option(ENABLE_POST "Build the post-processing module" ON)
option(ENABLE_QT "Build QT GUI" OFF) option(ENABLE_QT "Build QT GUI" OFF)
option(ENABLE_RBF "Enable RBF project" OFF)
option(ENABLE_READLINE "Enable Readline in Lua prompt" ON) option(ENABLE_READLINE "Enable Readline in Lua prompt" ON)
option(ENABLE_SALOME "Enable Salome routines for CAD healing" ON) option(ENABLE_SALOME "Enable Salome routines for CAD healing" ON)
option(ENABLE_SLEPC "Enable SLEPc eigensolvers" ON) option(ENABLE_SLEPC "Enable SLEPc eigensolvers" ON)
......
...@@ -13,7 +13,8 @@ StringXNumber MathEvalOptions_Number[] = { ...@@ -13,7 +13,8 @@ StringXNumber MathEvalOptions_Number[] = {
{GMSH_FULLRC, "TimeStep", NULL, -1.}, {GMSH_FULLRC, "TimeStep", NULL, -1.},
{GMSH_FULLRC, "View", NULL, -1.}, {GMSH_FULLRC, "View", NULL, -1.},
{GMSH_FULLRC, "OtherTimeStep", NULL, -1.}, {GMSH_FULLRC, "OtherTimeStep", NULL, -1.},
{GMSH_FULLRC, "OtherView", NULL, -1.} {GMSH_FULLRC, "OtherView", NULL, -1.},
{GMSH_FULLRC, "ForceInterpolation", NULL, 0.}
}; };
StringXString MathEvalOptions_String[] = { StringXString MathEvalOptions_String[] = {
...@@ -90,6 +91,7 @@ PView *GMSH_MathEvalPlugin::execute(PView *view) ...@@ -90,6 +91,7 @@ PView *GMSH_MathEvalPlugin::execute(PView *view)
int iView = (int)MathEvalOptions_Number[1].def; int iView = (int)MathEvalOptions_Number[1].def;
int otherTimeStep = (int)MathEvalOptions_Number[2].def; int otherTimeStep = (int)MathEvalOptions_Number[2].def;
int iOtherView = (int)MathEvalOptions_Number[3].def; int iOtherView = (int)MathEvalOptions_Number[3].def;
int forceInterpolation = (int)MathEvalOptions_Number[4].def;
std::vector<std::string> expr(9); std::vector<std::string> expr(9);
for(int i = 0; i < 9; i++) expr[i] = MathEvalOptions_String[i].def; for(int i = 0; i < 9; i++) expr[i] = MathEvalOptions_String[i].def;
...@@ -118,7 +120,8 @@ PView *GMSH_MathEvalPlugin::execute(PView *view) ...@@ -118,7 +120,8 @@ PView *GMSH_MathEvalPlugin::execute(PView *view)
} }
OctreePost *octree = 0; OctreePost *octree = 0;
if((data1->getNumEntities() != otherData->getNumEntities()) || if(forceInterpolation ||
(data1->getNumEntities() != otherData->getNumEntities()) ||
(data1->getNumElements() != otherData->getNumElements())){ (data1->getNumElements() != otherData->getNumElements())){
Msg::Info("Other view based on different grid: interpolating..."); Msg::Info("Other view based on different grid: interpolating...");
octree = new OctreePost(otherView); octree = new OctreePost(otherView);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment