Skip to content

Commit

Permalink
Merge pull request #8 from nanotech-empa/release/1.4.5
Browse files Browse the repository at this point in the history
Release/1.4.5
  • Loading branch information
eimrek authored May 6, 2021
2 parents 80b2664 + 5cf8cad commit 766a46e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 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.4",
"version": "1.4.5",
"logo": "miscellaneous/logos/empa.png",
"authors": "nanotech@surfaces laboratory, Empa",
"state": "stable"
Expand Down
9 changes: 7 additions & 2 deletions pdos/pdos_workchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ def define(cls, spec):
def run_scfs(self):
self.report("Running CP2K diagonalization SCF")

self.ctx.n_all_atoms = len(self.inputs.slabsys_structure.sites)

slab_inputs = self.build_slab_cp2k_inputs(
self.inputs.slabsys_structure,
self.inputs.pdos_lists,
Expand Down Expand Up @@ -81,8 +83,11 @@ def run_overlap(self):
inputs['parameters'] = self.inputs.overlap_params
inputs['parent_slab_folder'] = self.ctx.slab_scf.outputs.remote_folder
inputs['parent_mol_folder'] = self.ctx.mol_scf.outputs.remote_folder

n_machines = 4 if self.ctx.n_all_atoms < 2000 else 8

inputs['metadata']['options'] = {
"resources": {"num_machines": 4, "num_mpiprocs_per_machine": 12},
"resources": {"num_machines": n_machines},
"max_wallclock_seconds": 10600,
}

Expand Down Expand Up @@ -185,7 +190,7 @@ def build_mol_cp2k_inputs(cls, structure, code,
atoms.cell[1, 1],
atoms.cell[2, 2])
num_machines = 6
if len(atoms) > 150:
if len(atoms) > 100:
num_machines = 12
walltime = 72000

Expand Down

0 comments on commit 766a46e

Please sign in to comment.