Merge branch 'debug'

MintonGroup · Sep 15, 2022 · 6a481c6 · 6a481c6
2 parents f7b03cb + 90ee74d
commit 6a481c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/swiftest/swiftest/io.py b/python/swiftest/swiftest/io.py
@@ -887,7 +887,7 @@ def select_active_from_frame(ds, param, framenum=-1):
 
     return frame
 
-def swiftest_xr2infile(ds, param, framenum=-1):
+def swiftest_xr2infile(ds, param, infile_name=None,framenum=-1):
     """
     Writes a set of Swiftest input files from a single frame of a Swiftest xarray dataset
 
@@ -911,7 +911,7 @@ def swiftest_xr2infile(ds, param, framenum=-1):
         # Note: xarray will call the character array dimension string32. The Fortran code
         # will rename this after reading
         frame = unclean_string_values(frame)
-        frame.to_netcdf(path=param['NC_IN'])
+        frame.to_netcdf(path=infile_name)
         return frame
 
     # All other file types need seperate files for each of the inputs

diff --git a/python/swiftest/swiftest/simulation_class.py b/python/swiftest/swiftest/simulation_class.py
@@ -271,7 +271,7 @@ def initial_conditions_from_bin(self, framenum=-1, new_param=None, new_param_fil
             new_param.pop('TP_IN', None)
             new_param.pop('CB_IN', None)
             print(f"Extracting data from dataset at time frame number {framenum} and saving it to {new_param['NC_IN']}")
-            frame = io.swiftest_xr2infile(self.ds, new_param, framenum)
+            frame = io.swiftest_xr2infile(self.ds, self.param, infile_name=new_param['NC_IN'],framenum)
             print(f"Saving parameter configuration file to {new_param_file}")
             self.write_param(new_param_file, param=new_param)