Huge refactoring

This commit is contained in:
Noe Brucy
2021-06-22 12:23:03 +02:00
parent a286c08b72
commit 0dc9e8fc7b
12 changed files with 343 additions and 361 deletions
+28 -28
View File
@@ -14,7 +14,7 @@ from astrophysix.simdm.datafiles import PlotInfo, PlotType
from astrophysix.utils.file import FileType
from plotter import Plotter
from pp_params import default_params
from params import default_params
from ramses_astrophysix import ramses
@@ -32,18 +32,18 @@ select = {
}
pp_params = default_params()
pp_params.input.nml_filename = "disk.nml"
pp_params.pymses.map_size = 2048
pp_params.pymses.zoom = 4
pp_params.pymses.filter = False
pp_params.pymses.variables = ["rho", "vel", "P", "g"]
pp_params.pymses.multiprocessing = True
pp_params.process.verbose = True
pp_params.disk.enable = True
pp_params.disk.nb_bin = 100
pp_params.pdf.nb_bin = 100
pp_params.process.num_process = 10
params = default_params()
params.input.nml_filename = "disk.nml"
params.pymses.map_size = 2048
params.pymses.zoom = 4
params.pymses.filter = False
params.pymses.variables = ["rho", "vel", "P", "g"]
params.pymses.multiprocessing = True
params.process.verbose = True
params.disk.enable = True
params.disk.nb_bin = 100
params.pdf.nb_bin = 100
params.process.num_process = 10
in_dir = "/drf/projets/alfven-data/nbrucy/simus/fragdisk"
out_dir = "/dsm/anais/storageA/nbrucy/visus/fragdisk/mnras"
in_dir_conv = "/drf/projets/alfven-data/nbrucy/simus/conv_disk"
@@ -166,7 +166,7 @@ pl_units = Plotter(
filter_name="104_beta4_jr13",
in_nums="last",
path_out=out_dir,
pp_params=pp_params,
params=params,
)
info = pl_units.comp.info
rd = U.Unit.create_unit(
@@ -223,8 +223,8 @@ for group in groups:
if group == "jr13_tic":
# JR13_TIC
pp_params.astrophysix.simu_fmt = "beta{nml[cloud_params/beta_cool]:g}_{tag:.8}"
pp_params.astrophysix.descr_fmt = """
params.astrophysix.simu_fmt = "beta{nml[cloud_params/beta_cool]:g}_{tag:.8}"
params.astrophysix.descr_fmt = """
<p>Group {tag:.8}, $\\beta$ = {nml[cloud_params/beta_cool]}.</p>
"""
@@ -236,14 +236,14 @@ for group in groups:
sort_run_by=nml_key,
path_out=out_dir,
tag="jr13_tic_mnras",
pp_params=pp_params,
params=params,
unit_time=orp,
)
if group == "jr12_tic":
# JR12_TIC
pp_params.astrophysix.simu_fmt = "beta{nml[cloud_params/beta_cool]:g}_{tag:.8}"
pp_params.astrophysix.descr_fmt = """
params.astrophysix.simu_fmt = "beta{nml[cloud_params/beta_cool]:g}_{tag:.8}"
params.astrophysix.descr_fmt = """
<p>Group {tag:.8}, $\\beta$ = {nml[cloud_params/beta_cool]}.</p>
"""
runs_12 = "0[0-9][0-9]_beta*_jr12"
@@ -255,14 +255,14 @@ for group in groups:
filter_nml=("cloud_params", "!=", 7),
path_out=out_dir,
tag="jr12_tic_mnras",
pp_params=pp_params,
params=params,
unit_time=orp,
)
if group == "jr12":
pp_params.astrophysix.simu_fmt = "beta{nml[cloud_params/beta_cool]:g}_{tag:.4}"
pp_params.astrophysix.descr_fmt = """
params.astrophysix.simu_fmt = "beta{nml[cloud_params/beta_cool]:g}_{tag:.4}"
params.astrophysix.descr_fmt = """
<p>Group {tag:.4}, $\\beta$ = {nml[cloud_params/beta_cool]}</p>
"""
@@ -275,14 +275,14 @@ for group in groups:
sort_run_by=nml_key,
path_out=out_dir,
tag="jr12_mnras",
pp_params=pp_params,
params=params,
unit_time=orp,
)
if group == "jr11":
pp_params.astrophysix.simu_fmt = "beta{nml[cloud_params/beta_cool]:g}_{tag:.4}"
pp_params.astrophysix.descr_fmt = """
params.astrophysix.simu_fmt = "beta{nml[cloud_params/beta_cool]:g}_{tag:.4}"
params.astrophysix.descr_fmt = """
<p>Group {tag:.4}, $\\beta$ = {nml[cloud_params/beta_cool]}</p>
"""
@@ -295,7 +295,7 @@ for group in groups:
filter_nml=("cloud_params/beta_cool", ">", 3),
path_out=out_dir_conv,
tag="jr11_mnras",
pp_params=pp_params,
params=params,
unit_time=orp,
)
@@ -305,8 +305,8 @@ for group in groups:
# -------------------------------------------------------------------------------------------------------------------- #
for pl in pls:
pl.pp_params.process.verbose = True
pl.comp.pp_params.process.verbose = True
pl.params.process.verbose = True
pl.comp.params.process.verbose = True
for run in pl.runs:
simu = pl.simulations[run]
proj.simulations.add(simu)