Update ut

- New version of ut cleaned and documented with Doxygen. - Neper code cleaned accordingly.
neperfepx · Mar 2, 2020 · a4b7472 · a4b7472
1 parent 53486ee
commit a4b7472
Show file tree

Hide file tree

Showing 561 changed files with 31,625 additions and 27,406 deletions.
diff --git a/VERSIONS b/VERSIONS
@@ -1,4 +1,4 @@
-New in 3.5.2-34 (20 Feb 2020):
+New in 3.5.2-35 (02 Mar 2020):
 - module -T: fixed -morphooptiobjective, fixed -statface nfaces, added
   tessellation keys nfaces_samedomain, nfacenb_samedomain, npolys_samedomain
   and npolynb_samedomain, fixed -transform planecut, added -transform

diff --git a/doc/texinfo/version.texi b/doc/texinfo/version.texi
@@ -3,9 +3,9 @@
 @c See the COPYING file in the top-level directory.
 
 @iftex
-@set NEPER_VERSION 3.5.2-34
+@set NEPER_VERSION 3.5.2-35
 @end iftex
 
 @ifinfo
-@set NEPER_VERSION 3.5.2-34
+@set NEPER_VERSION 3.5.2-35
 @end ifinfo
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 2.8)
 project(neper)
 
-set (NEPER_VERSION \"3.5.2-34\")
+set (NEPER_VERSION \"3.5.2-35\")
 
 # should we use the optional libraries?
 set (HAVE_GSL ON)
@@ -31,10 +31,10 @@ set (MUPARSER_BINARY_DIR "${PROJECT_BINARY_DIR}/contrib/muparser")
 set (MUPARSER_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/contrib/muparser/include")
 
 include_directories("${PROJECT_SOURCE_DIR}/contrib/openGJK")
-include_directories("${PROJECT_SOURCE_DIR}/contrib/ut")
-set (UT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/contrib/ut")
-set (UT_BINARY_DIR "${PROJECT_BINARY_DIR}/contrib/ut")
-set (UT_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/contrib/ut/include")
+include_directories("${PROJECT_SOURCE_DIR}/contrib/ut/src")
+set (UT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/contrib/ut/src")
+set (UT_BINARY_DIR "${PROJECT_BINARY_DIR}/contrib/ut/src")
+set (UT_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/contrib/ut/src/include")
 
 include_directories("${PROJECT_SOURCE_DIR}/contrib/orilib")
 include_directories("${PROJECT_SOURCE_DIR}/neut")
@@ -44,7 +44,7 @@ include_directories("${PROJECT_SOURCE_DIR}/neper_v")
 
 include_directories("${PROJECT_BINARY_DIR}")
 include_directories("${PROJECT_BINARY_DIR}/contrib/openGJK")
-include_directories("${PROJECT_BINARY_DIR}/contrib/ut")
+include_directories("${PROJECT_BINARY_DIR}/contrib/ut/src")
 include_directories("${PROJECT_BINARY_DIR}/contrib/orilib")
 include_directories("${PROJECT_BINARY_DIR}/contrib/muparser")
 include_directories("${PROJECT_BINARY_DIR}/neut")
@@ -83,7 +83,7 @@ set(MESSAGE_QUIET ON)
 
 add_subdirectory(contrib/openGJK)
 add_subdirectory(contrib/muparser)
-add_subdirectory(contrib/ut)
+add_subdirectory(contrib/ut/src)
 add_subdirectory(contrib/orilib)
 add_subdirectory(neut)
 add_subdirectory(neper_t)

diff --git a/src/contrib/orilib/ol_cal/ol_com.c b/src/contrib/orilib/ol_cal/ol_com.c
@@ -13,7 +13,7 @@ ol_g_g_g (double **g1, double **g2, double **g3)
   for (i = 0; i <= 2; i++)
     for (j = 0; j <= 2; j++)
       for (k = 0; k <= 2; k++)
-	gcpy[i][j] += g2[i][k] * g1[k][j];
+        gcpy[i][j] += g2[i][k] * g1[k][j];
 
   ol_g_memcpy (gcpy, g3);
 
@@ -83,11 +83,11 @@ ol_q_q_q_ref (double *q1, double *q2, double *q3)
 }
 
 void
-ol_R_R_R (double* R1, double* R2, double* R3)
+ol_R_R_R (double *R1, double *R2, double *R3)
 {
   int i;
   double scalprod;
-  double* tmp = ol_R_alloc ();
+  double *tmp = ol_R_alloc ();
 
   ut_vector_vectprod (R2, R1, tmp);
   scalprod = ut_vector_scalprod (R1, R2);
@@ -144,9 +144,9 @@ ol_q_vect_vect (double *q, double *v1, double *v2)
   ol_q_set_zero (q1);
   ol_q_set_zero (q2);
 
-  ut_array_1d_memcpy (q1 + 1, 3, v1);
+  ut_array_1d_memcpy (v1, 3, q1 + 1);
   ol_q_q_q (q, q1, q2);
-  ut_array_1d_memcpy (v2, 3, q2 + 1);
+  ut_array_1d_memcpy (q2 + 1, 3, v2);
 
   ol_q_free (q1);
   ol_q_free (q2);

diff --git a/src/contrib/orilib/ol_cal/ol_com.h b/src/contrib/orilib/ol_cal/ol_com.h
@@ -13,7 +13,7 @@ extern "C"
 #include<stdio.h>
 #include<stdlib.h>
 #include<math.h>
-#include"../ut/ut.h"
+#include"../ut/src/ut.h"
 #include"../ol_cal.h"
 
 #endif /* OL_COM_H */

diff --git a/src/contrib/orilib/ol_cal/ol_csys.h b/src/contrib/orilib/ol_cal/ol_csys.h
@@ -13,7 +13,7 @@ extern "C"
 #include<stdio.h>
 #include<stdlib.h>
 #include<math.h>
-#include"../ut/ut.h"
+#include"../ut/src/ut.h"
 #include"../ol_cal.h"
 
 #endif /* OL_CSYS_H */