Bug correction in -optim option (without hmin/hmax specification).

MmgTools · Apr 11, 2017 · 88107da · 88107da
1 parent 0397bfb
commit 88107da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,8 +32,8 @@ PROJECT (mmg)
 ###############################################################################
 SET (CMAKE_RELEASE_VERSION_MAJOR "5" )
 SET (CMAKE_RELEASE_VERSION_MINOR "2" )
-SET (CMAKE_RELEASE_VERSION_PATCH "4" )
-SET (CMAKE_RELEASE_DATE "Mar 22, 2017" )
+SET (CMAKE_RELEASE_VERSION_PATCH "5" )
+SET (CMAKE_RELEASE_DATE "Apr. 10, 2017" )
 
 SET (CMAKE_RELEASE_VERSION
  "${CMAKE_RELEASE_VERSION_MAJOR}.${CMAKE_RELEASE_VERSION_MINOR}.${CMAKE_RELEASE_VERSION_PATCH}")

diff --git a/src/common/mmgcommon.h b/src/common/mmgcommon.h
@@ -55,8 +55,8 @@ extern "C" {
 #include "eigenv.h"
 #include "libmmgcommon.h"
 
-#define MG_VER "5.2.3"
-#define MG_REL "Mar 17, 2017"
+#define MG_VER "5.2.5"
+#define MG_REL "Apr. 10, 2017"
 #define MG_CPY "Copyright (c) IMB-LJLL, 2004-"
 #define MG_STR "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"
 

diff --git a/src/mmg3d/libmmg3d.c b/src/mmg3d/libmmg3d.c
@@ -99,14 +99,14 @@ void _MMG3D_scalarSolTruncature(MMG5_pMesh mesh, MMG5_pSol met) {
  /* Detect the point used only by prisms */
  if ( mesh->nprism ) {
  for (k=1; k<=mesh->np; k++) {
- mesh->point[k].flag = 0;
+ mesh->point[k].flag = 1;
  }
  for (k=1; k<=mesh->ne; k++) {
  pt = &mesh->tetra[k];
  if ( !MG_EOK(pt) ) continue;
 
  for (i=0; i<4; i++) {
- mesh->point[pt->v[i]].flag = 1;
+ mesh->point[pt->v[i]].flag = 0;
  }
 
  }
@@ -121,7 +121,7 @@ void _MMG3D_scalarSolTruncature(MMG5_pMesh mesh, MMG5_pSol met) {
  mesh->info.hmin = FLT_MAX;
  for (k=1; k<=mesh->np; k++) {
  ppt = &mesh->point[k];
- if ( !MG_VOK(ppt) || !ppt->flag ) continue;
+ if ( !MG_VOK(ppt) || ppt->flag ) continue;
  mesh->info.hmin = MG_MIN(mesh->info.hmin,met->m[k]);
  }
  }
@@ -130,7 +130,7 @@ void _MMG3D_scalarSolTruncature(MMG5_pMesh mesh, MMG5_pSol met) {
  mesh->info.hmax = 0.;
  for (k=1; k<=mesh->np; k++) {
  ppt = &mesh->point[k];
- if ( !MG_VOK(ppt) || !ppt->flag ) continue;
+ if ( !MG_VOK(ppt) || ppt->flag ) continue;
  mesh->info.hmax = MG_MAX(mesh->info.hmax,met->m[k]);
  }
  }