From 0576f6d8be44f43875bddd3bbfc39677c6eb5dec Mon Sep 17 00:00:00 2001
From: "patrick.lambert" <patrick.lambert@irstea.fr>
Date: Thu, 2 Jul 2020 18:54:56 +0200
Subject: [PATCH] typing correction
---
data/input/atlanticarea/fishTryRealBV_CC.xml | 3 +--
...dSurviveAfterReproductionWithDiagnose.java | 21 ++++++++-----------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/data/input/atlanticarea/fishTryRealBV_CC.xml b/data/input/atlanticarea/fishTryRealBV_CC.xml
index 9dd83e8..d145f71 100644
--- a/data/input/atlanticarea/fishTryRealBV_CC.xml
+++ b/data/input/atlanticarea/fishTryRealBV_CC.xml
@@ -297,8 +297,7 @@
<initialLength>2.0</initialLength>
<sigmaRecruitment>0.2</sigmaRecruitment>
<survivalRateAfterReproduction>0.1</survivalRateAfterReproduction>
- <maxNumberOfSuperIndividualPerReproduction>500.0
- </maxNumberOfSuperIndividualPerReproduction>
+ <maxNumberOfSuperIndividualPerReproduction>500.0</maxNumberOfSuperIndividualPerReproduction>
<withDiagnose>false</withDiagnose>
<displayFluxesOnConsole>false</displayFluxesOnConsole>
</species.ReproduceAndSurviveAfterReproductionWithDiagnose>
diff --git a/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java b/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java
index 02cba5e..fe8b398 100644
--- a/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java
+++ b/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java
@@ -158,13 +158,7 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG
// Initiate the total fluxes for this basin
Map<SpawnerOrigin, Map<String, Double>> totalInputFluxes = new Hashtable<SpawnerOrigin, Map<String, Double>>(); // On
- // cr�er
- // la
- // Map
- // pour
- // stocker
- // les
- // flux
+ // cr�er la map pour stock les flux
totalInputFluxes.put(SpawnerOrigin.AUTOCHTONOUS, new Hashtable<String, Double>());
totalInputFluxes.put(SpawnerOrigin.ALLOCHTONOUS, new Hashtable<String, Double>());
for (SpawnerOrigin origin : totalInputFluxes.keySet()) {
@@ -443,9 +437,12 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG
long numberOfFemaleRecruit = Math.round(numberOfRecruit * proportionOfFemaleAtBirth);
long numberOfMaleRecruit = numberOfRecruit - numberOfFemaleRecruit;
- System.out.println(group.getPilot().getCurrentTime() + " " + time.getSeason(group.getPilot()) + " "
- + riverBasin.getName() + ": " + numberOfFemaleRecruit + " females \tgive " + numberOfRecruit
- + " recruits from a mean of " + meanNumberOfRecruit);
+ /*
+ * System.out.println(group.getPilot().getCurrentTime() + " " +
+ * time.getSeason(group.getPilot()) + " " + riverBasin.getName() + ": " + numberOfFemaleRecruit
+ * + " females \tgive " + numberOfRecruit + " recruits from a mean of " + meanNumberOfRecruit);
+ * System.out.println(stockRecruitmentRelationship.getEffectiveStock(numberOfFemaleRecruit));
+ */
// ----------------------------------------------
// keep information when reproduction
@@ -652,9 +649,9 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG
transient double log19;
/**
- * the value of the stock for which 50% partipate to the reproduction
+ * sum of mortality coefficient (use to calculate depensatory trap)
*
- * @unit # of individuals
+ * @unit time-1
*/
double sigmaZ; //
--
GitLab