'APPLICATION.products.nlopt' : '2.5.0'
'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB12' }
'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_DB12', hpc: 'yes' }
+ 'APPLICATION.products.HOMARD' : {tag: 'V9_12_0', base: 'no', section: 'version_V9_12_0_DB12'}
+ 'APPLICATION.products.SHAPER' : {tag: 'V9_12_0', base: 'no', section: 'version_V9_12_0_DB12'}
+ 'APPLICATION.products.SOLVERLAB' : {tag: 'V9_12_0', base: 'no', section: 'version_V9_12_0_DB12'}
}
{
# CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
opt_depend : ['openmpi']
}
+version_V9_12_0_DB12 :
+{
+ patches : ['HOMARD-V9_12_0-numpy-1.20.-np.float.patch']
+}
+
version_V9_10_0_MPI :
{
cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSALOME_USE_MPI=ON "
version_2_6_DB12:
{
- patches: ['pyfmi-2.6-python-3.1x.01.patch']
+ patches: ['pyfmi-2.6-python-3.1x.01.patch', 'PyFMI-2.6-numpy-1.20-np.float.patch']
compil_script : "PyFMI-2.6.sh"
properties:
{
cmake_options : " -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe "
}
+version_V9_12_0_DB12 :
+{
+ patches : ['SHAPER-V9_12_0-numpy-1.20-np.float.patch']
+}
+
version_V9_10_0_FD37:
{
patches : ['SPNS-32377-SHAPER-V9_10_0-FD37.patch']
opt_depend : ['mpi4py']
}
+version_V9_12_0_DB12 :
+{
+ patches : ['SOLVERLAB-V9_12_0-numpy-1.20.-np.float.patch']
+}
+
version_V9_10_0 :
{
properties:
--- /dev/null
+diff --git a/src/tests/Test/test_5.py b/src/tests/Test/test_5.py
+index 01baaa9..af1ec47 100755
+--- a/src/tests/Test/test_5.py
++++ b/src/tests/Test/test_5.py
+@@ -179,7 +179,7 @@ Python script for MEDCoupling
+ cg_hexa = cg_hexa_ml.toNumPyArray()
+ # Target
+ # ======
+- xyz_p = np.zeros(3, dtype=np.float)
++ xyz_p = np.zeros(3, dtype=np.float32)
+ xyz_p[0] = -0.20*float(1-niter) * LG_X
+ xyz_p[1] = -0.15*float(1-niter) * LG_Y
+ xyz_p[2] = -0.10*float(1-niter) * LG_Z
--- /dev/null
+--- PyFMI-2.6_ref/src/pyfmi/fmi_coupled.pyx 2024-01-15 10:37:54.999574589 +0100
++++ PyFMI-2.6_dev/src/pyfmi/fmi_coupled.pyx 2024-01-15 10:37:43.735520048 +0100
+@@ -1004,7 +1004,7 @@
+ Calls the low-level FMI function: fmi2SetReal
+ """
+ input_valueref = np.array(valueref, ndmin=1).ravel()
+- set_value = np.array(values, dtype=np.float, ndmin=1).ravel()
++ set_value = np.array(values, dtype=np.float32, ndmin=1).ravel()
+
+ if input_valueref.size != set_value.size:
+ raise fmi.FMUException('The length of valueref and values are inconsistent.')
--- /dev/null
+diff --git a/src/PythonAddons/macros/pipeNetwork/feature.py b/src/PythonAddons/macros/pipeNetwork/feature.py
+index 1ff9ec621..6fddccc34 100755
+--- a/src/PythonAddons/macros/pipeNetwork/feature.py
++++ b/src/PythonAddons/macros/pipeNetwork/feature.py
+@@ -232,7 +232,7 @@ Sorties :
+ coox = self.infoPoints[l_noeuds[iaux+jaux]]["X"]
+ cooy = self.infoPoints[l_noeuds[iaux+jaux]]["Y"]
+ cooz = self.infoPoints[l_noeuds[iaux+jaux]]["Z"]
+- vect.append(np.array((coox,cooy,cooz),np.float))
++ vect.append(np.array((coox,cooy,cooz),np.float32))
+ cosinus = np.dot(vect[1]-vect[0],vect[1]-vect[2])/(np.linalg.norm(vect[1]-vect[0])* np.linalg.norm(vect[1]-vect[2]))
+ #print ("cosinus = {}".format(cosinus))
+ # Si l'angle est plat, c'est que les 3 points sont alignés : on arrête... sauf si ce point est un départ d'une autre !
--- /dev/null
+diff --git a/CDMATH/tests/doc/3DPoissonEF/FiniteElements3DPoisson_CUBE.html b/CDMATH/tests/doc/3DPoissonEF/FiniteElements3DPoisson_CUBE.html
+index a33c3d7..f738ac2 100644
+--- a/CDMATH/tests/doc/3DPoissonEF/FiniteElements3DPoisson_CUBE.html
++++ b/CDMATH/tests/doc/3DPoissonEF/FiniteElements3DPoisson_CUBE.html
+@@ -12105,7 +12105,7 @@ A. Hannukainen, S. Korotov, M. Křı́žek, Maximum angle condition is not neces
+ <span class="c1">#Here are: Sparse matrix using scipy and vector using numpy </span>
+ <span class="c1">#==========================================================</span>
+ <span class="c1">#B = np.zeros(nbInteriorNodes)</span>
+-<span class="c1">#A = coo_matrix((nbInteriorNodes, nbInteriorNodes), dtype=np.float).toarray()</span>
++<span class="c1">#A = coo_matrix((nbInteriorNodes, nbInteriorNodes), dtype=np.float64).toarray()</span>
+
+ <span class="c1"># Vecteurs gradient de la fonction de forme associée à chaque noeud d'un triangle (hypothèse 2D)</span>
+ <span class="n">GradShapeFunc0</span><span class="o">=</span><span class="n">cdmath</span><span class="o">.</span><span class="n">Vector</span><span class="p">(</span><span class="mi">3</span><span class="p">)</span><span class="c1">#en 3D GradShapeFunc0=cdmath.Vector(3)</span>
+diff --git a/CDMATH/tests/doc/3DPoissonEF/FiniteElements3DPoisson_CUBE.ipynb b/CDMATH/tests/doc/3DPoissonEF/FiniteElements3DPoisson_CUBE.ipynb
+index ad39e47..292bfd5 100644
+--- a/CDMATH/tests/doc/3DPoissonEF/FiniteElements3DPoisson_CUBE.ipynb
++++ b/CDMATH/tests/doc/3DPoissonEF/FiniteElements3DPoisson_CUBE.ipynb
+@@ -291,7 +291,7 @@
+ "#Here are: Sparse matrix using scipy and vector using numpy \n",
+ "#==========================================================\n",
+ "#B = np.zeros(nbInteriorNodes)\n",
+- "#A = coo_matrix((nbInteriorNodes, nbInteriorNodes), dtype=np.float).toarray()\n",
++ "#A = coo_matrix((nbInteriorNodes, nbInteriorNodes), dtype=np.float32).toarray()\n",
+ "\n",
+ "# Vecteurs gradient de la fonction de forme associée à chaque noeud d'un triangle (hypothèse 2D)\n",
+ "GradShapeFunc0=cdmath.Vector(3)#en 3D GradShapeFunc0=cdmath.Vector(3)\n",
