Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding relax max_step widget #1063

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/aiidalab_qe/app/configuration/advanced/advanced.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,17 @@ def render(self):
(self.electron_maxstep, "value"),
)

self.optimization_maxsteps = ipw.BoundedIntText(
min=50,
max=1000,
step=1,
description="Max. optimization steps:",
style={"description_width": "initial"},
)
ipw.link(
(self._model, "optimization_maxsteps"),
(self.optimization_maxsteps, "value"),
)
self.pseudos.render()

self.children = [
Expand All @@ -229,7 +240,12 @@ def render(self):
],
layout=ipw.Layout(justify_content="space-between"),
),
self.electron_maxstep,
ipw.HBox(
children=[
self.electron_maxstep,
self.optimization_maxsteps,
],
),
self.smearing,
ipw.HTML("""
<div>
Expand Down
5 changes: 5 additions & 0 deletions src/aiidalab_qe/app/configuration/advanced/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ class AdvancedConfigurationSettingsModel(
scf_conv_thr = tl.Float(0.0)
scf_conv_thr_step = tl.Float(1e-10)
electron_maxstep = tl.Int(80)
optimization_maxsteps = tl.Int(50)

kpoints_distance = tl.Float(0.0)
mesh_grid = tl.Unicode("")

Expand Down Expand Up @@ -109,6 +111,7 @@ def get_model_state(self):
},
"clean_workdir": self.clean_workdir,
"kpoints_distance": self.kpoints_distance,
"optimization_maxsteps": self.optimization_maxsteps,
}

hubbard: HubbardConfigurationSettingsModel = self.get_model("hubbard") # type: ignore
Expand Down Expand Up @@ -192,6 +195,7 @@ def set_model_state(self, parameters):
pseudos.ecutrho = parameters["pw"]["parameters"]["SYSTEM"]["ecutrho"]

self.kpoints_distance = parameters.get("kpoints_distance", 0.15)
self.optimization_maxsteps = parameters.get("optimization_maxsteps", 50)

if (pw_parameters := parameters.get("pw", {}).get("parameters")) is not None:
self._set_pw_parameters(pw_parameters)
Expand Down Expand Up @@ -237,6 +241,7 @@ def reset(self):
self.electron_maxstep = self._get_default("electron_maxstep")
self.spin_orbit = self._get_default("spin_orbit")
self.kpoints_distance = self._get_default("kpoints_distance")
self.optimization_maxsteps = self._get_default("optimization_maxsteps")

def _get_default(self, trait):
return self._defaults.get(trait, self.traits()[trait].default_value)
Expand Down
8 changes: 8 additions & 0 deletions src/aiidalab_qe/workflows/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,14 @@ def get_builder_from_protocol(
"base": parameters["advanced"],
"base_final_scf": parameters["advanced"],
}
# nsteps only for relaxation workflow
relax_overrides["base"]["pw"]["parameters"]["CONTROL"]["nstep"] = parameters[
"advanced"
]["optimization_maxsteps"]
relax_overrides["base_final_scf"]["pw"]["parameters"]["CONTROL"]["nstep"] = (
parameters["advanced"]["optimization_maxsteps"]
)

protocol = parameters["workchain"]["protocol"]

relax_builder = PwRelaxWorkChain.get_builder_from_protocol(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ advanced:
clean_workdir: false
initial_magnetic_moments: null
kpoints_distance: 0.12
optimization_maxsteps: 50
pseudo_family: SSSP/1.3/PBEsol/efficiency
pw:
parameters:
Expand Down
Loading