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

Merge branch 'exploration_GR3D_process' of...

Merge branch 'exploration_GR3D_process' of gitlab-ssh.irstea.fr:SimAquaLife/GR3D into SpawnerRunAnalysis
parents 72cb7d17 1b6f6d7a
......@@ -199,11 +199,11 @@
<outputPath>data/output/northeastamerica/</outputPath>
<minYearToWrite>1800</minYearToWrite>
<fileNameFluxes></fileNameFluxes>
<lengthAtHatching>2.8</lengthAtHatching>
<linfVonBertForFemale>76.0</linfVonBertForFemale>
<linfVonBertForMale>76.0</linfVonBertForMale>
<lFirstMaturityForFemale>47.26</lFirstMaturityForFemale>
<lFirstMaturityForMale>40.6</lFirstMaturityForMale>
<lengthAtHatching>5.83</lengthAtHatching>
<linfVonBertForFemale>68.90</linfVonBertForFemale>
<linfVonBertForMale>68.90</linfVonBertForMale>
<lFirstMaturityForFemale>50.43</lFirstMaturityForFemale>
<lFirstMaturityForMale>39.88</lFirstMaturityForMale>
<processes>
<processesAtBegin>
......@@ -237,10 +237,10 @@
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<tempMinGrow>1.7</tempMinGrow>
<tempMaxGrow>27.9</tempMaxGrow>
<tempOptGrow>6.2</tempOptGrow>
<kOptForFemale>0.25</kOptForFemale>
<kOptForMale>0.23</kOptForMale>
<sigmaDeltaLVonBert>0.2</sigmaDeltaLVonBert>
<tempOptGrow>13.37</tempOptGrow>
<kOptForFemale>0.35</kOptForFemale>
<kOptForMale>0.25</kOptForMale>
<sigmaDeltaLVonBert>0.4</sigmaDeltaLVonBert>
</species.Grow>
<species.MigrateFromOffshoreToInshore>
......
......@@ -99,7 +99,7 @@ public abstract class BasinNetwork extends Environment<Basin, DiadromousFish> {
*/
public String getSimulationId() {
String id = "_";
if (simulationName.isEmpty() | simulationName.isBlank())
if (simulationName.isEmpty())
id = id.concat(simulationName).concat("-");
id = id.concat(Integer.toString(getPilot().getParameters().getRngStatusIndex())).concat("-")
.concat(getTemperatureCatchmentFile());
......
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