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:19:32 +02:00
parent 7d142b35b5
commit 8c92adcbcf
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sbmy_control/parameters_card.py
View file

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