ngsolve 6.2.2506.post45.dev0__cp313-cp313-macosx_10_15_universal2.whl → 6.2.2506.post73.dev0__cp313-cp313-macosx_10_15_universal2.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of ngsolve might be problematic. Click here for more details.

Files changed (64) hide show
  1. netgen/include/bdbequations.hpp +33 -0
  2. netgen/include/diffopwithfactor.hpp +123 -0
  3. netgen/include/kernels.hpp +98 -110
  4. netgen/include/mp_coefficient.hpp +2 -2
  5. netgen/include/mptools.hpp +45 -26
  6. netgen/include/preconditioner.hpp +2 -2
  7. netgen/libngbla.dylib +0 -0
  8. netgen/libngcomp.dylib +0 -0
  9. netgen/libngfem.dylib +0 -0
  10. netgen/libngla.dylib +0 -0
  11. netgen/libngsbem.dylib +0 -0
  12. netgen/libngstd.dylib +0 -0
  13. ngsolve/__init__.pyi +2 -2
  14. ngsolve/bla.pyi +1 -0
  15. ngsolve/cmake/NGSolveConfig.cmake +5 -5
  16. ngsolve/comp/__init__.pyi +1 -1
  17. ngsolve/config/__init__.pyi +6 -6
  18. ngsolve/config/config.py +5 -5
  19. ngsolve/config/config.pyi +6 -6
  20. ngsolve/directsolvers.pyi +1 -1
  21. ngsolve/krylovspace.pyi +2 -2
  22. ngsolve/nonlinearsolvers.pyi +1 -1
  23. ngsolve/solve_implementation.py +10 -1
  24. ngsolve/solve_implementation.pyi +4 -4
  25. ngsolve/timestepping.pyi +3 -3
  26. ngsolve/timing.pyi +1 -1
  27. {ngsolve-6.2.2506.post45.dev0.dist-info → ngsolve-6.2.2506.post73.dev0.dist-info}/METADATA +2 -2
  28. {ngsolve-6.2.2506.post45.dev0.dist-info → ngsolve-6.2.2506.post73.dev0.dist-info}/RECORD +64 -63
  29. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/Netgen.icns +0 -0
  30. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/bin/ngscxx +0 -0
  31. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/bin/ngsld +0 -0
  32. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/bin/ngsolve.tcl +0 -0
  33. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/bin/ngspy +0 -0
  34. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/beam.geo +0 -0
  35. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/beam.vol +0 -0
  36. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/chip.in2d +0 -0
  37. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/chip.vol +0 -0
  38. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/coil.geo +0 -0
  39. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/coil.vol +0 -0
  40. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/coilshield.geo +0 -0
  41. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/coilshield.vol +0 -0
  42. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/cube.geo +0 -0
  43. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/cube.vol +0 -0
  44. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d10_DGdoubleglazing.pde +0 -0
  45. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d11_chip_nitsche.pde +0 -0
  46. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d1_square.pde +0 -0
  47. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d2_chip.pde +0 -0
  48. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d3_helmholtz.pde +0 -0
  49. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d4_cube.pde +0 -0
  50. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d5_beam.pde +0 -0
  51. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d6_shaft.pde +0 -0
  52. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d7_coil.pde +0 -0
  53. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d8_coilshield.pde +0 -0
  54. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/d9_hybridDG.pde +0 -0
  55. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/doubleglazing.in2d +0 -0
  56. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/doubleglazing.vol +0 -0
  57. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/piezo2d40round4.vol.gz +0 -0
  58. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/shaft.geo +0 -0
  59. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/shaft.vol +0 -0
  60. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/square.in2d +0 -0
  61. {ngsolve-6.2.2506.post45.dev0.data → ngsolve-6.2.2506.post73.dev0.data}/data/share/ngsolve/square.vol +0 -0
  62. {ngsolve-6.2.2506.post45.dev0.dist-info → ngsolve-6.2.2506.post73.dev0.dist-info}/LICENSE +0 -0
  63. {ngsolve-6.2.2506.post45.dev0.dist-info → ngsolve-6.2.2506.post73.dev0.dist-info}/WHEEL +0 -0
  64. {ngsolve-6.2.2506.post45.dev0.dist-info → ngsolve-6.2.2506.post73.dev0.dist-info}/top_level.txt +0 -0
@@ -58,6 +58,15 @@ namespace ngsbem
58
58
 
59
59
 
60
60
 
61
+ class FMM_Parameters
62
+ {
63
+ public:
64
+ int maxdirect = 100;
65
+ int minorder = 20; // order = minorder + 2 kappa r
66
+ };
67
+
68
+
69
+
61
70
 
62
71
  inline std::tuple<double, double, double> SphericalCoordinates(Vec<3> dist){
63
72
  double len, theta, phi;
@@ -516,12 +525,14 @@ namespace ngsbem
516
525
 
517
526
  // ***************** parameters ****************
518
527
 
528
+ /*
519
529
  static constexpr int MPOrder (double rho_kappa)
520
530
  {
521
531
  // return max (20, int(2*rho_kappa));
522
532
  return 20+int(2*rho_kappa);
523
533
  }
524
534
  static constexpr int maxdirect = 100;
535
+ */
525
536
 
526
537
 
527
538
  template <typename SCAL, auto S>
@@ -665,11 +676,13 @@ namespace ngsbem
665
676
  Vec<3,SIMD<double,FMM_SW>>, simd_entry_type>> simd_chargedipoles;
666
677
 
667
678
  int total_sources;
679
+ const FMM_Parameters & fmm_params;
668
680
  std::mutex node_mutex;
669
681
  atomic<bool> have_childs{false};
670
682
 
671
- Node (Vec<3> acenter, double ar, int alevel, double akappa)
672
- : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*akappa), akappa, ar) // min(1.0, ar*akappa))
683
+ Node (Vec<3> acenter, double ar, int alevel, double akappa, const FMM_Parameters & afmm_params)
684
+ // : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*akappa), akappa, ar), fmm_params(afmm_params)
685
+ : center(acenter), r(ar), level(alevel), mp(afmm_params.minorder+2*ar*akappa, akappa, ar), fmm_params(afmm_params)
673
686
  {
674
687
  if (level < nodes_on_level.Size())
675
688
  nodes_on_level[level]++;
@@ -693,7 +706,7 @@ namespace ngsbem
693
706
  cc(0) += (i&1) ? r/2 : -r/2;
694
707
  cc(1) += (i&2) ? r/2 : -r/2;
695
708
  cc(2) += (i&4) ? r/2 : -r/2;
696
- childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
709
+ childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa(), fmm_params);
697
710
  }
698
711
  have_childs = true;
699
712
  }
@@ -742,7 +755,7 @@ namespace ngsbem
742
755
 
743
756
  // if (r*mp.Kappa() < 1e-8) return;
744
757
  if (level > 20) return;
745
- if (charges.Size() < maxdirect && r*mp.Kappa() < 5)
758
+ if (charges.Size() < fmm_params.maxdirect && r*mp.Kappa() < 5)
746
759
  return;
747
760
 
748
761
  SendSourcesToChilds();
@@ -772,7 +785,7 @@ namespace ngsbem
772
785
  dipoles.Append (tuple{x,d,c});
773
786
 
774
787
  if (level > 20) return;
775
- if (dipoles.Size() < maxdirect)
788
+ if (dipoles.Size() < fmm_params.maxdirect)
776
789
  return;
777
790
 
778
791
  SendSourcesToChilds();
@@ -801,7 +814,7 @@ namespace ngsbem
801
814
 
802
815
  chargedipoles.Append (tuple{x,c,dir,c2});
803
816
 
804
- if (chargedipoles.Size() < maxdirect || r < 1e-8)
817
+ if (chargedipoles.Size() < fmm_params.maxdirect || r < 1e-8)
805
818
  return;
806
819
 
807
820
  SendSourcesToChilds();
@@ -1269,12 +1282,13 @@ namespace ngsbem
1269
1282
  }
1270
1283
  };
1271
1284
 
1272
- Node root;
1285
+ FMM_Parameters fmm_params;
1286
+ Node root;
1273
1287
  bool havemp = false;
1274
1288
 
1275
1289
  public:
1276
- SingularMLExpansion (Vec<3> center, double r, double kappa)
1277
- : root(center, r, 0, kappa)
1290
+ SingularMLExpansion (Vec<3> center, double r, double kappa, FMM_Parameters _params = FMM_Parameters())
1291
+ : fmm_params(_params), root(center, r, 0, kappa, fmm_params)
1278
1292
  {
1279
1293
  nodes_on_level = 0;
1280
1294
  nodes_on_level[0] = 1;
@@ -1661,11 +1675,13 @@ namespace ngsbem
1661
1675
  atomic<bool> have_childs{false};
1662
1676
 
1663
1677
  Array<const typename SingularMLExpansion<elem_type>::Node*> singnodes;
1678
+ const FMM_Parameters & params;
1664
1679
 
1665
- Node (Vec<3> acenter, double ar, int alevel, double kappa)
1680
+
1681
+ Node (Vec<3> acenter, double ar, int alevel, double kappa, const FMM_Parameters & _params)
1666
1682
  : center(acenter), r(ar), level(alevel),
1667
1683
  // mp(MPOrder(ar*kappa), kappa, ar) // 1.0/min(1.0, 0.25*r*kappa))
1668
- mp(-1, kappa, ar)
1684
+ mp(-1, kappa, ar), params(_params)
1669
1685
  // : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*kappa), kappa, 1.0)
1670
1686
  {
1671
1687
  if (level < nodes_on_level.Size())
@@ -1674,7 +1690,8 @@ namespace ngsbem
1674
1690
 
1675
1691
  void Allocate()
1676
1692
  {
1677
- mp = SphericalExpansion<Regular,elem_type>(MPOrder(r*mp.Kappa()), mp.Kappa(), r);
1693
+ // mp = SphericalExpansion<Regular,elem_type>(MPOrder(r*mp.Kappa()), mp.Kappa(), r);
1694
+ mp = SphericalExpansion<Regular,elem_type>(params.minorder+2*r*mp.Kappa(), mp.Kappa(), r);
1678
1695
  }
1679
1696
 
1680
1697
 
@@ -1688,7 +1705,7 @@ namespace ngsbem
1688
1705
  cc(0) += (i&1) ? r/2 : -r/2;
1689
1706
  cc(1) += (i&2) ? r/2 : -r/2;
1690
1707
  cc(2) += (i&4) ? r/2 : -r/2;
1691
- childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
1708
+ childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa(), params);
1692
1709
  if (allocate)
1693
1710
  childs[i] -> Allocate();
1694
1711
  }
@@ -1909,7 +1926,7 @@ namespace ngsbem
1909
1926
 
1910
1927
  // if (r*mp.Kappa() < 1e-8) return;
1911
1928
  if (level > 20) return;
1912
- if (targets.Size() < maxdirect && r*mp.Kappa() < 5)
1929
+ if (targets.Size() < params.maxdirect && r*mp.Kappa() < 5)
1913
1930
  return;
1914
1931
 
1915
1932
  CreateChilds();
@@ -1949,7 +1966,7 @@ namespace ngsbem
1949
1966
  vol_targets.Append (tuple(x,tr));
1950
1967
 
1951
1968
  if (level > 20) return;
1952
- if (vol_targets.Size() < maxdirect && (r*mp.Kappa() < 5))
1969
+ if (vol_targets.Size() < params.maxdirect && (r*mp.Kappa() < 5))
1953
1970
  return;
1954
1971
 
1955
1972
  CreateChilds();
@@ -2018,14 +2035,16 @@ namespace ngsbem
2018
2035
  }
2019
2036
 
2020
2037
  };
2021
-
2038
+
2039
+ FMM_Parameters fmm_params;
2022
2040
  Node root;
2023
2041
  shared_ptr<SingularMLExpansion<elem_type>> singmp;
2024
2042
 
2025
2043
  public:
2026
- RegularMLExpansion (shared_ptr<SingularMLExpansion<elem_type>> asingmp, Vec<3> center, double r)
2027
- : root(center, r, 0, asingmp->Kappa()), singmp(asingmp)
2028
- {
2044
+ RegularMLExpansion (shared_ptr<SingularMLExpansion<elem_type>> asingmp, Vec<3> center, double r,
2045
+ const FMM_Parameters & _params)
2046
+ : fmm_params(_params), root(center, r, 0, asingmp->Kappa(), fmm_params), singmp(asingmp)
2047
+ {
2029
2048
  if (!singmp->havemp) throw Exception("first call Calc for singular MP");
2030
2049
  root.Allocate();
2031
2050
 
@@ -2054,13 +2073,13 @@ namespace ngsbem
2054
2073
  }
2055
2074
  }
2056
2075
 
2057
- RegularMLExpansion (Vec<3> center, double r, double kappa)
2058
- : root(center, r, 0, kappa)
2059
- {
2060
- nodes_on_level = 0;
2061
- nodes_on_level[0] = 1;
2062
- }
2063
-
2076
+ RegularMLExpansion (Vec<3> center, double r, double kappa, const FMM_Parameters & _params)
2077
+ : fmm_params(_params), root(center, r, 0, kappa, fmm_params)
2078
+ {
2079
+ nodes_on_level = 0;
2080
+ nodes_on_level[0] = 1;
2081
+ }
2082
+
2064
2083
  void AddTarget (Vec<3> t)
