Merge pull request #161 from upb-lea/new_mdb

rm mdb unused measurement type

Author: gituser789

femmt/optimization/io.py

@@ -1044,9 +1044,6 @@ def full_simulation(df_geometry: pd.DataFrame, current_waveform: list, inductor_
             litz_wire = ff.litz_database()[df_geometry['params_litz_wire_name'][index_number]]
             litz_wire_diameter = 2 * litz_wire["conductor_radii"]
 
-            # material properties
-            material_db = mdb.Data()
-
             # instantiate material-specific model
             magnet_material_model: mh.loss.LossModel = mh.loss.LossModel(material=material_name, team="paderborn")
 

femmt/optimization/optimization_dtos.py

@@ -5,16 +5,13 @@
 
 # own libraries
 from materialdatabase.meta.data_enums import DataSource
-from materialdatabase.meta.setup_enums import MeasurementDataType
 
 @dataclasses.dataclass
 class MaterialDataSources:
     """Data sources for the FEM simulation."""
 
     permeability_datasource: DataSource
-    permeability_datatype: MeasurementDataType
     permittivity_datasource: DataSource
-    permittivity_datatype: MeasurementDataType
 
 @dataclasses.dataclass
 class WorkingDirectories:

femmt/optimization/sto_ct_dtos.py

@@ -6,8 +6,7 @@
 import numpy as np
 
 # own libraries (mdb + femmt)
-from materialdatabase.meta.data_enums import DataSource
-from materialdatabase.meta.setup_enums import MeasurementDataType
+from femmt.optimization.optimization_dtos import MaterialDataSources
 from femmt.optimization.ito_dtos import WorkingDirectories
 
 @dataclass
@@ -67,10 +66,7 @@ class StoCtSingleInputConfig:
     mesh_accuracy: float
 
     # data sources
-    permeability_datasource: DataSource
-    permeability_datatype: MeasurementDataType
-    permittivity_datasource: DataSource
-    permittivity_datatype: MeasurementDataType
+    material_datasources: MaterialDataSources
 
 
 @dataclass