version 1.32

cran · Apr 14, 2022 · a13690f · a13690f
1 parent e24e00e
commit a13690f
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 25 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: deSolve
-Version: 1.31
+Version: 1.32
 Title: Solvers for Initial Value Problems of Differential Equations
  ('ODE', 'DAE', 'DDE')
 Authors@R: c(person("Karline","Soetaert", role = c("aut"), 
@@ -41,7 +41,7 @@ Author: Karline Soetaert [aut] (<https://orcid.org/0000-0003-4603-7100>),
  Youcef Saad [ctb] (file dsparsk.f),
  Clement W. Ulrich [ctb] (file ddaspk.f)
 Maintainer: Thomas Petzoldt <[email protected]>
-Depends: R (>= 3.3.0)
+Depends: R (>= 4.0.0)
 Imports: methods, graphics, grDevices, stats
 Suggests: scatterplot3d, FME
 Description: Functions that solve initial value problems of a system
@@ -60,6 +60,6 @@ License: GPL (>= 2)
 URL: http://desolve.r-forge.r-project.org/
 LazyData: yes
 NeedsCompilation: yes
-Packaged: 2022-03-30 21:48:33 UTC; thpe
+Packaged: 2022-04-14 05:49:47 UTC; thpe
 Repository: CRAN
-Date/Publication: 2022-03-30 22:30:02 UTC
+Date/Publication: 2022-04-14 10:32:30 UTC
diff --git a/MD5 b/MD5
@@ -1,6 +1,6 @@
-9f823b0b6f691d0d41e2fb82cf042a35 *DESCRIPTION
+f2854bfc20931bab9d3ce6c0d5564a90 *DESCRIPTION
 316262d3be55a7fcb10ac5ceebfd7658 *NAMESPACE
-419e0731a9f4705855b7bb26a37ebaf8 *NEWS
+4ef5345b00f0f075b3f252b2fa9af685 *NEWS
 4df6c896706646b5793cc6357b15574a *R/Aquaphy.R
 75b53acdcea2f0de92203a153b956f89 *R/DLLfunc.R
 31be22a79645487f5441d15c21de881d *R/SCOC.R
@@ -28,19 +28,19 @@ b38770dbdf5427f991aff49e5b4f5592 *R/lsodes.R
 d3bcd9e29d24a57f2db46c635351814d *R/rkMethod.R
 00a93dc2aa00eb62b90e9db0182c8883 *R/vode.R
 1fd4fa28ad703b00b7e788b3440d04c1 *R/zvode.R
-de96b7bad0386851366f154c872aef72 *build/partial.rdb
-0a20f7c2e80c1e96aba844699057accd *build/vignette.rds
-b0cffc233832c22951443ea8c8cfe5b3 *data/ccl4data.rda
+f01682ffd9d5582c0d3b8a226f3c2b16 *build/partial.rdb
+c3c782a3f9695f34fa0d251fc32e8fdc *build/vignette.rds
+7c81e9ce28a91d034229f8115ff76b5e *data/ccl4data.rda
 be157a942988018a45e577923b2b66e6 *demo/00Index
 c0c0293b16490375a893937ef11f398b *demo/CCL4model.R
 5b936a490bc9ea9aebc3f80cb6ce1fa5 *demo/odedim.R
 506f97dcf20a87685fedc74135d79570 *inst/CITATION
 803b9ada2c0b88d2877828f0b4b52b56 *inst/doc/compiledCode.R
 133d3be6961bf71187e0cb4c605d0019 *inst/doc/compiledCode.Rnw
-ef6742a1f68cd6b5452896b7ca83acff *inst/doc/compiledCode.pdf
+25426799b768a93679bf767e4cd51628 *inst/doc/compiledCode.pdf
 422530948f2a821f1c930a067c1f6125 *inst/doc/deSolve.R
 77ddaa02311a01be341630cd17335926 *inst/doc/deSolve.Rnw
-6371ecf1adbbb9060abf9a1ac19b5138 *inst/doc/deSolve.pdf
+7716655c8ac0a6707a05b5d13b2c846d *inst/doc/deSolve.pdf
 90cff72b5d4f433507d4a3194ac2b4c5 *inst/doc/dynload-dede/dedeUtils.c
 32adc37ff9cfdae64133e2f0905ca68c *inst/doc/dynload-dede/dede_lv.R
 0554dd66581cbd412e50455977167143 *inst/doc/dynload-dede/dede_lv.c
@@ -172,8 +172,8 @@ f6c3c5141eba327ae959e9044168045e *src/radau5.f
 476e682c316d6fe0e48026c342dbd5a8 *src/rk_auto.c
 ae76af78b7033fdddab7a46de04f827a *src/rk_fixed.c
 3e2b2e9255308415aad542f82d654538 *src/rk_implicit.c
-3c62e9025d91e338cd0b042e4d45f5ea *src/rk_util.c
-06245a83dd68eb332301f756f9afd420 *src/rk_util.h
+259105b9b8c1e0ec72823dee1671684c *src/rk_util.c
+cb75997f4efdbb38352351ced6ea15e4 *src/rk_util.h
 a89e76d3229e6feb282b99dbe9fb390c *src/rprintf.c
 fa1db7b8006e5a4a0c397af62d5b80d0 *src/twoDmap.c
 318dc80f3f172530a950453ceadafa30 *src/zvode.f

diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+Changes version 1.32
+================================
+ o USE_FC_LEN_T for Fortran BLAS/LAPACK routines
+ to ensure compatibility with R > 4.2
+
 Changes version 1.31
 ================================
  o replace deprecated S constant DOUBLE_XMAX by DBL_MAX

diff --git a/build/partial.rdb b/build/partial.rdb
diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/data/ccl4data.rda b/data/ccl4data.rda
diff --git a/inst/doc/compiledCode.pdf b/inst/doc/compiledCode.pdf
diff --git a/inst/doc/deSolve.pdf b/inst/doc/deSolve.pdf
diff --git a/src/rk_util.c b/src/rk_util.c
@@ -3,6 +3,11 @@
 /* Definitions and Utilities needed by Runge-Kutta Solvers */
 /*==========================================================================*/
 
+/* USE_FC_LEN_T to ensure compatibility with Fortran BLAS/LAPACK */
+#ifndef USE_FC_LEN_T
+# define USE_FC_LEN_T
+#endif
+
 /* Load headers needed by the R interface */
 #include <R_ext/Rdynload.h>
 #include <R_ext/Applic.h> /* for dgemm */
@@ -62,17 +67,16 @@ SEXP getInputs(SEXP symbol, SEXP Rho) {
 /*----------------------------------------------------------------------------*/
 
 void blas_matprod1(double *x, int nrx, int ncx,
- double *y, int nry, int ncy, double *z)
-{
+ double *y, int nry, int ncy, double *z) {
  const char *transa = "N", *transb = "N";
  int i;
  double one = 1.0, zero = 0.0;
 
  if (nrx > 0 && ncx > 0 && nry > 0 && ncy > 0) {
-  F77_CALL(dgemm)(transa, transb, &nrx, &ncy, &ncx, &one,
-  x, &nrx, y, &nry, &zero, z, &nrx);
+  F77_CALL(dgemm)(transa, transb, &nrx, &ncy, &ncx, &one,
+  x, &nrx, y, &nry, &zero, z, &nrx FCONE FCONE);
  } else /* zero-extent operations should return zeroes */
-  for(i = 0; i < nrx*ncy; i++) z[i] = 0;
+  for(i = 0; i < nrx*ncy; i++) z[i] = 0;
 }
 
 
@@ -81,10 +85,10 @@ void matprod(int m, int n, int o, double* a, double* b, double* c) {
  int i, j, k;
  for (i = 0; i < m; i++) {
  for (j = 0; j < o; j++) {
-  c[i + m * j] = 0;
-  for (k = 0; k < n; k++) {
-   c[i + m * j] += a[i + m * k] * b[k + n * j];
-  }
+  c[i + m * j] = 0;
+  for (k = 0; k < n; k++) {
+   c[i + m * j] += a[i + m * k] * b[k + n * j];
+  }
  }
  }
 }
@@ -110,7 +114,7 @@ double maxerr(double *y0, double *y1, double *y2, double *Atol, double *Rtol, in
 /* CALL TO THE MODEL FUNCTION */
 /*==========================================================================*/
 void derivs(SEXP Func, double t, double* y, SEXP Parms, SEXP Rho,
-  double *ydot, double *yout, int j, int neq, int *ipar, int isDll,
+  double *ydot, double *yout, int j, int neq, int *ipar, int isDll,
  int isForcing) {
  SEXP Val, rVal, R_fcall;
  SEXP R_t;
@@ -166,8 +170,8 @@ void derivs(SEXP Func, double t, double* y, SEXP Parms, SEXP Rho,
  for (i = 0; i < nout; i++) {
  l = LENGTH(VECTOR_ELT(Val, elt));
  if (ii == l) {
-  ii = 0; elt++;
-  }
+  ii = 0; elt++;
+  }
  // thpe 2012-08-04: make sure the return value is double and not int
  PROTECT(rVal = coerceVector(VECTOR_ELT(Val, elt), REALSXP));
  yout[i] = REAL(rVal)[ii];

diff --git a/src/rk_util.h b/src/rk_util.h
@@ -3,6 +3,11 @@
 /* Definitions and Utilities needed by Runge-Kutta Solvers */
 /*==========================================================================*/
 
+/* USE_FC_LEN_T to ensure compatibility with Fortran BLAS/LAPACK */
+#ifndef USE_FC_LEN_T
+# define USE_FC_LEN_T
+#endif
+
 /* Load headers needed by the R interface */
 
 #include <R_ext/Rdynload.h>