From c8a5a448e5bd2cfd6539bd75a8c905c114884f3a Mon Sep 17 00:00:00 2001 From: Lambert Patrick <patrick.lambert@irstea.fr> Date: Thu, 22 Aug 2019 11:52:04 +0200 Subject: [PATCH] clean post fusion --- src/main/java/species/DiadromousFishGroup.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/species/DiadromousFishGroup.java b/src/main/java/species/DiadromousFishGroup.java index 8151b93..b0f5f13 100644 --- a/src/main/java/species/DiadromousFishGroup.java +++ b/src/main/java/species/DiadromousFishGroup.java @@ -288,10 +288,8 @@ public class DiadromousFishGroup extends AquaNismsGroup< DiadromousFish, BasinNe nutrientsOfInterest.add("P"); - - diadromousFishGroup.fishNutrient = new FishNutrient(nutrientsOfInterest,aResidenceTime, anExcretionRate, aFeaturePreSpawning, aFeaturePostSpawning, aGameteSpawned, - aCompoCarcassPreSpawning, aCompoCarcassPostSpawning, aCompoGametes, - aJuvenileFeatures, aCompoJuveniles); + diadromousFishGroup.nutrientRoutine = new NutrientRoutine(nutrientsOfInterest,aResidenceTime, anExcretionRate, aFeaturePreSpawning, aFeaturePostSpawning, aCompoCarcassPreSpawning, aCompoCarcassPostSpawning, + aCompoGametes, aJuvenileFeatures, aCompoJuveniles); System.out.println((new XStream(new DomDriver())).toXML(diadromousFishGroup)); @@ -467,9 +465,6 @@ public BufferedWriter getbWForFluxes() { return bWForFluxes; } - public double getKOpt(){ - return kOpt; - } public double getTempMinRep(){ return tempMinRep; @@ -584,19 +579,10 @@ public BufferedWriter getbWForFluxes() { } - public FishNutrient getFishNutrient() { - - return fishNutrient; - } public NutrientRoutine getNutrientRoutine() { - return nutrientRoutine; } - public void setlFirstMaturity(double lFirstMaturity) { - this.lFirstMaturity = lFirstMaturity; - } - // ================================================================ // statictis for calibration -- GitLab