Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into simple
Browse files Browse the repository at this point in the history
# Conflicts:
#	atomistics/calculators/ase.py
#	atomistics/calculators/lammps/calculator.py
#	atomistics/calculators/lammps/helpers.py
#	atomistics/calculators/qe.py
#	atomistics/shared/thermal_expansion.py
#	atomistics/workflows/elastic/workflow.py
#	atomistics/workflows/evcurve/workflow.py
#	atomistics/workflows/phonons/workflow.py
  • Loading branch information
jan-janssen committed Jan 9, 2024
2 parents caa94ea + 85fa8d3 commit 33ee1b4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions atomistics/shared/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ class Output:
def keys(cls):
return tuple(field.name for field in dataclasses.fields(cls))

def get(self, *output: str) -> dict:
return {q: getattr(self, q)() for q in output}
def get(self, output_keys: tuple) -> dict:
return {q: getattr(self, q)() for q in output_keys}


@dataclasses.dataclass
Expand Down
2 changes: 1 addition & 1 deletion atomistics/workflows/evcurve/debye.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,4 +241,4 @@ def get_thermal_properties(
)
return OutputThermodynamic(
**{k: getattr(debye_model, k) for k in OutputThermodynamic.keys()}
).get(*output_keys)
).get(output_keys=output_keys)
2 changes: 1 addition & 1 deletion atomistics/workflows/quasiharmonic.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def get_thermal_properties(
)
return OutputThermodynamic(
**{k: getattr(qhp, k) for k in OutputThermodynamic.keys()}
).get(*output_keys)
).get(output_keys=output_keys)


def _get_thermal_properties_quantum_mechanical(
Expand Down

0 comments on commit 33ee1b4

Please sign in to comment.