diff --git a/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml b/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml index 627c7d28b7395e5b4aa6514bbe4b00e4b0547880..1ba310995c12eda7ae7004f19a1152ffc7a7c28d 100644 --- a/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml +++ b/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml @@ -319,24 +319,25 @@ <synchronisationMode>ASYNCHRONOUS</synchronisationMode> <afterReproductionSeason>SUMMER</afterReproductionSeason> <maximalSurvivalRate>0.1</maximalSurvivalRate> - <!-- <temperatureEffectSurvivalAfterReproduction class="temperatureEffect.LogitEffect"> --> - <!-- <Tref>19.9</Tref> --> - <!-- <alpha>-.1</alpha> --> - <!-- </temperatureEffectSurvivalAfterReproduction> --> - <temperatureEffectSurvivalAfterReproduction - class="temperatureEffect.NoEffect"> + <temperatureEffectSurvivalAfterReproduction class="temperatureEffect.LogitEffect"> + <Tref>19.9</Tref> + <alpha>-.1</alpha> </temperatureEffectSurvivalAfterReproduction> +<!-- <temperatureEffectSurvivalAfterReproduction --> +<!-- class="temperatureEffect.NoEffect"> --> +<!-- </temperatureEffectSurvivalAfterReproduction> --> </species.SurviveAfterReproduction> <species.MigrateFromRiverToInshore> <synchronisationMode>ASYNCHRONOUS</synchronisationMode> - <migrationSeasonToReachInshore>SPRING</migrationSeasonToReachInshore> + <migrationSeasonToReachInshore>SUMMER</migrationSeasonToReachInshore> <displayFluxesOnConsole>false</displayFluxesOnConsole> </species.MigrateFromRiverToInshore> <species.MigrateToOffshore> <synchronisationMode>ASYNCHRONOUS</synchronisationMode> - <migrationSeasonToReachSummeringOffshore>SPRING</migrationSeasonToReachSummeringOffshore> + <migrationSeasonToReachOffshore>AUTOMN</migrationSeasonToReachOffshore> + <offshoreDestination>WINTERING</offshoreDestination> </species.MigrateToOffshore> <species.MigrateBetweenOffshores> diff --git a/src/main/java/environment/RIOBasinNetworkObserverWithContinent.java b/src/main/java/environment/RIOBasinNetworkObserverWithContinent.java index 75bed1b8d06b1faa2e9f455143b3ba8121a30f7c..f063411c62342dff2d4a9e449ca4d6773f6ba971 100644 --- a/src/main/java/environment/RIOBasinNetworkObserverWithContinent.java +++ b/src/main/java/environment/RIOBasinNetworkObserverWithContinent.java @@ -299,8 +299,8 @@ public class RIOBasinNetworkObserverWithContinent extends ObserverListener for (DiadromousFishGroup group : basin.getGroups()) { abundance += basin.getEffective(group); } - if (basin instanceof RiverBasin & abundance > 0) - System.out.println(" " + basin.getName() + " (" + basin.getClass().getSimpleName() + ") -->" + abundance); + //if (basin instanceof RiverBasin & abundance > 0) + //System.out.println(" " + basin.getName() + " (" + basin.getClass().getSimpleName() + ") -->" + abundance); if (abundance == 0.) { g.setColor(Color.WHITE);