From: eap <eap@opencascade.com>
Date: Thu, 5 Jul 2012 10:14:43 +0000 (+0000)
Subject: 0021676: EDF 2283 NETGENPLUGIN: Improve Netgen 1D-2D-3D to generate pyramids in case... 
X-Git-Tag: V6_6_0a1~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=48519d8868014f80bcaf5f192e5119f28c29b17d;p=plugins%2Fnetgenplugin.git

0021676: EDF 2283 NETGENPLUGIN: Improve Netgen 1D-2D-3D to generate pyramids in case where input 2D mesh includes quadrangles

  Fix passing GetQuadAllowed() parameter
---

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index c4320fc..9249d95 100644
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -206,10 +206,9 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
     // create elements of second order
     mparams.secondorder = hyp->GetSecondOrder() ? 1 : 0;
     // quad-dominated surface meshing
-    // only triangles are allowed for volumic mesh
+    // only triangles are allowed for volumic mesh (before realizing IMP 0021676)
     //if (!_isVolume)
-      mparams.quad = static_cast<const NETGENPlugin_Hypothesis_2D*>
-        (hyp)->GetQuadAllowed() ? 1 : 0;
+      mparams.quad = hyp->GetQuadAllowed() ? 1 : 0;
     _optimize = hyp->GetOptimize();
     _fineness = hyp->GetFineness();
     _simpleHyp = NULL;
@@ -1823,6 +1822,7 @@ bool NETGENPlugin_Mesher::Compute()
           " elements per radius = " << mparams.curvaturesafety << "\n"
           " second order = " << mparams.secondorder << "\n"
           " quad allowed = " << mparams.quad);
+  cout << " quad allowed = " << mparams.quad<<endl;
 
   SMESH_ComputeErrorPtr error = SMESH_ComputeError::New();