From 64932b4d8357ec49b96377d85e9aa7a8ce862331 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Thu, 19 Sep 2024 09:18:06 +0200
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20:boom:=20Passer=20le=20nombre=20de?=
=?UTF-8?q?=20jours=20de=20=20la=20phase=20S4=20-=20S5=20pour=20la=20vigne?=
=?UTF-8?q?=20=C3=A0=2035?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
refs siclima#10485
---
.../indicators/model/data/phenology/PhenologyCalculator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculator.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculator.java
index 97888045..fa9d117a 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculator.java
@@ -104,7 +104,7 @@ implements ResourcesLoader<List<AnnualStageData>> {
/**
* Default number of days between S3 and S4 for curve_grapevine.
*/
- private static final int DEFAULT_S3_TO_S4_CURVE_GRAPEVINE = 40;
+ private static final int DEFAULT_S3_TO_S4_CURVE_GRAPEVINE = 35;
/**
* Compute the cumulative sum of JVI.
@@ -462,7 +462,7 @@ implements ResourcesLoader<List<AnnualStageData>> {
/**
* Number of days between S3 and S4 for curve_grapevine.
*
- * By default: 40 days.
+ * By default: 35 days.
*/
@Getter
@Setter
--
GitLab
From bc6f91ec105e410b72e517b3718709554b027a7f Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Thu, 19 Sep 2024 09:26:05 +0200
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20:boom:=20Passer=20le=20nombre=20de?=
=?UTF-8?q?=20jours=20par=20d=C3=A9faut=20de=20la=20phase=20S4=20-=20S5=20?=
=?UTF-8?q?pour=20la=20vigne=20=C3=A0=2035?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
refs siclima#10485
--
GitLab
From c19f022b8f75abd153e3ecd6c0d8692313c1ff92 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Thu, 19 Sep 2024 15:06:50 +0200
Subject: [PATCH 3/4] Notes de version
---
src/site/markdown/release-notes-fr.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/site/markdown/release-notes-fr.md b/src/site/markdown/release-notes-fr.md
index d9c7ccf1..fee4ea7b 100644
--- a/src/site/markdown/release-notes-fr.md
+++ b/src/site/markdown/release-notes-fr.md
@@ -12,6 +12,7 @@ date: 2024-08-19
- Supprimer `Evaluation#getResults()`.
- Supprimer `Evaluation#getComputedPhases()`.
- Supprimer de `CompositeIndicator#toAggregate(boolean)`.
+- Passer le nombre de jours de la phase S4 - S5 pour la vigne à 35.
# [v2.0.2](https://forgemia.inra.fr/agroclim/Indicators/indicators-java/-/releases/v2.0.2) − 11 juillet 2024
--
GitLab
From c89e5e71aea61fc2bf8b1c781c3e11c87174eec7 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Thu, 19 Sep 2024 15:15:51 +0200
Subject: [PATCH 4/4] Typo
---
src/site/markdown/release-notes-fr.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/markdown/release-notes-fr.md b/src/site/markdown/release-notes-fr.md
index fee4ea7b..2041a1a8 100644
--- a/src/site/markdown/release-notes-fr.md
+++ b/src/site/markdown/release-notes-fr.md
@@ -11,7 +11,7 @@ date: 2024-08-19
- Renvoyer les résultats de calcul par la méthode `Evaluation.compute()` et ne plus les stocker dans `Evaluation`.
- Supprimer `Evaluation#getResults()`.
- Supprimer `Evaluation#getComputedPhases()`.
-- Supprimer de `CompositeIndicator#toAggregate(boolean)`.
+- Supprimer `CompositeIndicator#toAggregate(boolean)`.
- Passer le nombre de jours de la phase S4 - S5 pour la vigne à 35.
# [v2.0.2](https://forgemia.inra.fr/agroclim/Indicators/indicators-java/-/releases/v2.0.2) − 11 juillet 2024
--
GitLab