Skip to content

Commit

Permalink
Merge branch 'main' into release/0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
wenhuiuy committed Mar 5, 2024
2 parents 6a25368 + e37b547 commit a8fffd8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ tests = [
"pyvista==0.43.3",
"matplotlib==3.8.3",
"numpy==1.26.4",
"pytest==8.0.1",
"pytest==8.0.2",
"pytest-cov==4.1.0",
"joblib==1.3.2",
"pandas==2.2.0",
"pandas==2.2.1",
"openpyxl==3.1.2",
"scikit-learn==1.4.1.post1",
"pytest-xdist==3.5.0",
"ipython==8.22.1",
"ipython==8.22.2",
]
doc = [
"recommonmark==0.7.1",
Expand All @@ -65,7 +65,7 @@ doc = [
"ipywidgets==8.1.2",
"joblib==1.3.2",
"scikit-learn==1.4.1.post1",
"ipython==8.22.1",
"ipython==8.22.2",
"jupyterlab==4.1.2",
"sphinx-jinja==2.0.2",
"sphinx-autoapi==3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/ansys/dyna/core/pre/dynasolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,8 @@ def save_file(self):
def quit(self):
"""Delete remote instance."""

if self.pim_client is not None:
self.pim_client.close()
if self.remote_instance is not None:
self.remote_instance.delete()
if self.pim_client is not None:
self.pim_client.close()
return
4 changes: 2 additions & 2 deletions src/ansys/dyna/core/solver/dynasolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,10 @@ def quit(self):
command and continues running.
"""
self.logger.debug("quit")
if self.pim_client is not None:
self.pim_client.close()
if self.remote_instance is not None:
self.remote_instance.delete()
if self.pim_client is not None:
self.pim_client.close()
request = dynasolver_pb2.QuitServer()
# ALWAYS returns ACK, so don't bother checking
self.stub.quit_server(request)
Expand Down

0 comments on commit a8fffd8

Please sign in to comment.