From 4c830833281a40f363d8c101d026d46a606fa7cd Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Tue, 19 Feb 2019 08:38:45 +0100
Subject: [PATCH] v1.2.2.2 UPDATE: frun_cemaneige declaration in airGR.c file
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
src/airGR.c | 6 ++----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index cba6ebfd..a11ef6f9 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.2.1
+Version: 1.2.2.2
Date: 2019-02-19
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.rmd b/NEWS.rmd
index 2c09db93..a2b79aea 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.2.0 Release Notes (2019-01-30)
+### 1.2.2.2 Release Notes (2019-01-30)
diff --git a/src/airGR.c b/src/airGR.c
index ee204b34..4ccbc878 100644
--- a/src/airGR.c
+++ b/src/airGR.c
@@ -7,8 +7,7 @@
*/
/* .Fortran calls */
-extern void F77_NAME(frun_cemaneige)(int *, double *, double *, double *, double *, int *, double *, int *, double *, int *, int *, double *, double *);
-extern void F77_NAME(frun_cemaneige_pr)(int *, double *, double *, double *, double *, int *, double *, int *, double *, int *, int *, int *, double *, double *);
+extern void F77_NAME(frun_cemaneige)(int *, double *, double *, double *, double *, int *, double *, int *, double *, int *, int *, int *, double *, double *);
extern void F77_NAME(frun_gr1a)(int *, double *, double *, int *, double *, int *, double *, int *, int *, double *, double *);
extern void F77_NAME(frun_gr2m)(int *, double *, double *, int *, double *, int *, double *, int *, int *, double *, double *);
extern void F77_NAME(frun_gr4h)(int *, double *, double *, int *, double *, int *, double *, int *, int *, double *, double *);
@@ -17,8 +16,7 @@ extern void F77_NAME(frun_gr5j)(int *, double *, double *, int *, double *, int
extern void F77_NAME(frun_gr6j)(int *, double *, double *, int *, double *, int *, double *, int *, int *, double *, double *);
static const R_FortranMethodDef FortranEntries[] = {
- {"frun_cemaneige", (DL_FUNC) &F77_NAME(frun_cemaneige), 13},
- {"frun_cemaneige_pr", (DL_FUNC) &F77_NAME(frun_cemaneige_pr), 14},
+ {"frun_cemaneige", (DL_FUNC) &F77_NAME(frun_cemaneige), 14},
{"frun_gr1a", (DL_FUNC) &F77_NAME(frun_gr1a), 11},
{"frun_gr2m", (DL_FUNC) &F77_NAME(frun_gr2m), 11},
{"frun_gr4h", (DL_FUNC) &F77_NAME(frun_gr4h), 11},
--
GitLab