KCore, Post: passing function from fortran to C

onera · Oct 24, 2024 · a24bed4 · a24bed4
1 parent dd930cc
commit a24bed4
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 1,255 deletions.
diff --git a/Cassiopee/Converter/Converter/Expression/node.hpp b/Cassiopee/Converter/Converter/Expression/node.hpp
@@ -10,6 +10,7 @@ namespace Expression
 	class ast::node 
 	{
 	public:
+		virtual ~node() {}
 		/**
 		 * @brief Evaluate the node at index i
 		 * @details evaluate the node at index i. If this node is not a terminal node

diff --git a/Cassiopee/Intersector/PolyMeshTools/aggloCells.cpp b/Cassiopee/Intersector/PolyMeshTools/aggloCells.cpp
@@ -17,7 +17,6 @@
     along with Cassiopee.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 # include <string>
 # include <sstream> 
 # include "intersector.h"
@@ -215,7 +214,7 @@ PyObject* K_INTERSECTOR::agglomerateCellsWithSpecifiedFaces(PyObject* self, PyOb
   K_FLD::IntArray & cnt = *cn;
 
   E_Int* pgsList=NULL;
-  E_Int size, nfld;
+  E_Int size=0, nfld=1;
   if (py_pgs != Py_None)
     K_NUMPY::getFromNumpyArray(py_pgs, pgsList, size, nfld, 1);
 

diff --git a/Cassiopee/KCore/KCore/Fld/FldArray.h b/Cassiopee/KCore/KCore/Fld/FldArray.h
@@ -56,8 +56,6 @@ extern "C" void k6setallbvaluesatf_(const E_Int& sizeLoc,
                                     const E_Int& nj,
                                     const E_Int& nk,
                                     const E_Int& border);
-extern "C" void k6fldsqrt_(E_Float* _data,
-                           const E_Int& sizeTotLoc);
 
 // Set rake for a compact array
 #define SETRAKE                                                         \
@@ -1031,17 +1029,15 @@ E_Int FldArray<T>::indMax(E_Int inc, E_Int nfld) const
 TEMPLATE_T
 void FldArray<T>::sqrt()
 {
-  k6fldsqrt_(_data, _nfldLoc*_sizeMax);
-  /*
-#pragma omp parallel default(shared)
+  #pragma omp parallel
   {
     for (E_Int n = 0; n < _nfldLoc; n++)
     {
         T* pt = _rake[n];
-#pragma omp for
+        #pragma omp for
         for (E_Int i = 0; i < _sizeLoc; i++) pt[i*_stride] = std::sqrt(pt[i*_stride]);
     }
-    }*/
+  }
 }
 
 //OK---------------------------------------------------------------------------