version 1.33

cran · Jul 16, 2022 · 2b3b10c · 2b3b10c
1 parent a13690f
commit 2b3b10c
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: deSolve
-Version: 1.32
+Version: 1.33
 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 (>= 4.0.0)
+Depends: R (>= 3.3.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-04-14 05:49:47 UTC; thpe
+Packaged: 2022-07-16 09:57:03 UTC; thpe
 Repository: CRAN
-Date/Publication: 2022-04-14 10:32:30 UTC
+Date/Publication: 2022-07-16 11:10:02 UTC
diff --git a/MD5 b/MD5
@@ -1,6 +1,6 @@
-f2854bfc20931bab9d3ce6c0d5564a90 *DESCRIPTION
+2df8bec06b536ab9561102cb034e6065 *DESCRIPTION
 316262d3be55a7fcb10ac5ceebfd7658 *NAMESPACE
-4ef5345b00f0f075b3f252b2fa9af685 *NEWS
+55ab6d236f025a8fc859d91266ad7e37 *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
-f01682ffd9d5582c0d3b8a226f3c2b16 *build/partial.rdb
-c3c782a3f9695f34fa0d251fc32e8fdc *build/vignette.rds
-7c81e9ce28a91d034229f8115ff76b5e *data/ccl4data.rda
+afbe4209b3bb961ba3e41cbfe79ea507 *build/partial.rdb
+0800c4cba8176b68bdef6d9ee1312db7 *build/vignette.rds
+da80d1fd84ebece0f4a8db0dcb13a626 *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
-25426799b768a93679bf767e4cd51628 *inst/doc/compiledCode.pdf
+769b9586cff744ea7811e0bd8a7f13cf *inst/doc/compiledCode.pdf
 422530948f2a821f1c930a067c1f6125 *inst/doc/deSolve.R
 77ddaa02311a01be341630cd17335926 *inst/doc/deSolve.Rnw
-7716655c8ac0a6707a05b5d13b2c846d *inst/doc/deSolve.pdf
+5515067e7884fc2c3f01eaf1ff18e3f7 *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,7 +172,7 @@ f6c3c5141eba327ae959e9044168045e *src/radau5.f
 476e682c316d6fe0e48026c342dbd5a8 *src/rk_auto.c
 ae76af78b7033fdddab7a46de04f827a *src/rk_fixed.c
 3e2b2e9255308415aad542f82d654538 *src/rk_implicit.c
-259105b9b8c1e0ec72823dee1671684c *src/rk_util.c
+a64ad82d35a32de69beb9dfe3e73c55f *src/rk_util.c
 cb75997f4efdbb38352351ced6ea15e4 *src/rk_util.h
 a89e76d3229e6feb282b99dbe9fb390c *src/rprintf.c
 fa1db7b8006e5a4a0c397af62d5b80d0 *src/twoDmap.c

diff --git a/NEWS b/NEWS
@@ -1,15 +1,20 @@
+Changes version 1.33
+================================
+ o back-compatibility with R <= 3.6.2
+ (patch provided by Davis Vaughan) 
+
 Changes version 1.32
 ================================
-  o USE_FC_LEN_T for Fortran BLAS/LAPACK routines
-  to ensure compatibility with R > 4.2
+ 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
+ o replace deprecated S constant DOUBLE_XMAX by DBL_MAX
 
 Changes version 1.30
 ================================
-  o add doi to references
+ o add doi to references
 
 Changes version 1.29
 ================================
@@ -18,7 +23,7 @@ Changes version 1.29
 
 Changes version 1.28
 ================================
-  o minor: avoid an implicit type conversion at the C level
+ o minor: avoid an implicit type conversion at the C level
 
 Changes version 1.27.1
 ================================

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
@@ -14,6 +14,12 @@
 #include <R_ext/Boolean.h>
 #include "deSolve.h"
 
+/* For backwards compatibility with <= R 3.6.2 */
+/* where FCONE wasn't defined by R yet */
+#ifndef FCONE
+# define FCONE
+#endif
+
 #ifdef HAVE_LONG_DOUBLE
 # define LDOUBLE long double
 #else