Commit d123799b authored by Poulet Camille's avatar Poulet Camille
Browse files

Changes in order of process in XML file

parent 40e079ff
......@@ -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>
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment