diff --git a/DESCRIPTION b/DESCRIPTION index d81f61b8a1848df8000b14d8d86195678436c4b7..cb2a8327414ce3d216e89fcfdd4ac987508d2dad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.1.2.20 -Date: 2019-01-11 +Version: 1.1.2.21 +Date: 2019-01-18 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Charles", "Perrin", role = c("aut", "ths"), comment = c(ORCID = "0000-0001-8552-1881")), diff --git a/NEWS.rmd b/NEWS.rmd index c58ed452f29544faa89965ed27493b113a23634a..6dd63fd328e5c044df348acbc84cf2a169e1e4c3 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.1.2.20 Release Notes (2019-01-11) +### 1.1.2.21 Release Notes (2019-01-18) diff --git a/src/frun_CEMANEIGE.f b/src/frun_CEMANEIGE.f index 1278b9c72d8d4791ea3330b58dc359c95734ad31..3e66f254f3ba47c76e7ec27b469a0d78065cd39f 100644 --- a/src/frun_CEMANEIGE.f +++ b/src/frun_CEMANEIGE.f @@ -114,15 +114,15 @@ c Outputs = -999.999 !initialisation made in R !Storage of outputs DO I=1,NOutputs - IF(IndOutputs(I).EQ.1) Outputs(k,I)=Pliq - IF(IndOutputs(I).EQ.2) Outputs(k,I)=Psol - IF(IndOutputs(I).EQ.3) Outputs(k,I)=G - IF(IndOutputs(I).EQ.4) Outputs(k,I)=eTG - IF(IndOutputs(I).EQ.5) Outputs(k,I)=Gratio - IF(IndOutputs(I).EQ.6) Outputs(k,I)=PotMelt - IF(IndOutputs(I).EQ.7) Outputs(k,I)=Melt - IF(IndOutputs(I).EQ.8) Outputs(k,I)=PliqAndMelt - IF(IndOutputs(I).EQ.9) Outputs(k,I)=InputsTemp(k) + IF(IndOutputs(I).EQ.1) Outputs(k,I)=Pliq ! Pliq ! observed liquid precipitation [mm/day] + IF(IndOutputs(I).EQ.2) Outputs(k,I)=Psol ! Psol ! observed solid precipitation [mm/day] + IF(IndOutputs(I).EQ.3) Outputs(k,I)=G ! SnowPack ! snow pack [mm] + IF(IndOutputs(I).EQ.4) Outputs(k,I)=eTG ! ThermalState ! thermal state [°C] + IF(IndOutputs(I).EQ.5) Outputs(k,I)=Gratio ! Gratio ! Gratio [-] + IF(IndOutputs(I).EQ.6) Outputs(k,I)=PotMelt ! PotMelt ! potential snow melt [mm/day] + IF(IndOutputs(I).EQ.7) Outputs(k,I)=Melt ! Melt ! melt [mm/day] + IF(IndOutputs(I).EQ.8) Outputs(k,I)=PliqAndMelt ! PliqAndMelt ! liquid precipitation + melt [mm/day] + IF(IndOutputs(I).EQ.9) Outputs(k,I)=InputsTemp(k) ! Temp ! air temperature [°C] ENDDO ENDDO