diff --git a/data/input/fishTryRealBV_CC.xml b/data/input/fishTryRealBV_CC.xml index 454aa2e20b8110864ff9056865c45823146db9c1..ab309702b509703b1857d1b5268ffeda032e6014 100644 --- a/data/input/fishTryRealBV_CC.xml +++ b/data/input/fishTryRealBV_CC.xml @@ -269,11 +269,6 @@ <mortalityRateInOffshore>0.4</mortalityRateInOffshore> </species.Survive> - <species.ExportLenghtAgeDistribution> - <synchronisationMode>ASYNCHRONOUS</synchronisationMode> - <exportSeason>SPRING</exportSeason> - <fileNameOutput>lengthAgeDistribution</fileNameOutput> - </species.ExportLenghtAgeDistribution> <species.ReproduceAndSurviveAfterReproductionWithDiagnose> <synchronisationMode>ASYNCHRONOUS</synchronisationMode> diff --git a/src/main/java/species/FishNutrient.java b/src/main/java/species/FishNutrient.java index 753335d48ea6a20eaa43c77b76bd2fe7023cef05..cd09d24a14ebe30747f1a78f2f19f6fbfea29081 100644 --- a/src/main/java/species/FishNutrient.java +++ b/src/main/java/species/FishNutrient.java @@ -308,6 +308,12 @@ public class FishNutrient { return getWeight (fish, SpawningPosition.PRE); } + + +public ArrayList<String> getNutrientsOfInterest() { + return nutrientsOfInterest; + } + /** * @param args */ diff --git a/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java b/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java index 7ae9f27a86cc7a06c3dfd1b6aa945c156e6f45dc..9ce8025f331561c8aeeb69174221c86f9a144b72 100644 --- a/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java +++ b/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java @@ -3,6 +3,7 @@ package species; import java.util.ArrayList; import java.util.HashMap; +import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -107,6 +108,15 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG List<DiadromousFish> fishInBasin = riverBasin.getFishs(group); if (fishInBasin != null){ + + Map<String, Double> totalFluxes = new Hashtable<String, Double>(); //On créer la Map pour stocker les flux + + for (String nutrient : group.getFishNutrient().getNutrientsOfInterest()) { + + totalFluxes.put(nutrient, 0.); // ON MET A JOUR NOTRE map + + } + // -------------------------------------------------------------------------------------------------- // definition of the stock recruiment relationship @@ -341,14 +351,27 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG // -------------------------------------------------------------------------------------------------- for (DiadromousFish fish : deadFish){ - group.getFishNutrient().computeNutrientsInputForDeathAfterSpawning(fish); // + Map<String, Double> aFlux = group.getFishNutrient().computeNutrientsInputForDeathAfterSpawning(fish); // + + for (String nutrient: aFlux.keySet()) { + + totalFluxes.put(nutrient,totalFluxes.get(nutrient) + aFlux.get(nutrient) * fish.getAmount()); + } + + + group.removeAquaNism(fish); } deadFish.clear(); + + System.out.println(group.getPilot().getCurrentTime() + "; " + Time.getYear(group.getPilot()) + ";" + Time.getSeason(group.getPilot()) + ";" + + riverBasin.getName() + "; " + totalFluxes); + } else { riverBasin.setYearOfLastNulRep(Time.getYear(group.getPilot())); } + // System.out.println("("+numberOfGenitors+")"); //System.out.println(" BEFORE " +riverBasin.getSpawnerOrigins().keySet());