Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
SimAquaLife
GR3D
Commits
e6d6f723
Commit
e6d6f723
authored
Sep 11, 2020
by
patrick.lambert
Browse files
Merge branch 'develop' into BasinImprovement
parents
7f678fe4
52340fcd
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
data/input/northeastamerica/RIOBNneaBasins.xml
View file @
e6d6f723
...
...
@@ -25,5 +25,4 @@
<temperatureRiverFile>
data/input/northeastamerica/observed_river_temperatures.csv
</temperatureRiverFile>
<useRealPDam>
false
</useRealPDam>
</environment.RIOBasinNetworkWithContinent>
</environment.RIOBasinNetworkWithContinent>
\ No newline at end of file
data/input/northeastamerica/fishRIOBasin_Sapidissima.xml
View file @
e6d6f723
...
...
@@ -245,12 +245,6 @@
<sigmaDeltaLVonBert>
0.2
</sigmaDeltaLVonBert>
</species.Grow>
<species.MigrateBetweenOffshores>
<synchronisationMode>
ASYNCHRONOUS
</synchronisationMode>
<migrationSeasonToReachWinteringOffshore>
AUTOMN
</migrationSeasonToReachWinteringOffshore>
<migrationSeasonToReachSummeringOffshore>
SPRING
</migrationSeasonToReachSummeringOffshore>
</species.MigrateBetweenOffshores>
<species.MigrateFromOffshoreToInshore>
<synchronisationMode>
ASYNCHRONOUS
</synchronisationMode>
<migrationSeasonToReachInshore>
SPRING
</migrationSeasonToReachInshore>
...
...
@@ -286,11 +280,8 @@
<mortalityRateInOffshore>
0.4
</mortalityRateInOffshore>
</species.Survive>
<!--<species.WriteEffectiveAndBiomassFluxes>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<exportSeason>SPRING</exportSeason>
<fileNameOutput>effectiveBiomassFluxesBeforeReproduction</fileNameOutput>
</species.WriteEffectiveAndBiomassFluxes> -->
<!--<species.WriteEffectiveAndBiomassFluxes> <synchronisationMode>ASYNCHRONOUS</synchronisationMode> <exportSeason>SPRING</exportSeason>
<fileNameOutput>effectiveBiomassFluxesBeforeReproduction</fileNameOutput> </species.WriteEffectiveAndBiomassFluxes> -->
<species.ReproduceAndSurviveAfterReproductionWithDiagnose>
<synchronisationMode>
ASYNCHRONOUS
</synchronisationMode>
...
...
@@ -318,7 +309,6 @@
<synchronisationMode>
ASYNCHRONOUS
</synchronisationMode>
<migrationSeasonToReachInshore>
SPRING
</migrationSeasonToReachInshore>
<displayFluxesOnConsole>
true
</displayFluxesOnConsole>
</species.MigrateFromRiverToInshore>
<species.MigrateToOffshore>
...
...
@@ -326,6 +316,12 @@
<migrationSeasonToReachSummeringOffshore>
SPRING
</migrationSeasonToReachSummeringOffshore>
</species.MigrateToOffshore>
<species.MigrateBetweenOffshores>
<synchronisationMode>
ASYNCHRONOUS
</synchronisationMode>
<migrationSeasonToReachWinteringOffshore>
AUTOMN
</migrationSeasonToReachWinteringOffshore>
<migrationSeasonToReachSummeringOffshore>
SPRING
</migrationSeasonToReachSummeringOffshore>
</species.MigrateBetweenOffshores>
<environment.updateTemperatureInRIOBasin>
<synchronisationMode>
ASYNCHRONOUS
</synchronisationMode>
</environment.updateTemperatureInRIOBasin>
...
...
data/input/northeastamerica/observed_river_temperatures.csv
View file @
e6d6f723
This diff is collapsed.
Click to expand it.
src/main/java/species/MigrateBetweenOffshores.java
View file @
e6d6f723
...
...
@@ -10,6 +10,7 @@ import environment.Time;
import
environment.OffshoreBasin.OffshoreBasinFunction
;
import
environment.Time.Season
;
import
fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess
;
import
species.DiadromousFish.Stage
;
import
java.util.List
;
import
java.util.ListIterator
;
...
...
@@ -85,7 +86,7 @@ public class MigrateBetweenOffshores extends AquaNismsGroupProcess<DiadromousFis
fish
.
setPosition
(
destination
);
destination
.
addFish
(
fish
,
group
);
// remove fish from the present basin (with the listIterator to speed up !)
fishIterator
.
remove
();
;
fishIterator
.
remove
();
}
}
}
...
...
src/main/java/species/MigrateFromOffshoreToInshore.java
View file @
e6d6f723
...
...
@@ -52,13 +52,17 @@ public class MigrateFromOffshoreToInshore extends AquaNismsGroupProcess<Diadromo
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
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment