diff --git a/.pylintrc b/.pylintrc index 78f447f..da38ec3 100644 --- a/.pylintrc +++ b/.pylintrc @@ -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 diff --git a/README.rst b/README.rst index 511eb3d..239df88 100644 --- a/README.rst +++ b/README.rst @@ -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 `__ project |material_overview| diff --git a/docs/source/figures/Material_Database_Overview.png b/docs/source/figures/Material_Database_Overview.png index d94326e..17980dc 100644 Binary files a/docs/source/figures/Material_Database_Overview.png and b/docs/source/figures/Material_Database_Overview.png differ diff --git a/docs/source/figures/Material_Database_Overview.svg b/docs/source/figures/Material_Database_Overview.svg index 64c0ac8..f547aee 100644 --- a/docs/source/figures/Material_Database_Overview.svg +++ b/docs/source/figures/Material_Database_Overview.svg @@ -3,15 +3,15 @@ 25 - 50025 - 500300 - 1000700 - 400025 - 15010 - 40010 - 300100 - 500DMGEC1000 - 300025 - 20025 - 20025 - 300100 - 5001000 - 2000< 1500010 - 10025 - 500100 - 750500 - 1000ProterialEpcos TDKoperating frequencyin kHz (datasheet)ManufacturerFerroxcubeFair-RiteMagNetµ(f,T,B)ε(f,T)µ(f,T,B)300022001500800200043006500Power Conversion35007502300180023003000900EMI Suppression100002000230014001100Usage(manufacturer)µiat 25°CLEA_MTBPower TransformerBroadband TransformerPower ConversionPower ConversionFEM-Datasheetµ(f,T,B)µ(f,T,B)ε(f,T)N95N87N49PC200N27N30T37DMR96A3F463C903C923C943C953F43E6777879ML95SLEA_LKMaterialDatasheet + id="g7" + transform="matrix(0.6281814,0,0,0.6281814,55.060161,135.25079)"> diff --git a/docs/source/figures/Material_Database_Overview.xlsx b/docs/source/figures/Material_Database_Overview.xlsx index 70f650c..77868e1 100644 Binary files a/docs/source/figures/Material_Database_Overview.xlsx and b/docs/source/figures/Material_Database_Overview.xlsx differ diff --git a/docs/wordlist b/docs/wordlist index 5e53bd9..cda1a30 100644 --- a/docs/wordlist +++ b/docs/wordlist @@ -108,3 +108,4 @@ usetex GridSpec pdf dft +Epcos diff --git a/materialdatabase/data/datasheet_curves/N87/general_information.csv b/materialdatabase/data/datasheet_curves/N87/general_information.csv new file mode 100644 index 0000000..733ca56 --- /dev/null +++ b/materialdatabase/data/datasheet_curves/N87/general_information.csv @@ -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 diff --git a/materialdatabase/processing/data_structure.py b/materialdatabase/processing/data_structure.py index 243b306..ddedf0d 100644 --- a/materialdatabase/processing/data_structure.py +++ b/materialdatabase/processing/data_structure.py @@ -147,7 +147,7 @@ def build_overview_table(self) -> pd.DataFrame: columns="column", values="value", fill_value=False, - aggfunc="any" + aggfunc="mean" ) return pivot