Changeset e4dbe3b1 in OpenModelica for SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c

Timestamp:

2014-12-11T21:50:17+01:00 (10 years ago)

Author:

Adrian Pop <adrian.pop@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

7db0bbb

Parents:

44803ecc

Message:

• return something in SimulationRuntime/c/util/integer_array.c
• hopefully fix condition in SimulationRuntime/c/simulation/solver/initialization/initialization.c
• try to use proper data types in function interfaces
• get rid of some of the warnings
• transform to char* where needed

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@23747 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

• SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c (modified) (12 diffs)

SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c

@@ -45 +45 @@
 #include "nonlinearSystem.h"
 #include "nonlinearSolverHybrd.h"
-extern double enorm_(int *n, double *x);
+extern double enorm_(integer *n, double *x);
 
 typedef struct DATA_HYBRD
@@ -92 +92 @@
 };
 
-static int wrapper_fvec_hybrj(const int* n, const double* x, double* f, double* fjac, const int* ldjac, const int* iflag, void* data);
+static int wrapper_fvec_hybrj(const integer* n, const double* x, double* f, double* fjac, const integer* ldjac, const integer* iflag, void* data);
 
 /*! \fn allocate memory for nonlinear system solver hybrd
@@ -182 +182 @@
  *  \author wbraun
  */
-static void printVector(const double *vector, const int *size, const int logLevel, const char *name)
+static void printVector(const double *vector, const integer *size, const int logLevel, const char *name)
 {
   int i;
@@ -250 +250 @@
   double delta_h = sqrt(solverData->epsfcn);
   double delta_hh, delta_hhh, deltaInv;
-  int iflag = 1;
+  integer iflag = 1;
   int i, j, l;
 
@@ -339 +339 @@
  *
  */
-static int wrapper_fvec_hybrj(const int* n, const double* x, double* f, double* fjac, const int* ldjac, const int* iflag, void* dataAndSysNum)
+static int wrapper_fvec_hybrj(const integer* n, const double* x, double* f, double* fjac, const integer* ldjac, const integer* iflag, void* dataAndSysNum)
 {
   int i,j;
@@ -358 +358 @@
     /* debug output */
     if(ACTIVE_STREAM(LOG_NLS_RES)) {
-      infoStreamPrint(LOG_NLS_RES, 0, "-- residual function call %d -- scaling = %d", solverData->nfev, solverData->useXScaling);
+      infoStreamPrint(LOG_NLS_RES, 0, "-- residual function call %d -- scaling = %d", (int)solverData->nfev, solverData->useXScaling);
       printVector(x, n, LOG_NLS_RES, "x vector (scaled)");
       printVector(solverData->xScaled, n, LOG_NLS_RES, "x vector");
@@ -365 +365 @@
     /* call residual function */
     if(solverData->useXScaling){
-      (systemData->residualFunc)(data, (const double*) solverData->xScaled, f, iflag);
+      (systemData->residualFunc)(data, (const double*) solverData->xScaled, f, (const int*)iflag);
     } else {
-      (systemData->residualFunc)(data, x, f, iflag);
+      (systemData->residualFunc)(data, x, f, (const int*)iflag);
     }
 
@@ -373 +373 @@
     if(ACTIVE_STREAM(LOG_NLS_RES)) {
       printVector(f, n, LOG_NLS_RES, "residuals");
-      infoStreamPrint(LOG_NLS_RES, 0, "-- end of residual function call %d --", solverData->nfev);
+      infoStreamPrint(LOG_NLS_RES, 0, "-- end of residual function call %d --", (int)solverData->nfev);
     }
 
@@ -387 +387 @@
     /* call apropreated jacobain function */
     if(systemData->jacobianIndex != -1){
-      int iflagtmp = 1;
+      integer iflagtmp = 1;
       wrapper_fvec_hybrj(n, x, f, fjac, ldjac, &iflagtmp, dataSys);
 
@@ -403 +403 @@
       {
         char buffer[16384];
-        infoStreamPrint(LOG_NLS_JAC, 1, "jacobian matrix [%dx%d]", *n, *n);
+        infoStreamPrint(LOG_NLS_JAC, 1, "jacobian matrix [%dx%d]", (int)*n, (int)*n);
         for(i=0; i<*n; i++)
         {
@@ -420 +420 @@
 
   default:
-    throwStreamPrint(data->threadData, "Well, this is embarrasing. The non-linear solver should never call this case.%d", *iflag);
+    throwStreamPrint(data->threadData, "Well, this is embarrasing. The non-linear solver should never call this case.%d", (int)*iflag);
     break;
   }
@@ -446 +446 @@
 
   int i, j;
-  int iflag = 1;
+  integer iflag = 1;
   double xerror, xerror_scaled;
   int success = 0;