Redesigned configuration handling

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## latest
 
+- Redesigned configuration loading for enhanced clarity and standardization [#264](https://github.com/precice/micro-manager/pull/264)
 - Allow `initialize()` to return data that is not used by the adaptivity [#261](https://github.com/precice/micro-manager/pull/261)
 - Fixed `MicroSimulation` initialization requiring positional parameters [#255](https://github.com/precice/micro-manager/pull/255)
 - Fixed model adaptivity convergence at resolution boundaries to prevent infinite loops for out-of-range switching requests [#252](https://github.com/precice/micro-manager/pull/252)

micro_manager/adaptivity/adaptivity.py

@@ -15,7 +15,7 @@
 class AdaptivityCalculator:
     def __init__(
         self,
-        configurator: Config,
+        config: Config,
         nsims: int,
         micro_problem_cls: MicroSimulationClass,
         model_manager: ModelManager,
@@ -27,7 +27,7 @@ def __init__(
 
         Parameters
         ----------
-        configurator : object of class Config
+        config : object of class Config
             Object which has getter functions to get parameters defined in the configuration file.
         nsims : int
             Number of micro simulations.
@@ -40,12 +40,12 @@ def __init__(
         rank : int
             Rank of the MPI communicator.
         """
-        self._refine_const = configurator.get_adaptivity_refining_const()
-        self._coarse_const = configurator.get_adaptivity_coarsening_const()
-        self._hist_param = configurator.get_adaptivity_hist_param()
-        self._adaptivity_data_names = configurator.get_data_for_adaptivity()
-        self._adaptivity_type = configurator.get_adaptivity_type()
-        self._adaptivity_output_type = configurator.get_adaptivity_output_type()
+        self._refine_const = config.adaptivity_refining_constant()
+        self._coarse_const = config.adaptivity_coarsening_constant()
+        self._hist_param = config.adaptivity_history_param()
+        self._adaptivity_data_names = config.data_for_adaptivity()
+        self._adaptivity_type = config.adaptivity_type()
+        self._adaptivity_output_type = config.adaptivity_output_type()
 
         self._micro_problem_cls = micro_problem_cls
         self._model_manager = model_manager
@@ -71,10 +71,10 @@ def __init__(
         self._just_deactivated: list[int] = []
 
         self._similarity_measure = self._get_similarity_measure(
-            configurator.get_adaptivity_similarity_measure()
+            config.adaptivity_similarity_measure()
         )
 
-        output_dir = configurator.get_output_dir()
+        output_dir = config.output_dir()
 
         if output_dir is not None:
             metrics_output_dir = output_dir + "/adaptivity-metrics"

micro_manager/adaptivity/adaptivity_selection.py

@@ -15,7 +15,7 @@ def create_adaptivity_calculator(
     micro_problem_cls,
     model_manager,
 ) -> AdaptivityCalculator:
-    adaptivity_type = config.get_adaptivity_type()
+    adaptivity_type = config.adaptivity_type()
 
     if adaptivity_type == "local":
         return LocalAdaptivityCalculator(

micro_manager/adaptivity/global_adaptivity.py

@@ -22,7 +22,7 @@
 class GlobalAdaptivityCalculator(AdaptivityCalculator):
     def __init__(
         self,
-        configurator: Config,
+        config: Config,
         global_number_of_sims: int,
         global_ids: list,
         participant,
@@ -37,7 +37,7 @@ def __init__(
 
         Parameters
         ----------
-        configurator : object of class Config
+        config : object of class Config
             Object which has getter functions to get parameters defined in the configuration file.
         global_number_of_sims : int
             Total number of simulations in the macro-micro coupled problem.
@@ -57,7 +57,7 @@ def __init__(
             Handles instantiation of the micro simulation.
         """
         super().__init__(
-            configurator,
+            config,
             global_number_of_sims,
             micro_problem_cls,
             model_manager,

micro_manager/adaptivity/local_adaptivity.py

@@ -17,7 +17,7 @@
 class LocalAdaptivityCalculator(AdaptivityCalculator):
     def __init__(
         self,
-        configurator: Config,
+        config: Config,
         num_sims: int,
         base_logger: Logger,
         rank: int,
@@ -30,7 +30,7 @@ def __init__(
 
         Parameters
         ----------
-        configurator : object of class Config
+        config : object of class Config
             Object which has getter functions to get parameters defined in the configuration file.
         num_sims : int
             Number of micro simulations.
@@ -46,7 +46,7 @@ def __init__(
             Handles instantiation of micro simulation.
         """
         super().__init__(
-            configurator, num_sims, micro_problem_cls, model_manager, base_logger, rank
+            config, num_sims, micro_problem_cls, model_manager, base_logger, rank
         )
         self._comm = comm
 

micro_manager/adaptivity/model_adaptivity.py

@@ -23,7 +23,7 @@ class ModelAdaptivity:
     def __init__(
         self,
         model_manager: ModelManager,
-        configurator: Config,
+        config: Config,
         comm: MPI.Comm,
         rank: int,
         log_file: str,
@@ -37,7 +37,7 @@ def __init__(
         ----------
         model_manager: ModelManager
             ModelManager instance
-        configurator : object of class Config
+        config : object of class Config
             Object which has getter functions to get parameters defined in the configuration file.
         comm: MPI.Comm
             MPI communicator
@@ -54,12 +54,10 @@ def __init__(
 
         self._comm = comm
         self._model_manager = model_manager
-        self._model_files = configurator.get_model_adaptivity_file_names()
-        self._switching_func_name = (
-            configurator.get_model_adaptivity_switching_function()
-        )
+        self._model_files = config.model_adaptivity_file_names()
+        self._switching_func_name = config.model_adaptivity_switching_function()
 
-        stateless_flags = configurator.get_model_adaptivity_micro_stateless()
+        stateless_flags = config.model_adaptivity_micro_stateless()
         self._model_classes = []
         pos = 0
         for model_file in self._model_files: