From c228095eb8af2552f715b8616a256ad5c5ca25e7 Mon Sep 17 00:00:00 2001 From: David Minton Date: Tue, 6 Jul 2021 22:24:23 -0400 Subject: [PATCH] Fixed issues with initial parameter list --- python/swiftest/swiftest/io.py | 4 ++-- python/swiftest/swiftest/simulation_class.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/swiftest/swiftest/io.py b/python/swiftest/swiftest/io.py index 93d1f2d69..16f8ae952 100644 --- a/python/swiftest/swiftest/io.py +++ b/python/swiftest/swiftest/io.py @@ -22,7 +22,7 @@ def real2float(realstr): """ return float(realstr.replace('d', 'E').replace('D', 'E')) -def read_swiftest_param(param_file_name): +def read_swiftest_param(param_file_name, param): """ Reads in a Swiftest param.in file and saves it as a dictionary @@ -36,7 +36,7 @@ def read_swiftest_param(param_file_name): param : dict A dictionary containing the entries in the user parameter file """ - param = {'! VERSION': f"Swiftest parameter input from file {param_file_name}"} + param['! VERSION'] = f"Swiftest parameter input from file {param_file_name}" # Read param.in file print(f'Reading Swiftest file {param_file_name}') diff --git a/python/swiftest/swiftest/simulation_class.py b/python/swiftest/swiftest/simulation_class.py index 3b3aca540..4a34b92ab 100644 --- a/python/swiftest/swiftest/simulation_class.py +++ b/python/swiftest/swiftest/simulation_class.py @@ -69,7 +69,7 @@ def add(self, plname, date=date.today().isoformat()): def read_param(self, param_file, codename="Swiftest"): if codename == "Swiftest": - self.param = io.read_swiftest_param(param_file) + self.param = io.read_swiftest_param(param_file, self.param) self.codename = "Swiftest" elif codename == "Swifter": self.param = io.read_swifter_param(param_file)