Skip to content

Commit

Permalink
Merge pull request #49 from materialdigital/pymatgen_update
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
jan-janssen authored Nov 5, 2024
2 parents aba4250 + 15a827a commit cb5135b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
10 changes: 5 additions & 5 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ channels:
- conda-forge
dependencies:
- python=3.11
- pyiron_base=0.10.5
- pyiron_base=0.10.6
- qe=7.2
- qe-tools=2.0.0
- ase=3.23.0
- matplotlib=3.8.4
- xmlschema=3.3.1
- matplotlib=3.9.2
- xmlschema=3.4.2
- jobflow=0.1.18
- pymatgen=2024.3.1
- pymatgen=2024.10.29
- aiida-core=2.6.2
- aiida-core.services
- aiida-core.services=2.6.2
9 changes: 5 additions & 4 deletions pyiron_base.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"from ase.build import bulk\n",
"from ase.io import write\n",
"from adis_tools.parsers import parse_pw\n",
"from pyiron_base import pyiron_job, Project"
"from pyiron_base import job, Project"
]
},
{
Expand Down Expand Up @@ -75,7 +75,7 @@
},
"outputs": [],
"source": [
"@pyiron_job(output_key_lst=[\"energy\", \"volume\", \"structure\"])\n",
"@job(output_key_lst=[\"energy\", \"volume\", \"structure\"])\n",
"def calculate_qe(working_directory, input_dict):\n",
" write_input(\n",
" input_dict=input_dict,\n",
Expand All @@ -102,7 +102,7 @@
},
"outputs": [],
"source": [
"@pyiron_job(list_length=5)\n",
"@job\n",
"def generate_structures(structure, strain_lst):\n",
" structure_lst = []\n",
" for strain in strain_lst:\n",
Expand All @@ -122,7 +122,7 @@
},
"outputs": [],
"source": [
"@pyiron_job\n",
"@job\n",
"def plot_energy_volume_curve(volume_lst, energy_lst):\n",
" plt.plot(volume_lst, energy_lst)\n",
" plt.xlabel(\"Volume\")\n",
Expand Down Expand Up @@ -230,6 +230,7 @@
" structure=calc_mini.output.structure,\n",
" strain_lst=np.linspace(0.9, 1.1, number_of_strains),\n",
" pyiron_project=pr,\n",
" list_length=number_of_strains,\n",
")"
]
},
Expand Down

0 comments on commit cb5135b

Please sign in to comment.