Skip to content

Commit

Permalink
Version 0.4.1
Browse files Browse the repository at this point in the history
Fixed the bug in linking related to multiple definitions. Removed Makevars.win as it is identical to Makevars. Removed files related to fortran and non-essential text files in Sundials source code.
  • Loading branch information
sn248 committed May 16, 2021
1 parent 44c8713 commit 60e8619
Show file tree
Hide file tree
Showing 44 changed files with 248 additions and 3,952 deletions.
7 changes: 3 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: sundialr
Type: Package
Title: An Interface to 'SUNDIALS' Ordinary Differential Equation (ODE) Solvers
Version: 0.1.4
Version: 0.1.4.1
Authors@R: c(
person("Satyaprakash", "Nayak", "", "sn248@cornell.edu", c("aut", "cre","cph"), comment = c(ORCID = "0000-0001-7225-1317")),
person("Lawrence Livermore National Security", role = c("cph")),
Expand All @@ -10,15 +10,14 @@ Authors@R: c(
Maintainer: Satyaprakash Nayak <sn248@cornell.edu>
URL: https://github.com/sn248/sundialr
BugReports: https://github.com/sn248/sundialr/issues
Description: Provides a way to call the functions in 'SUNDIALS' C ODE solving library (<https://computation.llnl.gov/projects/sundials>). Currently the serial version of ODE solver, 'CVODE', sensitivity calculator 'CVODES' and differential algebraic solver 'IDA' from the 'SUNDIALS' library are implemented. The package requires ODE to be written as an 'R' or 'Rcpp' function and does not require the 'SUNDIALS' library to be installed on the local machine.
Description: Provides a way to call the functions in 'SUNDIALS' C ODE solving library (<https://computing.llnl.gov/projects/sundials>). Currently the serial version of ODE solver, 'CVODE', sensitivity calculator 'CVODES' and differential algebraic solver 'IDA' from the 'SUNDIALS' library are implemented. The package requires ODE to be written as an 'R' or 'Rcpp' function and does not require the 'SUNDIALS' library to be installed on the local machine.
License: BSD_3_clause + file LICENSE
Copyright: file COPYRIGHTS
LazyData: TRUE
Imports:
Rcpp (>= 0.12.5)
LinkingTo:
Rcpp, RcppArmadillo
RoxygenNote: 7.1.0
RoxygenNote: 7.1.1
Suggests:
knitr,
rmarkdown,
Expand Down
5 changes: 5 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
sundialr v0.1.4.1
================
Bug fixex:
* Fixed the linking problem due to multiple defined sybmols

sundialr v0.1.4
================

Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.onAttach <- function(...){
packageStartupMessage(
"SUNDIALS - Copyright (c) 2002-2020, Lawrence Livermore National Security and Southern Methodist University.\nAll rights reserved.\nSee - https://computation.llnl.gov/projects/sundials\nsundialr - https://github.com/sn248/sundialr")
"SUNDIALS - Copyright (c) 2002-2020, Lawrence Livermore National Security and Southern Methodist University.\nAll rights reserved.")
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ to simulate the effect of multiple bolus doses of a drug in clinical pharmacokin
vignette for more details.

## What's new?
### Release 0.1.4.1
+ Fixed the linking bug due to multiple defined symbols. No other change.

### Release 0.1.4
+ This version has version 5.2.0 of `SUNDIALS` (released in March 2020) at the back end.
Expand Down
4 changes: 4 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Comments for version 0.1.4.1
* Fixed the problem with linking due to multiple definitions. The downstream
dependency should be unaffected by this change.

## Comments for version 0.1.4

## Test environments
Expand Down
459 changes: 0 additions & 459 deletions docs/articles/my-vignette.html

This file was deleted.

177 changes: 0 additions & 177 deletions docs/index.html

This file was deleted.

27 changes: 10 additions & 17 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CXX=clang++
PKG_CPPFLAGS= -I../inst/include/ -I./inst/ -DHAVE_CONFIG_H
PKG_CPPFLAGS= -I../inst/include/ -I./inst/ -DHAVE_CONFIG_H -DARMA_USE_CXX11
CXX_STD = CXX11
PKG_LIBS= $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -L../inst/ -lsundials_all
LIBS=-L./ -L../inst/

Expand Down Expand Up @@ -30,12 +31,10 @@ SOURCES_IDA = ./sundials/ida/ida.c \
./sundials/ida/ida_io.c ./sundials/ida/ida_ls.c \
./sundials/ida/ida_nls.c ./sundials/ida/ida_spils.c

SOURCES_NVECSERIAL= ./sundials/nvector/serial/fnvector_serial.c \
./sundials/nvector/serial/nvector_serial.c
SOURCES_NVECSERIAL= ./sundials/nvector/serial/nvector_serial.c

SOURCES_SUNDIALS= ./sundials/sundials/sundials_band.c ./sundials/sundials/sundials_dense.c \
./sundials/sundials/sundials_direct.c ./sundials/sundials/sundials_futils.c \
./sundials/sundials/sundials_iterative.c \
./sundials/sundials/sundials_direct.c ./sundials/sundials/sundials_iterative.c \
./sundials/sundials/sundials_linearsolver.c \
./sundials/sundials/sundials_math.c ./sundials/sundials/sundials_matrix.c \
./sundials/sundials/sundials_nonlinearsolver.c \
Expand All @@ -47,23 +46,17 @@ SOURCES_SUNDIALS= ./sundials/sundials/sundials_band.c ./sundials/sundials/sundia
./sundials/sundials/sundials_sparse.c ./sundials/sundials/sundials_spbcgs.c \
./sundials/sundials/sundials_sptfqmr.c

SOURCES_SUNLINSOL_BAND = ./sundials/sunlinsol/band/fsunlinsol_band.c \
./sundials/sunlinsol/band/sunlinsol_band.c
SOURCES_SUNLINSOL_BAND = ./sundials/sunlinsol/band/sunlinsol_band.c

SOURCES_SUNLINSOL_DENSE = ./sundials/sunlinsol/dense/fsunlinsol_dense.c \
./sundials/sunlinsol/dense/sunlinsol_dense.c
SOURCES_SUNLINSOL_DENSE = ./sundials/sunlinsol/dense/sunlinsol_dense.c

SOURCES_SUNMAT_BAND = ./sundials/sunmatrix/band/fsunmatrix_band.c \
./sundials/sunmatrix/band/sunmatrix_band.c
SOURCES_SUNMAT_BAND = ./sundials/sunmatrix/band/sunmatrix_band.c

SOURCES_SUNMAT_DENSE = ./sundials/sunmatrix/dense/fsunmatrix_dense.c \
./sundials/sunmatrix/dense/sunmatrix_dense.c
SOURCES_SUNMAT_DENSE = ./sundials/sunmatrix/dense/sunmatrix_dense.c

SOURCES_SUNNONLINSOL_FIXEDPOINT = ./sundials/sunnonlinsol/fixedpoint/fsunnonlinsol_fixedpoint.c \
./sundials/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c
SOURCES_SUNNONLINSOL_FIXEDPOINT = ./sundials/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c

SOURCES_SUNNONLINSOL_NEWTON = ./sundials/sunnonlinsol/newton/fsunnonlinsol_newton.c \
./sundials/sunnonlinsol/newton/sunnonlinsol_newton.c
SOURCES_SUNNONLINSOL_NEWTON = ./sundials/sunnonlinsol/newton/sunnonlinsol_newton.c

SOURCES_SUNDIALS_ALL= $(SOURCES_CVODES) $(SOURCES_IDA) $(SOURCES_NVECSERIAL) $(SOURCES_SUNDIALS) \
$(SOURCES_SUNLINSOL_DENSE) $(SOURCES_SUNLINSOL_BAND) \
Expand Down
97 changes: 0 additions & 97 deletions src/Makevars.win

This file was deleted.

0 comments on commit 60e8619

Please sign in to comment.