Skip to content

Commit

Permalink
Fixed some WARNINGs.
Browse files Browse the repository at this point in the history
  • Loading branch information
aldoclemente committed Jan 16, 2024
1 parent b1d34df commit 9aea81e
Show file tree
Hide file tree
Showing 19 changed files with 111 additions and 246 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
^src/\.clang-format$
^src/core/\.clang-format$
^src/core/test$
^.vscode$
19 changes: 4 additions & 15 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Generated by roxygen2: do not edit by hand

S3method("*",DiffOpObject)
S3method("*",DifferentialOp)
S3method("*",Function)
S3method("*",FunctionGrad)
S3method("+",DiffOpObject)
S3method("-",DiffOpObject)
S3method("+",DifferentialOp)
S3method("-",DifferentialOp)
S3method("st_crs<-",Domain)
S3method(plot,Function)
S3method(plot,Mesh)
Expand All @@ -25,21 +25,10 @@ export(dot)
export(grad)
export(laplace)
export(read_mesh)
exportClasses(BasisFunction)
exportClasses(DiffOpObject)
exportClasses(DiffusionOperator)
exportClasses(Domain)
exportClasses(Function)
exportClasses(FunctionGrad)
exportClasses(FunctionSpace)
exportClasses(Mesh)
exportClasses(Pde)
exportClasses(ReactionOperator)
exportClasses(TimeDerivative)
exportClasses(TransportOperator)
exportMethods(contour)
exportMethods(dt)
import(Matrix)
import(R6)
import(Rcpp)
import(RcppEigen)
import(methods)
Expand Down
12 changes: 2 additions & 10 deletions R/domain.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,11 @@
)
)

#' @name Domain
#'
#' @exportClass Domain
setOldClass(c("Domain", "R6"))

#' Mesh
#'
#' @name Mesh
#'
#' @exportClass Mesh
setOldClass(c("Mesh","Domain"))

#' S4 class representing a spatial (spatio-temporal) domain
#' R6 class representing a spatial (spatio-temporal) domain
#'
#' @param x could be a \code{pslg} returned by \code{\link[RTriangle]{triangulate}},
#' a \code{sfc} returned by \code{\link[sf]{st_geometry}} or a named list containing:
Expand Down Expand Up @@ -294,7 +286,7 @@ setMethod("build_mesh", signature=c("Domain", "numeric", "numeric"),
#'
#' @param op1 A mesh object created by \code{Mesh}.
#' @param op2 A numeric vector.
#' @return An S4 object representing a spatio-temporal domain.
#' @return A R6 object representing a spatio-temporal domain.
#' @rdname Domain_times_vector
#' @export
setGeneric("%X%", function(op1, op2) standardGeneric("%X%"))
Expand Down
19 changes: 2 additions & 17 deletions R/function_space.R
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
)
)

#' Finite Element Basis
#'
#' @name Basis
#'
#' @exportClass BasisFunction
setOldClass(c("BasisFunction", "R6"))

setGeneric("BasisFunction", function(mesh, fe_order) standardGeneric("BasisFunction"))
Expand Down Expand Up @@ -74,18 +69,13 @@ setMethod("BasisFunction", signature = signature("Mesh","integer"),
)
)

#' Finite Element Functional Space
#'
#' @name FunctionSpace
#'
#' @exportClass FunctionSpace
setOldClass(c("FunctionSpace", "R6"))

#' Create FunctionSpace object
#'
#' @param mesh A mesh object created by \code{Mesh}:
#' @param fe_order Either '1' or '2'. It specifies the finite element order.
#' @return An S4 object representing a Function Space.
#' @return A R6 object representing a Function Space.
#' @export
#' @rdname FunctionSpace
setGeneric("FunctionSpace", function(mesh, fe_order) standardGeneric("FunctionSpace"))
Expand Down Expand Up @@ -169,19 +159,14 @@ setMethod("FunctionSpace", signature = c(mesh="Mesh", fe_order="missing"),
)
)

#' Finite Element Function
#'
#' @name Function
#'
#' @exportClass Function
setOldClass(c("Function", "R6"))

## constructor

#' Create Function object
#'
#' @param FunctionSpace a FunctionSpace object created by \code{FunctionSpace}:
#' @return An S4 object representing a Function belonging to the FunctionSpace passed as parameter.
#' @return A R6 object representing a Function belonging to the FunctionSpace passed as parameter.
#' @export
#' @examples
#' \dontrun{
Expand Down
1 change: 1 addition & 0 deletions R/modules.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#' @importFrom Rcpp evalCpp
#' @import plotly
#' @import Matrix
#' @import R6
NULL

## load required modules
Expand Down
Loading

0 comments on commit 9aea81e

Please sign in to comment.