From 247f599710c02def90f797bc1851513deaa27472 Mon Sep 17 00:00:00 2001
From: Raimon Tolosana-Delgado <tolosa53@fwg206.ad.fz-rossendorf.de>
Date: Tue, 3 May 2022 15:16:12 +0200
Subject: [PATCH] minor additions to v0.11.1 documentation
---
NEWS.md | 4 ++++
R/mask.R | 2 +-
cran-comments.md | 36 ++++++++++++++----------------------
3 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 4e94965..a0d109a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+# gmGeostats 0.11.1
+
+* (2022-05-03) minor changes to adapt to more stringent standards for class determination, for variable definition in C code, and for calls to FORTRAN routines from C code involving string arguments.
+
# gmGeostats 0.11.0-9002
* (2021-12-14) bugs in turning bands corrected: getUnitVec was producing a wrong sequence of directions, and bands for exponential and Gaussian variograms did not correct for the difference between parametric and effective range in the right way;
diff --git a/R/mask.R b/R/mask.R
index 7bfe084..f477b00 100644
--- a/R/mask.R
+++ b/R/mask.R
@@ -85,7 +85,7 @@ constructMask = function(grid, method="maxdist", maxval=NULL, x=NULL){
}else if(m=="sillprop"){
if(is.null(x))
stop("constructMask: sillprop method requires a variogram model")
- if(class(x)=="gstat") x = x$model
+ if(inherits(x,"gstat")) x = x$model
if(is(x,"gmSpatialModel")) x = x@model@structure
if(is(x, "ModelStructuralFunctionSpecification")) as.variogramModel(x)
maxval = ifelse(is.null(maxval), 0.99, maxval)
diff --git a/cran-comments.md b/cran-comments.md
index 57293cf..27052c5 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -1,13 +1,9 @@
## Test environments
* Linux: Ubuntu 18.04.4LTS (local)
- - R 3.4.4 (production)
- - R devel 2020-07-28 r78930 (test)
- - R patched 4.0.2 r78930 (test)
-* Windows 7 Enterprise (test)
- - R 3.5.1 (test)
- - R 4.0.2 (test)
-
+ - R 3.6.3 (production)
+ - R devel 2022-04-23 r82240 (test)
+
## R CMD check results
@@ -18,23 +14,19 @@
```
Dear maintainer,
-
+
Please see the problems shown on
- <https://cran.r-project.org/web/checks/check_results_gmGeostats.html>.
-
- Please correct before 2020-10-03 to safely retain your package on CRAN.
-
+<https://www.stats.ox.ac.uk/pub/bdr/BLAS/gmGeostats.out>
+
+For reproduction details see
+<https://www.stats.ox.ac.uk/pub/bdr/BLAS/README.txt> .
+
+Please correct before 2022-05-05 to safely retain your package on CRAN.
+
The CRAN Team
```
-... the sympthom being an error while #include <omp.h> in r-release-macos-x86_64, we identified the problem as a lack of appropriate linkage of OpenMP.
-
-Solution:
- 1.- the header inclusion and all usages of #pragma directives were enclosed in conditional structures
-#ifdef _OPENMP
- ...
-#endif
-
- 2. `$(SHLIB_OPENMP_CFLAGS)` was added to PKG_CFLAGS and PKG_LIBS fields in Makevars files
+... related to the way classes were assessed (now using `inherits(...)`) and the calls of FORTRAN routines from C code that involve string arguments (now following the instructions given in <https://www.stats.ox.ac.uk/pub/bdr/BLAS/README.txt> ).
- NOTE: we do not have access to any MacOS machine to test that our solution is effective. Our apologies if this is not working!
\ No newline at end of file
+
+best regards
\ No newline at end of file
--
GitLab