From 94ddd8339e73adeda39fc24ada27ea59e0f41942 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 4 Dec 2019 15:40:33 +0100
Subject: [PATCH] v1.4.0.1 CLEAN: minor typo revisions to translate frun_GR5H
Fotran code from F77 to F90 #13
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
src/{frun_GR5H.f => frun_GR5H.f90} | 12 +++++-------
3 files changed, 7 insertions(+), 9 deletions(-)
rename src/{frun_GR5H.f => frun_GR5H.f90} (98%)
diff --git a/DESCRIPTION b/DESCRIPTION
index 793c7f85..4a374488 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.4.0.0
+Version: 1.4.0.1
Date: 2019-12-04
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 23a55f3e..4c5a67ff 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
-### 1.4.0.0 Release Notes (2019-12-04)
+### 1.4.0.1 Release Notes (2019-12-04)
#### New features
diff --git a/src/frun_GR5H.f b/src/frun_GR5H.f90
similarity index 98%
rename from src/frun_GR5H.f
rename to src/frun_GR5H.f90
index 8728e49b..023b115b 100644
--- a/src/frun_GR5H.f
+++ b/src/frun_GR5H.f90
@@ -33,9 +33,9 @@
!------------------------------------------------------------------------------
- SUBROUTINE frun_gr5h(LInputs,InputsPrecip,InputsPE,NParam,Param,
- & NStates,StateStart,IsIntStore,Imax,NOutputs,IndOutputs,
- & Outputs,StateEnd)
+ SUBROUTINE frun_gr5h(LInputs,InputsPrecip,InputsPE,NParam,Param, &
+ NStates,StateStart,IsIntStore,Imax,NOutputs,IndOutputs, &
+ Outputs,StateEnd)
! Subroutine that initializes GR5H, get its parameters, performs the call
! to the MOD_GR5H subroutine at each time step, and stores the final states
! Inputs
@@ -72,8 +72,7 @@
integer, dimension(NOutputs), intent(in) :: IndOutputs
! out
doubleprecision, dimension(NStates), intent(out) :: StateEnd
- doubleprecision, dimension(LInputs,NOutputs),
- & intent(out) :: Outputs
+ doubleprecision, dimension(LInputs,NOutputs), intent(out) :: Outputs
!! locals
logical :: IsIntStoreBool ! TRUE if interception store is used, FALSE otherwise
@@ -162,8 +161,7 @@
!**********************************************************************
- SUBROUTINE MOD_GR5H(St,StUH2,OrdUH2,Param,IsIntStoreBool,Imax,P1,E,Q,
- &MISC)
+ SUBROUTINE MOD_GR5H(St,StUH2,OrdUH2,Param,IsIntStoreBool,Imax,P1,E,Q,MISC)
! Calculation of streamflow on a single time step (hour) with the GR5H model
! Inputs:
! St Vector of real, model states in stores at the beginning of the time step [mm]
--
GitLab