[137_choose_modules], issue - #137, Transformed the list of modules t…

…o load into a dictionary
newcleo-dev-team · Mar 4, 2024 · 99b6b06 · 99b6b06
1 parent c494589
commit 99b6b06
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/lbh15/_lbh15.py b/lbh15/_lbh15.py
@@ -56,7 +56,7 @@ class LiquidMetalInterface(ABC):
     _correlations_to_use: Dict[str, str] = {}
     _roots_to_use: Dict[str, int] = {}
     _default_corr_to_use: Dict[str, str] = {}
-    _properties_modules_list: List[str] = []
+    _properties_modules_dict: Dict[str, str] = {}
     _custom_properties_path: Dict[str, List[str]] = {}
     _available_properties_dict: Dict[str, PropertyInterface] = {}
     _available_correlations_dict: Dict[str, List[str]] = {}
@@ -656,7 +656,7 @@ def __load_properties(cls,
         """
         # Consider default modules if none is provided
         if modules is None:
-            modules = cls._properties_modules_list
+            modules = list(cls._properties_modules_dict.values())
 
         def is_valid(obj):
             '''

diff --git a/lbh15/bismuth.py b/lbh15/bismuth.py
@@ -67,14 +67,14 @@ class Bismuth(LiquidMetalInterface):
     _custom_properties_path: Dict[str, List[str]] = {}
     _available_properties_dict: Dict[str, PropertyInterface] = {}
     _available_correlations_dict: Dict[str, List[str]] = {}
-    _properties_modules_list: List[str] = \
-        ['lbh15.properties.bismuth_thermochemical_properties\
+    _properties_modules_dict: Dict[str, str] = \
+        {'solubility': 'lbh15.properties.bismuth_thermochemical_properties\
 .solubility_in_bismuth',
-         'lbh15.properties.bismuth_thermochemical_properties\
+         'diffusivity': 'lbh15.properties.bismuth_thermochemical_properties\
 .diffusivity_in_bismuth',
-         'lbh15.properties.bismuth_thermochemical_properties\
+         'thermochem': 'lbh15.properties.bismuth_thermochemical_properties\
 .bismuth_thermochemical',
-         'lbh15.properties.bismuth_properties']
+         'thermophys': 'lbh15.properties.bismuth_properties'}
 
     def __init__(self, p: float = atm, **kwargs):
         self._guess = BISMUTH_BOILING_TEMPERATURE / 2.0

diff --git a/lbh15/lbe.py b/lbh15/lbe.py
@@ -87,12 +87,16 @@ class LBE(LiquidMetalInterface):
     _custom_properties_path: Dict[str, List[str]] = {}
     _available_properties_dict: Dict[str, PropertyInterface] = {}
     _available_correlations_dict: Dict[str, List[str]] = {}
-    _properties_modules_list: List[str] = \
-        ['lbh15.properties.lbe_thermochemical_properties.solubility_in_lbe',
-         'lbh15.properties.lbe_thermochemical_properties.diffusivity_in_lbe',
-         'lbh15.properties.lbe_thermochemical_properties.lbe_thermochemical',
-         'lbh15.properties.lbe_thermochemical_properties.lbe_oxygen_limits',
-         'lbh15.properties.lbe_properties']
+    _properties_modules_dict: Dict[str, str] = \
+        {'solubility': 'lbh15.properties.lbe_thermochemical_properties\
+.solubility_in_lbe',
+         'diffusivity': 'lbh15.properties.lbe_thermochemical_properties\
+.diffusivity_in_lbe',
+         'thermochem': 'lbh15.properties.lbe_thermochemical_properties\
+.lbe_thermochemical',
+         'oxygenlims': 'lbh15.properties.lbe_thermochemical_properties\
+.lbe_oxygen_limits',
+         'thermophys': 'lbh15.properties.lbe_properties'}
 
     def __init__(self, p: float = atm, **kwargs):
         self._guess = LBE_BOILING_TEMPERATURE / 2.0

diff --git a/lbh15/lead.py b/lbh15/lead.py
@@ -98,12 +98,16 @@ class Lead(LiquidMetalInterface):
     _custom_properties_path: Dict[str, List[str]] = {}
     _available_properties_dict: Dict[str, PropertyInterface] = {}
     _available_correlations_dict: Dict[str, List[str]] = {}
-    _properties_modules_list: List[str] = \
-        ['lbh15.properties.lead_thermochemical_properties.solubility_in_lead',
-         'lbh15.properties.lead_thermochemical_properties.diffusivity_in_lead',
-         'lbh15.properties.lead_thermochemical_properties.lead_thermochemical',
-         'lbh15.properties.lead_thermochemical_properties.lead_oxygen_limits',
-         'lbh15.properties.lead_properties']
+    _properties_modules_dict: Dict[str, str] = \
+        {'solubility': 'lbh15.properties.lead_thermochemical_properties\
+.solubility_in_lead',
+         'diffusivity': 'lbh15.properties.lead_thermochemical_properties\
+.diffusivity_in_lead',
+         'thermochem': 'lbh15.properties.lead_thermochemical_properties\
+.lead_thermochemical',
+         'oxygenlims': 'lbh15.properties.lead_thermochemical_properties\
+.lead_oxygen_limits',
+         'thermophys': 'lbh15.properties.lead_properties'}
 
     def __init__(self, p: float = atm, **kwargs):
         self._guess = LEAD_BOILING_TEMPERATURE / 2.0