From fd87ac6d506d5ae225965f22277524af657110ad Mon Sep 17 00:00:00 2001
From: Poulet Camille <camille.poulet@irstea.priv>
Date: Tue, 10 Sep 2019 11:24:21 +0200
Subject: [PATCH] Correction weight size relationship
Modification WSR from Bruch to WSR form Taverny
---
data/input/fishTryRealBV_CC.xml | 36 +++++++++++-----------
src/main/java/species/NutrientRoutine.java | 21 ++++++-------
2 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/data/input/fishTryRealBV_CC.xml b/data/input/fishTryRealBV_CC.xml
index 8dfc85d..e78b2ef 100644
--- a/data/input/fishTryRealBV_CC.xml
+++ b/data/input/fishTryRealBV_CC.xml
@@ -40,11 +40,11 @@
</entry>
<entry>
<string>bLW</string>
- <double>2.1774</double>
+ <double>3.2252</double>
</entry>
<entry>
<string>aLW</string>
- <double>0.27144384321211973</double>
+ <double>0.004095817237891344</double>
</entry>
</hashtable>
</entry>
@@ -61,11 +61,11 @@
</entry>
<entry>
<string>bLW</string>
- <double>3.147</double>
+ <double>3.3429</double>
</entry>
<entry>
<string>aLW</string>
- <double>0.007388725660209693</double>
+ <double>0.002665367811305362</double>
</entry>
</hashtable>
</entry>
@@ -83,13 +83,13 @@
<double>-11.285</double>
</entry>
<entry>
- <string>bLW</string>
- <double>2.9973</double>
- </entry>
- <entry>
- <string>aLW</string>
- <double>0.010383887012522573</double>
- </entry>
+- <string>bLW</string>
+- <double>2.9973</double>
+- </entry>
+- <entry>
+- <string>aLW</string>
+- <double>0.010383887012522573</double>
+- </entry>
</hashtable>
</entry>
<entry>
@@ -104,13 +104,13 @@
<double>-6.6234</double>
</entry>
<entry>
- <string>bLW</string>
- <double>2.9418</double>
- </entry>
- <entry>
- <string>aLW</string>
- <double>0.013199187556948952</double>
- </entry>
+- <string>bLW</string>
+- <double>2.9418</double>
+- </entry>
+- <entry>
+- <string>aLW</string>
+- <double>0.013199187556948952</double>
+- </entry>
</hashtable>
</entry>
</fishFeaturesPostSpawning>
diff --git a/src/main/java/species/NutrientRoutine.java b/src/main/java/species/NutrientRoutine.java
index d026eb9..f80f219 100644
--- a/src/main/java/species/NutrientRoutine.java
+++ b/src/main/java/species/NutrientRoutine.java
@@ -185,7 +185,8 @@ public class NutrientRoutine {
/**
* compute the nutrient fluxes for a single fish (in the super individual)
- * that dies after spawning (gametes expelling)
+ * that dies after spawning (gametes expelling)
+ * Considering that a fish died after reproduction have the same nutrient contribution that a fish died before reproduction, we use the same coefficient for weight computation.
* @param fish
* @return nutrientsInput
*/
@@ -371,25 +372,21 @@ public class NutrientRoutine {
*/
Map<String,Double> aFeature = new Hashtable<String,Double>();
- aFeature.put("aLW", Math.exp(-4.9078)); //weight size relationship computed from BDalosesBruch
- aFeature.put("bLW", 3.147);
- aFeature.put("aLW_Gonad", -5.2425); // issu de la relation taille - poids des gonades Bruch
+ aFeature.put("bLW", 3.3429); //From Taverny
+ aFeature.put("aLW", 1.2102E-6 * Math.pow(10., aFeature.get("bLW"))); //weight size relationship -- Conversion des g/mm en g.cm (from Taverny, 1991)
aFeature.put("bLW_Gonad", 2.6729); // issu de la relation taille - poids des gonades Bruch
- //aFeature.put("bLW",3.3429);// parametre "b" de la relation taille/poids - Coefficient d'allometrie
- //aFeature.put("aLW",1.2102E-6 * Math.pow(10., aFeature.get("bLW"))); // parametre "a" de la relation taille/poids en kg/cm- Traduit la condition
- //aFeature.put("GSI",0.15);
+ aFeature.put("aLW_Gonad", -5.2425); // issu de la relation taille - poids des gonades Bruch
+
aFeaturePreSpawning.put(Gender.FEMALE, aFeature);
/*
* For males
*/
aFeature = new Hashtable<String,Double>();
- aFeature.put("aLW", Math.exp(-1.304));
- aFeature.put("bLW", 2.1774);
- aFeature.put("aLW_Gonad", -8.8744);
+ aFeature.put("bLW", 3.2252);
+ aFeature.put("aLW", 2.4386E-6 * Math.pow(10., aFeature.get("bLW"))); //weight size relationship from Taverny -- Conversion des g/mm en g.cm (from Taverny, 1991)
aFeature.put("bLW_Gonad", 3.3838);
- //aFeature.put("aLW",2.4386E-6 * Math.pow(10, aFeature.get("bLW"))); // Conversion des g/mm en g.cm (from Taverny, 1991)
- //aFeature.put("GSI",.08);
+ aFeature.put("aLW_Gonad", -8.8744);
aFeaturePreSpawning.put(Gender.MALE,aFeature);
System.out.println("aFeaturePreSpawning: " + aFeaturePreSpawning.toString()); //
--
GitLab