2065
2084
  {
2066
2085
  root.AddTarget (t);
@@ -414,7 +414,7 @@ namespace ngcomp
414
414
  ///
415
415
  // MGPreconditioner * low_order_preconditioner;
416
416
  ///
417
- shared_ptr<Preconditioner> coarse_pre;
417
+ shared_ptr<BaseMatrix> coarse_pre;
418
418
  ///
419
419
  int finesmoothingsteps;
420
420
  ///
@@ -462,7 +462,7 @@ namespace ngcomp
462
462
  void MgTest () const;
463
463
 
464
464
  void SetDirectSolverCluster(shared_ptr<Array<int>> cluster);
465
- void SetCoarsePreconditioner(shared_ptr<Preconditioner> prec);
465
+ void SetCoarsePreconditioner(shared_ptr<BaseMatrix> prec);
466
466
  };
467
467
 
468
468
  class CommutingAMGPreconditioner : public Preconditioner
netgen/libngbla.dylib CHANGED
Binary file
netgen/libngcomp.dylib CHANGED
Binary file
netgen/libngfem.dylib CHANGED
Binary file
netgen/libngla.dylib CHANGED
Binary file
netgen/libngsbem.dylib CHANGED
Binary file
netgen/libngstd.dylib CHANGED
Binary file
ngsolve/__init__.pyi CHANGED
@@ -88,8 +88,8 @@ from ngsolve.fem import BSpline
88
88
  from ngsolve.fem import BlockBFI
89
89
  from ngsolve.fem import BlockLFI
90
90
  from ngsolve.fem import CacheCF
91
- from ngsolve.fem import CoefficientFunction as CF
92
91
  from ngsolve.fem import CoefficientFunction
92
+ from ngsolve.fem import CoefficientFunction as CF
93
93
  from ngsolve.fem import Cof
94
94
  from ngsolve.fem import CompoundBFI
95
95
  from ngsolve.fem import CompoundLFI
@@ -219,7 +219,7 @@ TET: fem.ET # value = <ET.TET: 20>
219
219
  TRIG: fem.ET # value = <ET.TRIG: 10>
220
220
  VERTEX: fem.NODE_TYPE # value = <NODE_TYPE.VERTEX: 0>
221
221
  VOL: comp.VorB # value = <VorB.VOL: 0>
222
- __version__: str = '6.2.2506-45-g573446995'
222
+ __version__: str = '6.2.2506-73-g12fb35d80'
223
223
  ds: comp.DifferentialSymbol # value = <ngsolve.comp.DifferentialSymbol object>
224
224
  dx: comp.DifferentialSymbol # value = <ngsolve.comp.DifferentialSymbol object>
225
225
  ngsglobals: comp.GlobalVariables # value = <ngsolve.comp.GlobalVariables object>
ngsolve/bla.pyi CHANGED
@@ -4,6 +4,7 @@ pybind bla
4
4
  from __future__ import annotations
5
5
  import numpy
6
6
  import typing
7
+ import typing_extensions
7
8
  __all__ = ['CheckPerformance', 'FlatMatrixC', 'FlatMatrixD', 'FlatVectorC', 'FlatVectorD', 'InnerProduct', 'Mat2C', 'Mat2D', 'Mat3C', 'Mat3D', 'Matrix', 'MatrixC', 'MatrixD', 'Norm', 'SliceVectorC', 'SliceVectorD', 'SparseVector', 'Vec1D', 'Vec2D', 'Vec3D', 'Vector', 'VectorC', 'VectorD']
8
9
  class FlatMatrixC:
9
10
  @typing.overload
@@ -1,4 +1,4 @@
1
- set(PACKAGE_VERSION "6.2.2506-45-g573446995")
1
+ set(PACKAGE_VERSION "6.2.2506-73-g12fb35d80")
2
2
  find_package(Netgen CONFIG REQUIRED HINTS
3
3
  ${CMAKE_CURRENT_LIST_DIR}
4
4
  ${CMAKE_CURRENT_LIST_DIR}/..
@@ -23,15 +23,15 @@ set(NGSOLVE_PYBIND_INCLUDE_DIR "")
23
23
  set(NGSOLVE_PYTHON_INCLUDE_DIRS "/Library/Frameworks/Python.framework/Versions/3.13/include/python3.13")
24
24
  set(NGSOLVE_PYTHON_LIBRARIES "/Library/Frameworks/Python.framework/Versions/3.13/lib/libpython3.13.dylib")
25
25
  set(NGSOLVE_PYTHON_PACKAGES_INSTALL_DIR "")
26
- set(NGSOLVE_TCL_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.13/cmake-build/dependencies/src/project_tcl/generic")
26
+ set(NGSOLVE_TCL_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.13/cmake-build/dependencies/src/project_tcl/generic")
27
27
  set(NGSOLVE_TCL_LIBRARY "/Library/Frameworks/Python.framework/Versions/3.13/Frameworks/Tcl.framework/libtclstub8.6.a")
28
28
  set(NGSOLVE_TK_DND_LIBRARY "")
29
- set(NGSOLVE_TK_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.13/cmake-build/dependencies/src/project_tk/generic")
29
+ set(NGSOLVE_TK_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.13/cmake-build/dependencies/src/project_tk/generic")
30
30
  set(NGSOLVE_TK_LIBRARY "/Library/Frameworks/Python.framework/Versions/3.13/Frameworks/Tk.framework/libtkstub8.6.a")
31
31
  set(NGSOLVE_X11_X11_LIB "")
32
32
  set(NGSOLVE_X11_Xmu_LIB "")
33
- set(NGSOLVE_ZLIB_INCLUDE_DIRS "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.13/cmake-build/dependencies/zlib/include")
34
- set(NGSOLVE_ZLIB_LIBRARIES "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.13/cmake-build/dependencies/zlib/lib/libz.a")
33
+ set(NGSOLVE_ZLIB_INCLUDE_DIRS "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.13/cmake-build/dependencies/zlib/include")
34
+ set(NGSOLVE_ZLIB_LIBRARIES "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.13/cmake-build/dependencies/zlib/lib/libz.a")
35
35
 
36
36
  set(NGSOLVE_INTEL_MIC OFF)
37
37
  set(NGSOLVE_USE_CCACHE ON)
ngsolve/comp/__init__.pyi CHANGED
@@ -3174,7 +3174,7 @@ class MultiGridPreconditioner(Preconditioner):
3174
3174
  ...
3175
3175
  def SetDirectSolverCluster(self, arg0: list) -> None:
3176
3176
  ...
3177
- def __init__(self, bf: BilinearForm, name: str = 'multigrid', lo_preconditioner: Preconditioner | None = None, **kwargs) -> None:
3177
+ def __init__(self, bf: BilinearForm, name: str = 'multigrid', lo_preconditioner: BaseMatrix | None = None, **kwargs) -> None:
3178
3178
  ...
3179
3179
  class NGS_Object:
3180
3180
  name: str
@@ -24,14 +24,14 @@ NGSOLVE_INSTALL_DIR_INCLUDE: str = 'netgen/include'
24
24
  NGSOLVE_INSTALL_DIR_LIB: str = 'netgen'
25
25
  NGSOLVE_INSTALL_DIR_PYTHON: str = '.'
26
26
  NGSOLVE_INSTALL_DIR_RES: str = 'share'
27
- NGSOLVE_VERSION: str = '6.2.2506-45-g573446995'
28
- NGSOLVE_VERSION_GIT: str = 'v6.2.2506-45-g573446995'
29
- NGSOLVE_VERSION_HASH: str = 'g573446995'
27
+ NGSOLVE_VERSION: str = '6.2.2506-73-g12fb35d80'
28
+ NGSOLVE_VERSION_GIT: str = 'v6.2.2506-73-g12fb35d80'
29
+ NGSOLVE_VERSION_HASH: str = 'g12fb35d80'
30
30
  NGSOLVE_VERSION_MAJOR: str = '6'
31
31
  NGSOLVE_VERSION_MINOR: str = '2'
32
32
  NGSOLVE_VERSION_PATCH: str = '2506'
33
- NGSOLVE_VERSION_PYTHON: str = '6.2.2506.post45.dev0'
34
- NGSOLVE_VERSION_TWEAK: str = '45'
33
+ NGSOLVE_VERSION_PYTHON: str = '6.2.2506.post73.dev0'
34
+ NGSOLVE_VERSION_TWEAK: str = '73'
35
35
  USE_CCACHE: bool = True
36
36
  USE_HYPRE: bool = False
37
37
  USE_LAPACK: bool = True
@@ -40,4 +40,4 @@ USE_MUMPS: bool = False
40
40
  USE_PARDISO: bool = False
41
41
  USE_UMFPACK: bool = True
42
42
  is_python_package: bool = True
43
- version: str = 'v6.2.2506-45-g573446995'
43
+ version: str = 'v6.2.2506-73-g12fb35d80'
ngsolve/config/config.py CHANGED
@@ -29,15 +29,15 @@ NGSOLVE_INSTALL_DIR_INCLUDE = "netgen/include"
29
29
  NGSOLVE_INSTALL_DIR_CMAKE = "ngsolve/cmake"
30
30
  NGSOLVE_INSTALL_DIR_RES = "share"
31
31
 
32
- NGSOLVE_VERSION = "6.2.2506-45-g573446995"
33
- NGSOLVE_VERSION_GIT = "v6.2.2506-45-g573446995"
34
- NGSOLVE_VERSION_PYTHON = "6.2.2506.post45.dev0"
32
+ NGSOLVE_VERSION = "6.2.2506-73-g12fb35d80"
33
+ NGSOLVE_VERSION_GIT = "v6.2.2506-73-g12fb35d80"
34
+ NGSOLVE_VERSION_PYTHON = "6.2.2506.post73.dev0"
35
35
 
36
36
  NGSOLVE_VERSION_MAJOR = "6"
37
37
  NGSOLVE_VERSION_MINOR = "2"
38
- NGSOLVE_VERSION_TWEAK = "45"
38
+ NGSOLVE_VERSION_TWEAK = "73"
39
39
  NGSOLVE_VERSION_PATCH = "2506"
40
- NGSOLVE_VERSION_HASH = "g573446995"
40
+ NGSOLVE_VERSION_HASH = "g12fb35d80"
41
41
 
42
42
  CMAKE_CXX_COMPILER = "/Library/Developer/CommandLineTools/usr/bin/c++"
43
43
  CMAKE_CUDA_COMPILER = ""
ngsolve/config/config.pyi CHANGED
@@ -26,14 +26,14 @@ NGSOLVE_INSTALL_DIR_INCLUDE: str = 'netgen/include'
26
26
  NGSOLVE_INSTALL_DIR_LIB: str = 'netgen'
27
27
  NGSOLVE_INSTALL_DIR_PYTHON: str = '.'
28
28
  NGSOLVE_INSTALL_DIR_RES: str = 'share'
29
- NGSOLVE_VERSION: str = '6.2.2506-45-g573446995'
30
- NGSOLVE_VERSION_GIT: str = 'v6.2.2506-45-g573446995'
31
- NGSOLVE_VERSION_HASH: str = 'g573446995'
29
+ NGSOLVE_VERSION: str = '6.2.2506-73-g12fb35d80'
30
+ NGSOLVE_VERSION_GIT: str = 'v6.2.2506-73-g12fb35d80'
31
+ NGSOLVE_VERSION_HASH: str = 'g12fb35d80'
32
32
  NGSOLVE_VERSION_MAJOR: str = '6'
33
33
  NGSOLVE_VERSION_MINOR: str = '2'
34
34
  NGSOLVE_VERSION_PATCH: str = '2506'
35
- NGSOLVE_VERSION_PYTHON: str = '6.2.2506.post45.dev0'
36
- NGSOLVE_VERSION_TWEAK: str = '45'
35
+ NGSOLVE_VERSION_PYTHON: str = '6.2.2506.post73.dev0'
36
+ NGSOLVE_VERSION_TWEAK: str = '73'
37
37
  USE_CCACHE: bool = True
38
38
  USE_HYPRE: bool = False
39
39
  USE_LAPACK: bool = True
@@ -42,4 +42,4 @@ USE_MUMPS: bool = False
42
42
  USE_PARDISO: bool = False
43
43
  USE_UMFPACK: bool = True
44
44
  is_python_package: bool = True
45
- version: str = 'v6.2.2506-45-g573446995'
45
+ version: str = 'v6.2.2506-73-g12fb35d80'
ngsolve/directsolvers.pyi CHANGED
@@ -9,7 +9,7 @@ import typing
9
9
  __all__ = ['BaseMatrix', 'BaseVector', 'BilinearForm', 'BitArray', 'SuperLU']
10
10
  class SuperLU(ngsolve.la.BaseMatrix):
11
11
  __firstlineno__: typing.ClassVar[int] = 3
12
- __static_attributes__: typing.ClassVar[tuple] = ('a', 'freedofs', 'lu', 'fd')
12
+ __static_attributes__: typing.ClassVar[tuple] = ('fd', 'freedofs', 'lu', 'a')
13
13
  def Mult(self, x: ngsolve.la.BaseVector, y: ngsolve.la.BaseVector):
14
14
  ...
15
15
  def Update(self):
ngsolve/krylovspace.pyi CHANGED
@@ -35,7 +35,7 @@ class CGSolver(LinearSolver):
35
35
  ...
36
36
  class GMResSolver(LinearSolver):
37
37
  __firstlineno__: typing.ClassVar[int] = 740
38
- __static_attributes__: typing.ClassVar[tuple] = ('norm', 'iterations', 'innerproduct', 'restart')
38
+ __static_attributes__: typing.ClassVar[tuple] = ('iterations', 'norm', 'restart', 'innerproduct')
39
39
  name: typing.ClassVar[str] = 'GMRes'
40
40
  def _SolveImpl(self, rhs: ngsolve.la.BaseVector, sol: ngsolve.la.BaseVector):
41
41
  ...
@@ -43,7 +43,7 @@ class GMResSolver(LinearSolver):
43
43
  ...
44
44
  class LinearSolver(ngsolve.la.BaseMatrix):
45
45
  __firstlineno__: typing.ClassVar[int] = 50
46
- __static_attributes__: typing.ClassVar[tuple] = ('iterations', 'printrates', 'residuals', 'display', 'plotrates', 'maxiter', 'its', 'mat', 'pre', 'atol', 'plt', 'fig', 'callback_sol', 'callback', '_final_residual', 'sol', 'ress', 'ax', 'tol', 'clear_output')
46
+ __static_attributes__: typing.ClassVar[tuple] = ('ress', 'sol', 'tol', 'maxiter', 'fig', 'mat', 'callback_sol', 'clear_output', 'residuals', 'display', 'plotrates', 'its', 'atol', 'printrates', '_final_residual', 'plt', 'ax', 'callback', 'iterations', 'pre')
47
47
  name: typing.ClassVar[str] = 'LinearSolver'
48
48
  @staticmethod
49
49
  def Solve(*args, **kwargs):
@@ -8,7 +8,7 @@ import typing
8
8
  __all__ = ['InnerProduct', 'Newton', 'NewtonMinimization', 'NewtonSolver', 'Norm', 'Projector', 'TimeFunction', 'sqrt']
9
9
  class NewtonSolver:
10
10
  __firstlineno__: typing.ClassVar[int] = 6
11
- __static_attributes__: typing.ClassVar[tuple] = ('a', 'rhs', 'inv', 'w', 'lin_solver_cls', 'inverse', 'lin_solver_args', 'freedofs', 'u', 'uh', 'r')
11
+ __static_attributes__: typing.ClassVar[tuple] = ('uh', 'u', 'inv', 'r', 'w', 'inverse', 'a', 'lin_solver_args', 'freedofs', 'rhs', 'lin_solver_cls')
12
12
  @staticmethod
13
13
  def Solve(*args, **kwargs):
14
14
  ...
@@ -58,7 +58,16 @@ class NonLinearApplication(Application):
58
58
  solver = NewtonSolver(self.a, self.gf, **solver_args)
59
59
  if dirichlet is not None:
60
60
  dirichlet_gf = GridFunction(self.gf.space)
61
- if isinstance(dirichlet, Dirichlet):
61
+ if isinstance(dirichlet, list):
62
+ for i in range(len(dirichlet)):
63
+ if dirichlet[i] is not None:
64
+ if isinstance(dirichlet[i], Dirichlet):
65
+ dirichlet_gf.components[i].Set(
66
+ dirichlet[i].cf, definedon=dirichlet[i].region
67
+ )
68
+ else:
69
+ dirichlet_gf.components[i].Set(dirichlet[i], BND)
70
+ elif isinstance(dirichlet, Dirichlet):
62
71
  dirichlet_gf.Set(dirichlet.cf, definedon=dirichlet.region)
63
72
  else:
64
73
  dirichlet_gf.Set(dirichlet, BND)
@@ -14,7 +14,7 @@ __all__ = ['Application', 'BND', 'BilinearForm', 'CoefficientFunction', 'Dirichl
14
14
  class Application:
15
15
  __firstlineno__: typing.ClassVar[int] = 21
16
16
  __hash__: typing.ClassVar[None] = None
17
- __static_attributes__: typing.ClassVar[tuple] = ('a', 'gf')
17
+ __static_attributes__: typing.ClassVar[tuple] = ('gf', 'a')
18
18
  def Solve(self, rhs, *args, dirichlet = None, pre = None, printrates: bool = False, **kwargs):
19
19
  ...
20
20
  def __eq__(self, other):
@@ -23,18 +23,18 @@ class Application:
23
23
  ...
24
24
  class Dirichlet:
25
25
  __firstlineno__: typing.ClassVar[int] = 15
26
- __static_attributes__: typing.ClassVar[tuple] = ('region', 'cf')
26
+ __static_attributes__: typing.ClassVar[tuple] = ('cf', 'region')
27
27
  def __init__(self, cf, region):
28
28
  ...
29
29
  class Equation:
30
- __firstlineno__: typing.ClassVar[int] = 138
30
+ __firstlineno__: typing.ClassVar[int] = 147
31
31
  __static_attributes__: typing.ClassVar[tuple] = ('lhs', 'rhs')
32
32
  def Solve(self, *args, **kwargs):
33
33
  ...
34
34
  def __init__(self, lhs, rhs):
35
35
  ...
36
36
  class LinearApplication(Application):
37
- __firstlineno__: typing.ClassVar[int] = 69
37
+ __firstlineno__: typing.ClassVar[int] = 78
38
38
  __static_attributes__: typing.ClassVar[tuple] = ('vec')
39
39
  def Assemble(self):
40
40
  ...
ngsolve/timestepping.pyi CHANGED
@@ -7,7 +7,7 @@ import typing
7
7
  __all__ = ['CrankNicolson', 'ImplicitEuler', 'Newmark', 'ngs']
8
8
  class CrankNicolson:
9
9
  __firstlineno__: typing.ClassVar[int] = 129
10
- __static_attributes__: typing.ClassVar[tuple] = ('time', 'dt', 'bfmstar', 'gfu_old', 'c', '_lin_solver_cls', '_lin_solver_args')
10
+ __static_attributes__: typing.ClassVar[tuple] = ('c', 'gfu_old', 'time', '_lin_solver_cls', '_lin_solver_args', 'bfmstar', 'dt')
11
11
  def Integrate(self, u_start: ngsolve.comp.GridFunction, end_time: float, start_time: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None, callback: typing.Optional[typing.Callable] = None):
12
12
  ...
13
13
  def Step(self, u: ngsolve.comp.GridFunction, dt: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None):
@@ -16,7 +16,7 @@ class CrankNicolson:
16
16
  ...
17
17
  class ImplicitEuler:
18
18
  __firstlineno__: typing.ClassVar[int] = 5
19
- __static_attributes__: typing.ClassVar[tuple] = ('time', 'dt', 'bfmstar', 'gfu_old', 'c', '_lin_solver_cls', '_lin_solver_args')
19
+ __static_attributes__: typing.ClassVar[tuple] = ('c', 'gfu_old', 'time', '_lin_solver_cls', '_lin_solver_args', 'bfmstar', 'dt')
20
20
  def Integrate(self, u_start: ngsolve.comp.GridFunction, end_time: float, start_time: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None, callback: typing.Optional[typing.Callable] = None):
21
21
  ...
22
22
  def Step(self, u: ngsolve.comp.GridFunction, dt: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None):
@@ -25,7 +25,7 @@ class ImplicitEuler:
25
25
  ...
26
26
  class Newmark:
27
27
  __firstlineno__: typing.ClassVar[int] = 58
28
- __static_attributes__: typing.ClassVar[tuple] = ('time', 'dt', 'gfv_old', 'bfmstar', 'gfu_old', 'c', '_lin_solver_cls', '_lin_solver_args', 'gfa_old')
28
+ __static_attributes__: typing.ClassVar[tuple] = ('c', 'gfu_old', 'time', 'gfa_old', '_lin_solver_cls', '_lin_solver_args', 'bfmstar', 'gfv_old', 'dt')
29
29
  def Integrate(self, u: ngsolve.comp.GridFunction, end_time: float, v: typing.Optional[ngsolve.comp.GridFunction] = None, a: typing.Optional[ngsolve.comp.GridFunction] = None, start_time: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None, callback: typing.Optional[typing.Callable] = None):
30
30
  ...
31
31
  def Step(self, u: ngsolve.comp.GridFunction, v: ngsolve.comp.GridFunction, a: ngsolve.comp.GridFunction, dt: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None):
ngsolve/timing.pyi CHANGED
@@ -32,7 +32,7 @@ class Timing:
32
32
 
33
33
  """
34
34
  __firstlineno__: typing.ClassVar[int] = 5
35
- __static_attributes__: typing.ClassVar[tuple] = ('timings_par', 'timings', 'name')
35
+ __static_attributes__: typing.ClassVar[tuple] = ('name', 'timings_par', 'timings')
36
36
  def CompareTo(self, folder):
37
37
  """
38
38
 
@@ -1,9 +1,9 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ngsolve
3
- Version: 6.2.2506.post45.dev0
3
+ Version: 6.2.2506.post73.dev0
4
4
  Summary: NGSolve
5
5
  Author: The NGSolve team
6
6
  License: LGPL2.1
7
7
  License-File: LICENSE
8
- Requires-Dist: netgen-mesher==6.2.2506.post8.dev0
8
+ Requires-Dist: netgen-mesher==6.2.2506.post9.dev0
9
9