From 4e8fe77098075241a9cedb8e6702e0d7a69c0755 Mon Sep 17 00:00:00 2001 From: "mhochsteger@cerbsim.com" Date: Wed, 2 Mar 2022 14:14:38 +0100 Subject: [PATCH] fix some warnings --- libsrc/core/taskmanager.cpp | 2 +- libsrc/meshing/hprefinement.cpp | 8 ++++---- libsrc/meshing/meshing2.cpp | 2 +- libsrc/meshing/refine.cpp | 10 +++++----- libsrc/meshing/smoothing3.cpp | 4 ++-- libsrc/occ/occgeom.cpp | 26 +++++++++++++------------- libsrc/occ/python_occ_shapes.cpp | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libsrc/core/taskmanager.cpp b/libsrc/core/taskmanager.cpp index 419f7a08..875746ec 100644 --- a/libsrc/core/taskmanager.cpp +++ b/libsrc/core/taskmanager.cpp @@ -242,7 +242,7 @@ namespace ngcore TNestedTask (const function & _func, int _mynr, int _total, atomic & _endcnt, int prod_tid) - : func(&_func), mynr(_mynr), total(_total), endcnt(&_endcnt), producing_thread(prod_tid) + : func(&_func), mynr(_mynr), total(_total), producing_thread(prod_tid), endcnt(&_endcnt) { ; } diff --git a/libsrc/meshing/hprefinement.cpp b/libsrc/meshing/hprefinement.cpp index d27f7a29..e536d8a7 100644 --- a/libsrc/meshing/hprefinement.cpp +++ b/libsrc/meshing/hprefinement.cpp @@ -33,7 +33,7 @@ namespace netgen } HPRefElement :: HPRefElement(Element & el) : - np(el.GetNV()), index(el.GetIndex()), levelx(0), levely(0), levelz(0), type(HP_NONE), domin(-1), domout(-1) //domin,out for segements + type(HP_NONE), index(el.GetIndex()), levelx(0), levely(0), levelz(0), np(el.GetNV()), domin(-1), domout(-1) //domin,out for segements { //Reset(); for (int i=0; i & aboundingbox) - : geo(ageo), adfront(aboundingbox), boundingbox(aboundingbox) + : adfront(aboundingbox), boundingbox(aboundingbox), geo(ageo) { static Timer t("Mesing2::Meshing2"); RegionTimer r(t); diff --git a/libsrc/meshing/refine.cpp b/libsrc/meshing/refine.cpp index d8d49870..b745bf43 100644 --- a/libsrc/meshing/refine.cpp +++ b/libsrc/meshing/refine.cpp @@ -663,8 +663,8 @@ namespace netgen // if (elrev) // swap (pnums.Elem(3), pnums.Elem(4)); - for (int j = 0; j < 9; j++) - { + for (int j = 0; j < 9; j++) + { INDEX_2 i2; i2.I1() = pnums.Get(betw[j][0]); i2.I2() = pnums.Get(betw[j][1]); @@ -679,10 +679,10 @@ namespace netgen mesh.Point(i2.I2()))); between.Set (i2, pnums.Elem(7+j)); } - } + } - for (int j = 0; j < 3; j++) - { + for (int j = 0; j < 3; j++) + { INDEX_2 i2a, i2b; i2a.I1() = pnums.Get(fbetw[2*j][0]); i2a.I2() = pnums.Get(fbetw[2*j][1]); diff --git a/libsrc/meshing/smoothing3.cpp b/libsrc/meshing/smoothing3.cpp index 99c18839..165f37f1 100644 --- a/libsrc/meshing/smoothing3.cpp +++ b/libsrc/meshing/smoothing3.cpp @@ -338,7 +338,7 @@ namespace netgen : points(apoints), elements(aelements), elementsonpoint(* new Table()), own_elementsonpoint(true), mp(amp) { static Timer tim("PointFunction - build elementsonpoint table"); RegionTimer reg(tim); - elementsonpoint = std::move(ngcore::CreateSortedTable( elements.Range(), + elementsonpoint = ngcore::CreateSortedTable( elements.Range(), [&](auto & table, ElementIndex ei) { const auto & el = elements[ei]; @@ -348,7 +348,7 @@ namespace netgen for (PointIndex pi : el.PNums()) table.Add (pi, ei); - }, points.Size())); + }, points.Size()); } void PointFunction :: SetPointIndex (PointIndex aactpind) diff --git a/libsrc/occ/occgeom.cpp b/libsrc/occ/occgeom.cpp index ea1d138d..097d93fe 100644 --- a/libsrc/occ/occgeom.cpp +++ b/libsrc/occ/occgeom.cpp @@ -203,20 +203,20 @@ namespace netgen if(auto quad_dominated = OCCGeometry::global_shape_properties[face.TShape()].quad_dominated; quad_dominated.has_value()) local_mp.quad = *quad_dominated; - bool failed = OCCMeshFace(*this, mesh, glob2loc, local_mp, nr, PARAMETERSPACE, true); - if(failed) - failed = OCCMeshFace(*this, mesh, glob2loc, local_mp, nr, PLANESPACE, false); + bool failed = OCCMeshFace(*this, mesh, glob2loc, local_mp, nr, PARAMETERSPACE, true); + if(failed) + failed = OCCMeshFace(*this, mesh, glob2loc, local_mp, nr, PLANESPACE, false); - if(failed) - { - facemeshstatus[nr] = -1; - PrintError ("Problem in Surface mesh generation"); - } - else - { - facemeshstatus[nr] = 1; - } - return failed; + if(failed) + { + facemeshstatus[nr] = -1; + PrintError ("Problem in Surface mesh generation"); + } + else + { + facemeshstatus[nr] = 1; + } + return failed; } void OCCGeometry :: PrintNrShapes () diff --git a/libsrc/occ/python_occ_shapes.cpp b/libsrc/occ/python_occ_shapes.cpp index efcc112b..86a5ebc2 100644 --- a/libsrc/occ/python_occ_shapes.cpp +++ b/libsrc/occ/python_occ_shapes.cpp @@ -2372,7 +2372,7 @@ degen_tol : double vector wires; for(auto& w : *swires) wires.push_back(TopoDS::Wire(w)); - return std::move(wires); + return wires; }, py::arg("edges"), py::arg("tol")=1e-8, py::arg("shared")=true); py::class_> (m, "WorkPlane")