Skip to content

Commit 1d4f033

Browse files
committed
#566: added infrastructure for parameters for lb iterations
1 parent f9d76b3 commit 1d4f033

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

config/conf.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,4 @@ write_JSON:
3535
suffix: json
3636
communications: true
3737
offline_LB_compatible: false
38-
# visualization:
39-
# x_ranks: 2
40-
# y_ranks: 2
41-
# z_ranks: 1
42-
# object_jitter: 0.5
43-
# rank_qoi: load
44-
# object_qoi: load
45-
# save_meshes: true
46-
# force_continuous_object_qoi: true
47-
# output_visualization_dir: ../output
48-
# output_visualization_file_stem: output_file
38+
lb_iterations: true

src/lbaf/Applications/LBAF_app.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,12 @@ def init_parameters(self, config: dict, base_dir: str):
198198
raise SystemExit(1) from e
199199

200200
# Retrieve optional parameters
201-
self.json_params[
202-
"json_output_suffix"] = wrt_json.get("suffix", "json")
203-
self.json_params[
204-
"communications"] = wrt_json.get("communications", False)
205-
self.json_params[
206-
"offline_LB_compatible"] = wrt_json.get(
207-
"offline_LB_compatible", False)
201+
for k_out, k_wrt, v_def in [
202+
("json_output_suffix", "suffix", "json"),
203+
("communications", "communications", False),
204+
("offline_LB_compatible", "offline_LB_compatible", False),
205+
("lb_iterations", "lb_iterations", False)]:
206+
self.json_params[k_out] = wrt_json.get(k_wrt, v_def)
208207

209208
def check_parameters(self):
210209
"""Checks after initialization."""
@@ -586,7 +585,7 @@ def run(self, cfg=None, cfg_dir=None):
586585
self.__parameters.object_qoi if self.__parameters.object_qoi is not None else '')
587586

588587
# Execute runtime for specified phases
589-
offline_LB_compatible = self.__parameters.json_params.get( # pylint:disable=C0103:invalid-name;not lowercase
588+
offline_LB_compatible = self.__parameters.json_params.get(
590589
"offline_LB_compatible", False)
591590
rebalanced_phase = runtime.execute(
592591
self.__parameters.algorithm.get("phase_id", 0),

src/lbaf/IO/lbsConfigurationValidator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ def __init__(self, config_to_validate: dict, logger: Logger):
136136
"compressed": bool,
137137
Optional("suffix"): str,
138138
Optional("communications"): bool,
139-
Optional("offline_LB_compatible"): bool},
139+
Optional("offline_LB_compatible"): bool,
140+
Optional("lb_iterations"): bool},
140141
})
141142
self.__from_data = Schema({
142143
"data_stem": str,

0 commit comments

Comments
 (0)