diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cce2c2bae3b02434dc415b25babb0233db16cd8c..f3d6ebb05fce3dbd0acc8ee0b5e961a461ea0dab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,10 @@ # gitlab-ci file for amfe-solvers default: - image: rboman/waves-py3:2022.0 + image: rboman/waves-py3:latest before_script: - - source /opt/intel/mkl/bin/mklvars.sh intel64 - - source /opt/intel/tbb/bin/tbbvars.sh intel64 + - source /opt/intel/oneapi/mkl/latest/env/vars.sh + - source /opt/intel/oneapi/tbb/latest/env/vars.sh - echo $(nproc) - printenv | sort diff --git a/ext/amfe b/ext/amfe index e3b7f5ec2f629f6516a9d68e55637468c161f9d0..a3922dc3aac5fbb0377a0c90cbc035d1c447ff0d 160000 --- a/ext/amfe +++ b/ext/amfe @@ -1 +1 @@ -Subproject commit e3b7f5ec2f629f6516a9d68e55637468c161f9d0 +Subproject commit a3922dc3aac5fbb0377a0c90cbc035d1c447ff0d diff --git a/heat/utils.py b/heat/utils.py index 29987fe36568022fe7b20dc7b6b30b198d1fa45d..f0c75dedd96885c35abc7c9a938d1744c03dcefe 100644 --- a/heat/utils.py +++ b/heat/utils.py @@ -45,7 +45,7 @@ def getTemp(solver, linelabel="Bottom", sort='x'): import numpy as np 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) nys = np.zeros_like(v) for i in range(len(v)): diff --git a/run.py b/run.py old mode 100644 new mode 100755 diff --git a/waves/viewer.py b/waves/viewer.py index 197bf0505f5592b73b39379eed20063df3eda326..265735179da8fcce84b943e92a089063d99f8831 100644 --- a/waves/viewer.py +++ b/waves/viewer.py @@ -297,7 +297,7 @@ class MeshViewer(QWidget, w.DisplayHook): for i in range(self.msh.elems.size()): e = self.msh.elems[i] n = e.nodes - if e.type() == tb.ELTYPE_HEX8: + if e.type() == tb.ElType_HEX8: hexa = vtk.vtkHexahedron() ids = hexa.GetPointIds() for j in range(8):