Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ recursive=no
# source root.
source-roots=

# When enabled, pylint would attempt to guess common misconfiguration and emit
# user-friendly hints instead of false-positive error messages.
suggestion-mode=yes

# Allow loading of arbitrary C extensions. Extensions are imported into the
# active Python interpreter and may run arbitrary code.
unsafe-load-any-extension=no
Expand Down
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ Usable features
* The database currently contains 19 different ferrite materials as shown in the following table
* Datasheet: Digitized plots of the manufacturer datasheet (only for plotting)
* FEM-Datasheet: Data for FEM-simulation based on the manufacturer datasheet
* LEA_LK & LEA_MTB: Data for FEM-simulation measured by the department of Power Electronics and Electrical Drives at Paderborn University
* TDK_MDT: Data for FEM-simulation based on the magnetic design tool by Epcos TDK
* LEA_MTB: Data for FEM-simulation measured by the department of Power Electronics and Electrical Drives at Paderborn University
* MagNet: Data for FEM-simulation from the `MagNet <https://mag-net.princeton.edu/>`__ project

|material_overview|
Expand Down
Binary file modified docs/source/figures/Material_Database_Overview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,083 changes: 687 additions & 1,396 deletions docs/source/figures/Material_Database_Overview.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/source/figures/Material_Database_Overview.xlsx
Binary file not shown.
1 change: 1 addition & 0 deletions docs/wordlist
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,4 @@ usetex
GridSpec
pdf
dft
Epcos
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
application,material,initial permeability,curie temperature in C,density in kg/m^3,resistivity in Ohm m,saturation flux density in T at 25 C,saturation flux density in T at 100 C
power conversion,MnZn,2200,210,4850,10,0.49,0.39
2 changes: 1 addition & 1 deletion materialdatabase/processing/data_structure.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def build_overview_table(self) -> pd.DataFrame:
columns="column",
values="value",
fill_value=False,
aggfunc="any"
aggfunc="mean"
)

return pivot
Expand Down