diff --git a/__init__.py b/__init__.py index 06d7405..e69de29 100644 Binary files a/__init__.py and b/__init__.py differ diff --git a/analysis/power_spectrum.py b/analysis/power_spectrum.py index 2cbc40f..f47466e 100644 --- a/analysis/power_spectrum.py +++ b/analysis/power_spectrum.py @@ -263,7 +263,9 @@ def get_ylims_and_yticks(ylims): return ylims, yticks -if __name__ == "__main__": + + +def console_main(): from argparse import ArgumentParser parser = ArgumentParser(description='Plot power spectra of fields') @@ -403,5 +405,8 @@ if __name__ == "__main__": fig.savefig(args.output) else: fig.savefig(args.directory+'power_spectrum.png') - + +if __name__ == "__main__": + console_main() + \ No newline at end of file diff --git a/analysis/slices.py b/analysis/slices.py index e47eaff..cb78bbc 100755 --- a/analysis/slices.py +++ b/analysis/slices.py @@ -149,8 +149,7 @@ def plot_imshow_diff(data_list, return fig, axes - -if __name__ == "__main__": +def console_main(): from argparse import ArgumentParser parser = ArgumentParser(description='Comparisons of fields slices.') @@ -223,3 +222,8 @@ if __name__ == "__main__": fig.savefig(args.output,bbox_inches='tight') else: fig.savefig(args.directory+'slices.jpg',bbox_inches='tight') + + + +if __name__ == "__main__": + console_main() diff --git a/main.py b/main.py index 357f93a..a3e7859 100644 --- a/main.py +++ b/main.py @@ -220,7 +220,7 @@ def check_consistency(card_dict, mode): raise ValueError(f"ModulePMCOLA is not 1: ModulePMCOLA={card_dict["ModulePMCOLA"]}") -if __name__ == "__main__": +def console_main(): from argparse import ArgumentParser from args_main import register_arguments_main from timestepping import register_arguments_timestepping, main_timestepping @@ -238,4 +238,9 @@ if __name__ == "__main__": register_arguments_card(parser) register_arguments_cosmo(parser) parsed_args = parser.parse_args() - main(parsed_args) \ No newline at end of file + main(parsed_args) + + +if __name__ == "__main__": + console_main() + \ No newline at end of file diff --git a/scripts/convert_snapshot_to_density.py b/scripts/convert_snapshot_to_density.py index aed11ee..dadefed 100644 --- a/scripts/convert_snapshot_to_density.py +++ b/scripts/convert_snapshot_to_density.py @@ -36,8 +36,7 @@ def convert_snapshot_to_density(snapshot_path, output_path, N=None, corner=(0.0, print("Done.") - -if __name__ == "__main__": +def console_main(): parser = argparse.ArgumentParser(description="Convert snapshot to density.") parser.add_argument( "-S", @@ -76,4 +75,8 @@ if __name__ == "__main__": output_path=args.output, N=args.N, corner=args.corner, - ) \ No newline at end of file + ) + + +if __name__ == "__main__": + console_main() \ No newline at end of file diff --git a/scripts/field_to_field.py b/scripts/field_to_field.py index b2bae83..c9137e2 100644 --- a/scripts/field_to_field.py +++ b/scripts/field_to_field.py @@ -115,8 +115,7 @@ def field_to_field( print("Done.") - -if __name__ == "__main__": +def console_main(): import argparse parser = argparse.ArgumentParser(description="Convert a field from one size to another.") parser.add_argument("-i","--input_file", type=str, help="Input field file") @@ -128,4 +127,8 @@ if __name__ == "__main__": parser.add_argument("-BC","--boundary_conditions", type=int, default=1, help="Boundary conditions (1: periodic, 3: non-periodic)") args = parser.parse_args() - field_to_field(args.input_file, args.output_file, args.output_size, args.output_L, args.output_dpm, args.output_corner, args.boundary_conditions) \ No newline at end of file + field_to_field(args.input_file, args.output_file, args.output_size, args.output_L, args.output_dpm, args.output_corner, args.boundary_conditions) + + +if __name__ == "__main__": + console_main() \ No newline at end of file diff --git a/scripts/gather_tiles.py b/scripts/gather_tiles.py index a71a273..13d3eda 100644 --- a/scripts/gather_tiles.py +++ b/scripts/gather_tiles.py @@ -99,8 +99,7 @@ def gather_tiles(folder, tile_base, L, Np, N_TILES, buffer): - -if __name__ == "__main__": +def console_main(): parser = argparse.ArgumentParser(description="Gather density from tiles.") parser.add_argument("-d","--folder", type=str, default="./", help="Folder containing the tiles") parser.add_argument("--tile_base", type=str, default="sCOLA_tile", help="Base name of the tiles") @@ -121,4 +120,9 @@ if __name__ == "__main__": Np_tile = Np//N_TILES dpm = L/Np_tile - gather_tiles(folder, tile_base, L, Np, N_TILES, buffer) \ No newline at end of file + gather_tiles(folder, tile_base, L, Np, N_TILES, buffer) + + + +if __name__ == "__main__": + console_main() \ No newline at end of file diff --git a/scripts/scola_submit.py b/scripts/scola_submit.py index 06a8702..e68e56f 100644 --- a/scripts/scola_submit.py +++ b/scripts/scola_submit.py @@ -462,9 +462,7 @@ def scola_submit(directory, - - -if __name__ == "__main__": +def console_main(): parser = argparse.ArgumentParser(description="Submit slurm jobs for sCOLA tiles.") parser.add_argument("-d", "--directory", type=str, default="./", help="Main directory where the output will be saved (if other dir and filenames are not specified).") @@ -496,4 +494,9 @@ if __name__ == "__main__": +if __name__ == "__main__": + console_main() + + + \ No newline at end of file