From d123799b945dd25dac09f0df0a247f217693aeb4 Mon Sep 17 00:00:00 2001
From: "camille.poulet" <camille.poulet@irstea.fr>
Date: Mon, 19 Apr 2021 17:50:56 +0200
Subject: [PATCH] Changes in order of process in XML file
---
.../fishRIOBasin_Sapidissima_Rjava.xml | 17 +++++++++--------
.../RIOBasinNetworkObserverWithContinent.java | 4 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml b/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml
index 627c7d2..1ba3109 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 75bed1b..f063411 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);
--
GitLab