Skip to content

Commit

Permalink
Merge pull request #7 from nanotech-empa/release/1.4.4
Browse files Browse the repository at this point in the history
Release/1.4.4
  • Loading branch information
eimrek authored May 6, 2021
2 parents d11d9eb + b4a6f55 commit 80b2664
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"description": "App to run scanning probe microscopy simulations.",
"title": "Empa nanotech@surfaces Laboratory - Scanning Probe Microscopy",
"version": "1.4.3",
"version": "1.4.4",
"logo": "miscellaneous/logos/empa.png",
"authors": "nanotech@surfaces laboratory, Empa",
"state": "stable"
Expand Down
8 changes: 7 additions & 1 deletion stm/stm_workchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def run_scf_diag(self):
self.report("Running CP2K diagonalization SCF")

emax = float(self.inputs.stm_params.get_dict()['--energy_range'][1])
self.ctx.n_atoms = len(self.inputs.structure.sites)

inputs = self.build_cp2k_inputs(self.inputs.structure,
self.inputs.cp2k_code,
Expand All @@ -70,8 +71,11 @@ def run_stm(self):
inputs['code'] = self.inputs.stm_code
inputs['parameters'] = self.inputs.stm_params
inputs['parent_calc_folder'] = self.ctx.scf_diag.outputs.remote_folder

n_machines = 6 if self.ctx.n_atoms < 2000 else 12

inputs['metadata']['options'] = {
"resources": {"num_machines": 6},
"resources": {"num_machines": n_machines},
"max_wallclock_seconds": 21600,
}

Expand Down Expand Up @@ -122,6 +126,8 @@ def build_cp2k_inputs(cls, structure, code, dft_params, wfn_file_path, emax):
num_machines = 12
if n_atoms > 500:
num_machines = 27
if n_atoms > 2000:
num_machines = 48
walltime = 72000

wfn_file = ""
Expand Down

0 comments on commit 80b2664

Please sign in to comment.