From bbf551c129b19cd8a82a062e5426b3d4cbcadf30 Mon Sep 17 00:00:00 2001 From: carl-drews Date: Fri, 20 Sep 2024 11:58:47 -0600 Subject: [PATCH] Moved the configuration check to within readConditionsFromJson(), and at the end. --- src/acom_music_box/main.py | 1 - src/acom_music_box/music_box.py | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/acom_music_box/main.py b/src/acom_music_box/main.py index 075a206..9e1c7f8 100644 --- a/src/acom_music_box/main.py +++ b/src/acom_music_box/main.py @@ -152,7 +152,6 @@ def main(): myBox = MusicBox() logger.debug(f"Configuration file = {musicBoxConfigFile}") myBox.readConditionsFromJson(musicBoxConfigFile) - myBox.check_config(os.path.join(os.getcwd(), musicBoxConfigFile)) # Create solver and solve config_path = os.path.join( diff --git a/src/acom_music_box/music_box.py b/src/acom_music_box/music_box.py index e6fda5e..0caba33 100644 --- a/src/acom_music_box/music_box.py +++ b/src/acom_music_box/music_box.py @@ -321,6 +321,9 @@ def readConditionsFromJson(self, path_to_json): self.evolving_conditions = EvolvingConditions.from_config_JSON( path_to_json, data, self.species_list, self.reaction_list) + self.check_config(os.path.join(os.getcwd(), path_to_json)) + + def speciesOrdering(self): """ Retrieves the ordering of species used in the solver.