mirror of
https://github.com/NGSolve/netgen.git
synced 2024-11-15 02:18:33 +05:00
Merge branch 'master' into boundarylayer_fixes
This commit is contained in:
commit
03057420f7
@ -302,7 +302,6 @@ pip_windows:
|
||||
- .\tests\build_pip.ps1 C:\Python311
|
||||
- .\tests\build_pip.ps1 C:\Python310
|
||||
- .\tests\build_pip.ps1 C:\Python39
|
||||
- .\tests\build_pip.ps1 C:\Python38
|
||||
when: manual
|
||||
|
||||
pip_macos:
|
||||
@ -317,5 +316,4 @@ pip_macos:
|
||||
- ./tests/build_pip_mac.sh 3.11
|
||||
- ./tests/build_pip_mac.sh 3.10
|
||||
- ./tests/build_pip_mac.sh 3.9
|
||||
- ./tests/build_pip_mac.sh 3.8
|
||||
when: manual
|
||||
|
@ -561,6 +561,14 @@ namespace netgen
|
||||
el.SetIndex(m_.domain);
|
||||
mesh.AddVolumeElement(el);
|
||||
}
|
||||
for(const auto& [p1p2, idnr] : m.GetIdentifications().GetIdentifiedPoints())
|
||||
mesh.GetIdentifications().Add(pmap[p1p2[0]], pmap[p1p2[1]], idnr);
|
||||
for(auto i : Range(m.GetIdentifications().GetMaxNr()))
|
||||
{
|
||||
mesh.GetIdentifications().SetType(i+1, m.GetIdentifications().GetType(i+1));
|
||||
if(auto name = m.GetIdentifications().GetName(i+1); name != "")
|
||||
mesh.GetIdentifications().SetName(i+1, name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -86,7 +86,11 @@ DLL_HEADER void ExportNgOCC(py::module &m)
|
||||
try {
|
||||
if(p) std::rethrow_exception(p);
|
||||
} catch (const Standard_Failure& e) {
|
||||
#if (PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR < 12)
|
||||
exc((string(e.DynamicType()->Name()) + ": " + e.GetMessageString()).c_str());
|
||||
#else
|
||||
py::set_error(PyExc_RuntimeError, (string(e.DynamicType()->Name()) + ": " + e.GetMessageString()).c_str());
|
||||
#endif
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -13,7 +13,7 @@ dnf -y install ccache.rpm
|
||||
rm -rf wheelhouse
|
||||
export NETGEN_CCACHE=1
|
||||
|
||||
for pyversion in 313 312 311 310 39 38
|
||||
for pyversion in 313 312 311 310 39
|
||||
do
|
||||
export PYDIR="/opt/python/cp${pyversion}-cp${pyversion}/bin"
|
||||
echo $PYDIR
|
||||
|
Loading…
Reference in New Issue
Block a user