ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 04:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix some warnings

Browse Source
This commit is contained in:
mhochsteger@cerbsim.com 2022-03-02 14:14:38 +01:00
parent aeb6a17255
commit 4e8fe77098
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/core/taskmanager.cpp
View File

@ -242,7 +242,7 @@ namespace ngcore
TNestedTask (const function<void(TaskInfo&)> & _func,
int _mynr, int _total,
atomic<int> & _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)
{
;
}

8
libsrc/meshing/hprefinement.cpp
View File

@ -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<np ; i++)
@ -48,7 +48,7 @@ namespace netgen
HPRefElement :: HPRefElement(Element2d & el) :
levelx(0), levely(0), levelz(0), type(HP_NONE), index(el.GetIndex()), np(el.GetNV()), 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();
@ -63,7 +63,7 @@ namespace netgen
}
HPRefElement :: HPRefElement(Segment & el) :
levelx(0), levely(0), levelz(0), type(HP_NONE), np(2), domin(el.domin), domout(el.domout), singedge_left(el.singedge_left), singedge_right(el.singedge_right)
type(HP_NONE), levelx(0), levely(0), levelz(0), np(2), domin(el.domin), domout(el.domout), singedge_left(el.singedge_left), singedge_right(el.singedge_right)
{
//Reset();
for (int i=0; i<np ; i++)
@ -84,7 +84,7 @@ namespace netgen
}
HPRefElement :: HPRefElement(HPRefElement & el) :
np(el.np), levelx(el.levelx), levely(el.levely), levelz(el.levelz), type(el.type), domin(el.domin), domout(el.domout), index(el.index), si(el.si), coarse_elnr(el.coarse_elnr), singedge_left(el.singedge_left), singedge_right(el.singedge_right)
type(el.type), index(el.index), si(el.si), levelx(el.levelx), levely(el.levely), levelz(el.levelz), np(el.np), coarse_elnr(el.coarse_elnr), domin(el.domin), domout(el.domout), singedge_left(el.singedge_left), singedge_right(el.singedge_right)
{
//Reset();

2
libsrc/meshing/meshing2.cpp
View File

@ -41,7 +41,7 @@ namespace netgen
Meshing2 :: Meshing2 (const NetgenGeometry& ageo,
const MeshingParameters & mp,
const Box<3> & aboundingbox)
: geo(ageo), adfront(aboundingbox), boundingbox(aboundingbox)
: adfront(aboundingbox), boundingbox(aboundingbox), geo(ageo)
{
static Timer t("Mesing2::Meshing2"); RegionTimer r(t);

10
libsrc/meshing/refine.cpp
View File

@ -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]);

4
libsrc/meshing/smoothing3.cpp
View File

@ -338,7 +338,7 @@ namespace netgen
: points(apoints), elements(aelements), elementsonpoint(* new Table<int,PointIndex>()), own_elementsonpoint(true), mp(amp)
{
static Timer tim("PointFunction - build elementsonpoint table"); RegionTimer reg(tim);
elementsonpoint = std::move(ngcore::CreateSortedTable<int, PointIndex>( elements.Range(),
elementsonpoint = ngcore::CreateSortedTable<int, PointIndex>( 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)

26
libsrc/occ/occgeom.cpp
View File

@ -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 ()

2
libsrc/occ/python_occ_shapes.cpp
View File

@ -2372,7 +2372,7 @@ degen_tol : double
vector<TopoDS_Wire> 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_<WorkPlane, shared_ptr<WorkPlane>> (m, "WorkPlane")