From 7d142b35b56ecf9280452aa4a7908026af7fdd4f Mon Sep 17 00:00:00 2001 From: Mayeul Aubin Date: Mon, 2 Jun 2025 18:18:53 +0200 Subject: [PATCH 1/2] merge fixes --- sbmy_control/main.py | 7 ------- sbmy_control/parameters_card.py | 3 --- 2 files changed, 10 deletions(-) diff --git a/sbmy_control/main.py b/sbmy_control/main.py index 350c97d..8bb7ff0 100644 --- a/sbmy_control/main.py +++ b/sbmy_control/main.py @@ -133,17 +133,10 @@ def main(parsed_args): case "allsCOLA": print_message(f"Running ICs, pre_sCOLA, sCOLA and post_sCOLA.", 1, "control", verbose=parsed_args.verbose) -<<<<<<< HEAD:main.py - from parameters_card import parse_arguments_card, main_parameter_card - from timestepping import main_timestepping - from ICs import main_ICs - from scola import main_scola, main_pre_scola, main_post_scola, have_all_tiles -======= from .parameters_card import parse_arguments_card, main_parameter_card from .timestepping import main_timestepping from .ICs import main_ICs from .scola import main_scola, main_pre_scola, main_post_scola, have_all_tiles ->>>>>>> main:sbmy_control/main.py card_dict = main_parameter_card(parsed_args) diff --git a/sbmy_control/parameters_card.py b/sbmy_control/parameters_card.py index 7381759..27a776f 100644 --- a/sbmy_control/parameters_card.py +++ b/sbmy_control/parameters_card.py @@ -47,7 +47,6 @@ def register_arguments_card(parser:ArgumentParser): parser.add_argument("--OutputFCsDensity", type=str, default=None, help="Output FCs density file.") parser.add_argument("--OutputFCsSnapshot", type=str, default=None, help="Output FCs snapshot file.") parser.add_argument("--OutputRngStateLPT", type=str, default=None, help="Output RNG state file.") -<<<<<<< HEAD:parameters_card.py ## Tests with phiBCs and density parser.add_argument("--WriteGravPot", type=bool, default=False, help="Write gravitational potential.") parser.add_argument("--OutputGravitationalPotentialBase", type=str, default=None, help="Output gravitational potential base.") @@ -57,12 +56,10 @@ def register_arguments_card(parser:ArgumentParser): parser.add_argument("--MeshDensity", type=int, default=None, help="Mesh for density.") parser.add_argument("--LoadPhiBCs", type=bool, default=False, help="Load phiBCs.") parser.add_argument("--InputPhiBCsBase", type=str, default=None, help="Input phiBCs file base.") -======= parser.add_argument("--WriteReferenceFrame", type=bool, default=False, help="Write reference frame (COCA).") parser.add_argument("--OutputMomentaBase", type=str, default=None, help="Output momenta base (COCA).") parser.add_argument("--ReadReferenceFrame", type=bool, default=False, help="Read reference frame (COCA).") parser.add_argument("--InputMomentaBase", type=str, default=None, help="Read momenta base (COCA).") ->>>>>>> main:sbmy_control/parameters_card.py def register_arguments_card_for_ICs(parser:ArgumentParser): From 8c92adcbcf4fb964e568c50f132634e6c0b62c75 Mon Sep 17 00:00:00 2001 From: Mayeul Aubin Date: Mon, 2 Jun 2025 18:19:32 +0200 Subject: [PATCH 2/2] merge fixes --- sbmy_control/parameters_card.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sbmy_control/parameters_card.py b/sbmy_control/parameters_card.py index 27a776f..5384adb 100644 --- a/sbmy_control/parameters_card.py +++ b/sbmy_control/parameters_card.py @@ -230,7 +230,6 @@ def parse_arguments_card(parsed_args): card_dict["OutputFCsSnapshot"] = main_dict["resultdir"]+"final_particles_"+main_dict["simname"]+".gadget3" if card_dict["OutputRngStateLPT"] is None: card_dict["OutputRngStateLPT"] = main_dict["workdir"]+"rng_state.h5" -<<<<<<< HEAD:parameters_card.py ## Tests with phiBCs and density if card_dict["OutputGravitationalPotentialBase"] is None: card_dict["OutputGravitationalPotentialBase"] = main_dict["workdir"]+"gravpot_"+main_dict["simname"] @@ -242,12 +241,10 @@ def parse_arguments_card(parsed_args): card_dict["MeshDensity"] = card_dict["N_PM_mesh"] if card_dict["InputPhiBCsBase"] is None: card_dict["InputPhiBCsBase"] = main_dict["workdir"]+"gravpot_tCOLA" -======= if card_dict["OutputMomentaBase"] is None: card_dict["OutputMomentaBase"] = main_dict["workdir"]+"momenta_"+main_dict["simname"]+"_" if card_dict["InputMomentaBase"] is None: card_dict["InputMomentaBase"] = main_dict["workdir"]+"momenta_"+main_dict["simname"]+"_" ->>>>>>> main:sbmy_control/parameters_card.py return card_dict @@ -366,7 +363,6 @@ def create_parameter_card_dict( OutputFCsDensity:str = 'fcs_density.h5', OutputFCsSnapshot:str = 'fcs_particles.gadget3', -<<<<<<< HEAD:parameters_card.py ## Tests with phiBCs and density WriteGravPot:bool = True, OutputGravitationalPotentialBase:str = 'gravitational_potential.h5', @@ -376,13 +372,11 @@ def create_parameter_card_dict( MeshDensity:int = 128, LoadPhiBCs:bool = False, InputPhiBCsBase:str = 'gravitational_potential.h5', -======= ## COCA parameters WriteReferenceFrame:bool = False, OutputMomentaBase:str = 'momenta_', ReadReferenceFrame:bool = False, InputMomentaBase:str = 'momenta_', ->>>>>>> main:sbmy_control/parameters_card.py ## Cosmological parameters h:float = 0.6732,