Skip to content
Snippets Groups Projects
Commit 459b9997 authored by Boman Romain's avatar Boman Romain
Browse files

Merge branch 'boman' into 'main'

Update docker to latest (VTK9+OneAPI)

See merge request !3
parents 97b06f41 b058d651
No related branches found
No related tags found
1 merge request!3Update docker to latest (VTK9+OneAPI)
Pipeline #44805 passed
# gitlab-ci file for amfe-solvers # gitlab-ci file for amfe-solvers
default: default:
image: rboman/waves-py3:2022.0 image: rboman/waves-py3:latest
before_script: before_script:
- source /opt/intel/mkl/bin/mklvars.sh intel64 - source /opt/intel/oneapi/mkl/latest/env/vars.sh
- source /opt/intel/tbb/bin/tbbvars.sh intel64 - source /opt/intel/oneapi/tbb/latest/env/vars.sh
- echo $(nproc) - echo $(nproc)
- printenv | sort - printenv | sort
......
Subproject commit e3b7f5ec2f629f6516a9d68e55637468c161f9d0 Subproject commit a3922dc3aac5fbb0377a0c90cbc035d1c447ff0d
...@@ -45,7 +45,7 @@ def getTemp(solver, linelabel="Bottom", sort='x'): ...@@ -45,7 +45,7 @@ def getTemp(solver, linelabel="Bottom", sort='x'):
import numpy as np import numpy as np
v = np.array(extr.execute()) v = np.array(extr.execute())
nos = np.zeros_like(v, dtype=np.int) nos = np.zeros_like(v, dtype=int)
nxs = np.zeros_like(v) nxs = np.zeros_like(v)
nys = np.zeros_like(v) nys = np.zeros_like(v)
for i in range(len(v)): for i in range(len(v)):
......
run.py 100644 → 100755
File mode changed from 100644 to 100755
...@@ -297,7 +297,7 @@ class MeshViewer(QWidget, w.DisplayHook): ...@@ -297,7 +297,7 @@ class MeshViewer(QWidget, w.DisplayHook):
for i in range(self.msh.elems.size()): for i in range(self.msh.elems.size()):
e = self.msh.elems[i] e = self.msh.elems[i]
n = e.nodes n = e.nodes
if e.type() == tb.ELTYPE_HEX8: if e.type() == tb.ElType_HEX8:
hexa = vtk.vtkHexahedron() hexa = vtk.vtkHexahedron()
ids = hexa.GetPointIds() ids = hexa.GetPointIds()
for j in range(8): for j in range(8):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment