diff --git a/CITATION.cff b/CITATION.cff index e8f8e72..34b413f 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,7 +1,7 @@ cff-version: 1.2.0 message: If you use this software, please cite it as below. title: MusicBox -version: v2.5.5 +version: v2.6.0 authors: - family-names: Dawson given-names: Matthew @@ -19,5 +19,7 @@ authors: given-names: Brendan - family-names: Drews given-names: Carl + - family-names: Kiran + given-names: Aditya license: Apache-2.0 url: "https://github.com/NCAR/music-box" diff --git a/pyproject.toml b/pyproject.toml index 0a2eda7..5c6101b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ classifiers = ["License :: OSI Approved :: Apache Software License"] dynamic = ["version", "description"] dependencies = [ - "musica==0.8.1", + "musica==0.9.0", "xarray", "colorlog", "pandas", diff --git a/src/acom_music_box/__init__.py b/src/acom_music_box/__init__.py index 83ba0d5..fd83454 100644 --- a/src/acom_music_box/__init__.py +++ b/src/acom_music_box/__init__.py @@ -4,7 +4,7 @@ This package contains modules for handling various aspects of a music box, including species, products, reactants, reactions, and more. """ -__version__ = "2.5.5" +__version__ = "2.6.0" from .utils import convert_time, convert_pressure, convert_temperature, convert_concentration from .model_options import BoxModelOptions diff --git a/src/acom_music_box/music_box.py b/src/acom_music_box/music_box.py index 774e513..3b156ba 100644 --- a/src/acom_music_box/music_box.py +++ b/src/acom_music_box/music_box.py @@ -154,8 +154,7 @@ def solve(self, callback=None): next_conditions = None # calculate air density from the ideal gas law - air_density = curr_conditions.pressure / \ - (GAS_CONSTANT * curr_conditions.temperature) + air_density = curr_conditions.pressure / (GAS_CONSTANT * curr_conditions.temperature) # outputs to output_array if enough time has elapsed if (next_output_time <= curr_time): @@ -229,7 +228,7 @@ def loadJson(self, path_to_json): camp_path = os.path.join(os.path.dirname(path_to_json), self.config_file) # Initalize the musica solver - self.solver = musica.create_solver(camp_path, musica.micmsolver.rosenbrock, 1) + self.solver = musica.create_solver(camp_path, musica.micmsolver.rosenbrock_standard_order, 1) @staticmethod def order_reaction_rates(curr_conditions, rate_constant_ordering):