[numerics] up lmgc driver for gfc3d
#include "GlobalFrictionContactProblem.h"
#include "gfc3d_Solvers.h"
#include "NumericsSparseMatrix.h"
-/* #define DEBUG_MESSAGES 1 */
+#include "numerics_verbose.h"
+/* #define DEBUG_NOCOLOR */
+/* #define DEBUG_MESSAGES */
/* #define DEBUG_STDOUT */
#include "debug.h"
@@ -62,11 +64,14 @@ int gfc3d_LmgcDriver(double *reaction,
int *iparam,
int dsize,
double *dparam,
- int verbose,
+ int verbose_in,
int outputFile,
int freq_output)
{
+
+ verbose = verbose_in;
+
/* NumericsMatrix M, H; */
NumericsMatrix * M =NM_new();
M->storageType = 2; /* sparse */
@@ -97,8 +102,8 @@ int gfc3d_LmgcDriver(double *reaction,
double * _Mdata = alloc_memory_double(nzM, Mdata);
_M->x = _Mdata;
- DEBUG_PRINTF("_M->n=%li\t",_M->n);
- DEBUG_PRINTF("_M->m=%li\n",_M->m);
+ DEBUG_PRINTF("_M->n=%lli\t",_M->n);
+ DEBUG_PRINTF("_M->m=%lli\n",_M->m);
NumericsSparseMatrix * SH =newNumericsSparseMatrix();
H->matrix2 = SH;
@@ -149,9 +154,10 @@ int gfc3d_LmgcDriver(double *reaction,
SolverOptions numerics_solver_options;
- gfc3d_setDefaultSolverOptions(&numerics_solver_options, solver_id);
-
+ int infi = gfc3d_setDefaultSolverOptions(&numerics_solver_options, solver_id);
+ assert(!infi);
int iSize_min = isize < numerics_solver_options.iSize ? isize : numerics_solver_options.iSize;
+ DEBUG_PRINTF("iSize_min = %i", iSize_min);
for (int i = 0; i < iSize_min; ++i)
numerics_solver_options.iparam[i] = iparam[i];
