Skip to content
This repository has been archived by the owner on Nov 27, 2024. It is now read-only.

Commit

Permalink
Merge pull request #235 from pyiron/damask_update_2
Browse files Browse the repository at this point in the history
Damask update - small fix
  • Loading branch information
jan-janssen authored Dec 1, 2023
2 parents 44ee9f7 + 74b3e1e commit 641ca2a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .ci_support/environment-notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ dependencies:
- coveralls
- coverage
- codacy-coverage
- damask-mesh =3.0.0a7
- damask-grid =3.0.0a7
- damask =3.0.0a7
- damask-mesh =3.0.0a8
- damask-grid =3.0.0a8
- damask =3.0.0a8
- fenics =2019.1.0
- fenics =2019.1.0=*_42
- mshr =2019.1.0=*_9
- k3d =2.16.0
- matplotlib =3.8.0
- numpy =1.26.0
- pyiron =0.5.0
- pyiron-data =0.0.25
- python-damask =3.0.0a7
- pyiron-data =0.0.26
- python-damask =3.0.0a8
- pyvista =0.42.3
- scipy =1.11.3
- seaborn =0.13.0
Expand Down
1 change: 1 addition & 0 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ dependencies:
- pyiron_base =0.6.9
- scipy =1.11.4
- sympy =1.12
- python-blosc2 # required by tables
6 changes: 3 additions & 3 deletions pyiron_continuum/damask/damaskjob.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(self, project, job_name):
job_name(str): the name of the job
"""
super(DAMASK, self).__init__(project, job_name)
self._damask_hdf = os.path.join(self.working_directory, "damask_loading.hdf5")
self._damask_hdf = os.path.join(self.working_directory, "damask_loading_material.hdf5")
self._material = None
self._loading = None
self._grid = None
Expand Down Expand Up @@ -91,14 +91,14 @@ def collect_output(self):
self._load_results()
self.output.damask = self._results

def _load_results(self, file_name="damask_loading.hdf5"):
def _load_results(self, file_name="damask_loading_material.hdf5"):
"""
loads the results from damask hdf file
Args:
file_name(str): path to the hdf file
"""
if self._results is None:
if file_name != "damask_loading.hdf5":
if file_name != "damask_loading_material.hdf5":
self._damask_hdf = os.path.join(self.working_directory, file_name)

self._results = Result(self._damask_hdf)
Expand Down

0 comments on commit 641ca2a

Please sign in to comment.