diff --git a/Common/Makefile b/Common/Makefile index 38bca42334f0be7167e52e2089d369a74fa2e406..979bdcdc8666c2ce4a88f311e8eb581521fb214d 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -90,9 +90,9 @@ Options${OBJEXT}: Options.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \ DefaultOptions.h ../Mesh/Field.h ../Post/PView.h \ ../Mesh/BackgroundMesh.h ../Post/PViewOptions.h ../Post/ColorTable.h \ ../Post/PViewData.h ../Numeric/GmshMatrix.h ../Common/GmshMessage.h \ - ../Post/adaptiveData.h ../Common/ListUtils.h ../Plugin/PluginManager.h \ - ../Plugin/Plugin.h ../Common/Options.h ../Post/PViewDataList.h \ - ../Post/PViewData.h ../Fltk/GUI.h ../Fltk/Solvers.h \ + ../Post/adaptiveData.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \ + ../Common/Options.h ../Post/PViewDataList.h ../Post/PViewData.h \ + ../Common/ListUtils.h ../Fltk/GUI.h ../Fltk/Solvers.h \ ../Fltk/menuWindow.h ../Fltk/popupButton.h ../Fltk/graphicWindow.h \ ../Fltk/openglWindow.h ../Graphics/drawContext.h ../Fltk/optionWindow.h \ ../Fltk/spherePositionWidget.h ../Fltk/colorbarWindow.h \ diff --git a/Post/Makefile b/Post/Makefile index 871477d8c9684513cd6bf7843455b17d01b2d5bb..36d3fd23bb253ac4e03d66e5f04c43dd84ff494a 100644 --- a/Post/Makefile +++ b/Post/Makefile @@ -122,11 +122,11 @@ PViewDataGModelIO${OBJEXT}: PViewDataGModelIO.cpp ../Common/GmshMessage.h \ ../Common/StringUtils.h PViewOptions${OBJEXT}: PViewOptions.cpp PViewOptions.h ColorTable.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshMessage.h -adaptiveData${OBJEXT}: adaptiveData.cpp ../Plugin/Plugin.h ../Common/Options.h \ - ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \ - ../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \ - ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h adaptiveData.h +adaptiveData${OBJEXT}: adaptiveData.cpp adaptiveData.h ../Numeric/GmshMatrix.h \ + ../Common/GmshMessage.h ../Plugin/Plugin.h ../Common/Options.h \ + ../Post/ColorTable.h ../Post/PView.h ../Geo/SPoint3.h \ + ../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \ + ../Geo/SPoint3.h ../Common/ListUtils.h OctreePost${OBJEXT}: OctreePost.cpp ../Common/Octree.h \ ../Common/OctreeInternals.h OctreePost.h ../Common/ListUtils.h PView.h \ ../Geo/SPoint3.h PViewDataList.h PViewData.h ../Geo/SBoundingBox3d.h \ diff --git a/Post/adaptiveData.cpp b/Post/adaptiveData.cpp index bd88a3b8ef18b59ebdd2579fb935da348c3ebd02..fc0363825bda8e6aceb774f91292b844f955b9d6 100644 --- a/Post/adaptiveData.cpp +++ b/Post/adaptiveData.cpp @@ -872,14 +872,16 @@ void adaptiveElements<T>::init(int level) it != T::allPoints.end(); ++it) { if(_coeffsVal && _eexpsVal) - computeShapeFunctions(_coeffsVal, _eexpsVal, it->x, it->y, it->z, &sfv, tmpv); + computeShapeFunctions(_coeffsVal, _eexpsVal, + it->x, it->y, it->z, &sfv, tmpv); else T::GSF(it->x, it->y, it->z, sfv); for(int j = 0; j < numVals; j++) (*_interpolVal)(i, j) = sfv(j); if(_coeffsGeom && _eexpsGeom) - computeShapeFunctions(_coeffsGeom, _eexpsGeom, it->x, it->y, it->z, &sfg, tmpg); + computeShapeFunctions(_coeffsGeom, _eexpsGeom, + it->x, it->y, it->z, &sfg, tmpg); else T::GSF(it->x, it->y, it->z, sfg); for(int j = 0; j < numNodes; j++) @@ -1155,7 +1157,8 @@ adaptiveData::~adaptiveData() delete _outData; } -void adaptiveData::changeResolution(int step, int level, double tol, GMSH_Post_Plugin *plug) +void adaptiveData::changeResolution(int step, int level, double tol, + GMSH_Post_Plugin *plug) { if(_level != level){ if(_lines) _lines->init(level); diff --git a/Post/adaptiveData.h b/Post/adaptiveData.h index 500fceb7ae266ebd2c7f4e408daeac9774f8756d..ba2fee41750cb8124682efab560de0478354cc52 100644 --- a/Post/adaptiveData.h +++ b/Post/adaptiveData.h @@ -8,7 +8,7 @@ #include <list> #include <set> -#include "ListUtils.h" +#include <vector> #include "GmshMatrix.h" class PViewData;