maubin/sbmy_control
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge fixes

Browse source
This commit is contained in:
Mayeul Aubin 2025-06-02 18:18:53 +02:00
parent d6222df77d
commit 7d142b35b5
2 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sbmy_control/main.py
View file

@ -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)

3
sbmy_control/parameters_card.py
View file

@ -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):