Commit e6d6f723 authored by patrick.lambert's avatar patrick.lambert
Browse files

Merge branch 'develop' into BasinImprovement

parents 7f678fe4 52340fcd
...@@ -25,5 +25,4 @@ ...@@ -25,5 +25,4 @@
<temperatureRiverFile>data/input/northeastamerica/observed_river_temperatures.csv</temperatureRiverFile> <temperatureRiverFile>data/input/northeastamerica/observed_river_temperatures.csv</temperatureRiverFile>
<useRealPDam>false</useRealPDam> <useRealPDam>false</useRealPDam>
</environment.RIOBasinNetworkWithContinent> </environment.RIOBasinNetworkWithContinent>
\ No newline at end of file
...@@ -245,12 +245,6 @@ ...@@ -245,12 +245,6 @@
<sigmaDeltaLVonBert>0.2</sigmaDeltaLVonBert> <sigmaDeltaLVonBert>0.2</sigmaDeltaLVonBert>
</species.Grow> </species.Grow>
<species.MigrateBetweenOffshores>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<migrationSeasonToReachWinteringOffshore>AUTOMN</migrationSeasonToReachWinteringOffshore>
<migrationSeasonToReachSummeringOffshore>SPRING</migrationSeasonToReachSummeringOffshore>
</species.MigrateBetweenOffshores>
<species.MigrateFromOffshoreToInshore> <species.MigrateFromOffshoreToInshore>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode> <synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<migrationSeasonToReachInshore>SPRING</migrationSeasonToReachInshore> <migrationSeasonToReachInshore>SPRING</migrationSeasonToReachInshore>
...@@ -286,11 +280,8 @@ ...@@ -286,11 +280,8 @@
<mortalityRateInOffshore>0.4</mortalityRateInOffshore> <mortalityRateInOffshore>0.4</mortalityRateInOffshore>
</species.Survive> </species.Survive>
<!--<species.WriteEffectiveAndBiomassFluxes> <!--<species.WriteEffectiveAndBiomassFluxes> <synchronisationMode>ASYNCHRONOUS</synchronisationMode> <exportSeason>SPRING</exportSeason>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode> <fileNameOutput>effectiveBiomassFluxesBeforeReproduction</fileNameOutput> </species.WriteEffectiveAndBiomassFluxes> -->
<exportSeason>SPRING</exportSeason>
<fileNameOutput>effectiveBiomassFluxesBeforeReproduction</fileNameOutput>
</species.WriteEffectiveAndBiomassFluxes> -->
<species.ReproduceAndSurviveAfterReproductionWithDiagnose> <species.ReproduceAndSurviveAfterReproductionWithDiagnose>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode> <synchronisationMode>ASYNCHRONOUS</synchronisationMode>
...@@ -318,7 +309,6 @@ ...@@ -318,7 +309,6 @@
<synchronisationMode>ASYNCHRONOUS</synchronisationMode> <synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<migrationSeasonToReachInshore>SPRING</migrationSeasonToReachInshore> <migrationSeasonToReachInshore>SPRING</migrationSeasonToReachInshore>
<displayFluxesOnConsole>true</displayFluxesOnConsole> <displayFluxesOnConsole>true</displayFluxesOnConsole>
</species.MigrateFromRiverToInshore> </species.MigrateFromRiverToInshore>
<species.MigrateToOffshore> <species.MigrateToOffshore>
...@@ -326,6 +316,12 @@ ...@@ -326,6 +316,12 @@
<migrationSeasonToReachSummeringOffshore>SPRING</migrationSeasonToReachSummeringOffshore> <migrationSeasonToReachSummeringOffshore>SPRING</migrationSeasonToReachSummeringOffshore>
</species.MigrateToOffshore> </species.MigrateToOffshore>
<species.MigrateBetweenOffshores>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<migrationSeasonToReachWinteringOffshore>AUTOMN</migrationSeasonToReachWinteringOffshore>
<migrationSeasonToReachSummeringOffshore>SPRING</migrationSeasonToReachSummeringOffshore>
</species.MigrateBetweenOffshores>
<environment.updateTemperatureInRIOBasin> <environment.updateTemperatureInRIOBasin>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode> <synchronisationMode>ASYNCHRONOUS</synchronisationMode>
</environment.updateTemperatureInRIOBasin> </environment.updateTemperatureInRIOBasin>
......
...@@ -10,6 +10,7 @@ import environment.Time; ...@@ -10,6 +10,7 @@ import environment.Time;
import environment.OffshoreBasin.OffshoreBasinFunction; import environment.OffshoreBasin.OffshoreBasinFunction;
import environment.Time.Season; import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess; import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import species.DiadromousFish.Stage;
import java.util.List; import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
...@@ -85,7 +86,7 @@ public class MigrateBetweenOffshores extends AquaNismsGroupProcess<DiadromousFis ...@@ -85,7 +86,7 @@ public class MigrateBetweenOffshores extends AquaNismsGroupProcess<DiadromousFis
fish.setPosition(destination); fish.setPosition(destination);
destination.addFish(fish, group); destination.addFish(fish, group);
// remove fish from the present basin (with the listIterator to speed up !) // remove fish from the present basin (with the listIterator to speed up !)
fishIterator.remove();; fishIterator.remove();
} }
} }
} }
......
...@@ -52,13 +52,17 @@ public class MigrateFromOffshoreToInshore extends AquaNismsGroupProcess<Diadromo ...@@ -52,13 +52,17 @@ public class MigrateFromOffshoreToInshore extends AquaNismsGroupProcess<Diadromo
DiadromousFish fish = fishIterator.next(); DiadromousFish fish = fishIterator.next();
destination = ((RiverBasin) fish.getMemorisedBasin()).getConnectedInshoreBasin(); if (fish.getStage()== Stage.MATURE) {
destination = ((RiverBasin) fish.getMemorisedBasin()).getConnectedInshoreBasin();
// add fish with its new position to destination basin
fish.setPosition(destination);
destination.addFish(fish, group);
// remove fish from the present basin (with the listIterator to speed up !)
fishIterator.remove();
}
// add fish with its new position to destination basin
fish.setPosition(destination);
destination.addFish(fish, group);
// remove fish from the present basin (with the listIterator to speed up !)
fishIterator.remove();
} }
} }
......
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