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

Merge branch 'Camille_Bis'

parents a504cee6 91f2bec7
...@@ -13,6 +13,6 @@ ...@@ -13,6 +13,6 @@
<seaBasinNameLabel>BASIN_NAME</seaBasinNameLabel> <seaBasinNameLabel>BASIN_NAME</seaBasinNameLabel>
<continentPathName>ID</continentPathName> <continentPathName>ID</continentPathName>
<distanceGridFileName>data/input/atlanticarea/distanceGridAA.csv</distanceGridFileName> <distanceGridFileName>data/input/atlanticarea/distanceGridAA.csv</distanceGridFileName>
<temperatureCatchmentFile>data/input/atlanticarea/aa_sst_histo.csv</temperatureCatchmentFile> <temperatureCatchmentFile>data/input/atlanticarea/aa_air_temperature_since_1800.csv</temperatureCatchmentFile>
<useRealPDam>false</useRealPDam> <useRealPDam>false</useRealPDam>
</environment.BasinNetworkSWithContinent> </environment.BasinNetworkSWithContinent>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
<initialLength>2.0</initialLength> <initialLength>2.0</initialLength>
<sigmaRecruitment>0.2</sigmaRecruitment> <sigmaRecruitment>0.2</sigmaRecruitment>
<survivalRateAfterReproduction>0.1</survivalRateAfterReproduction> <survivalRateAfterReproduction>0.1</survivalRateAfterReproduction>
<maxNumberOfSuperIndividualPerReproduction>100.0</maxNumberOfSuperIndividualPerReproduction> <maxNumberOfSuperIndividualPerReproduction>250.0</maxNumberOfSuperIndividualPerReproduction>
<withDiagnose>false</withDiagnose> <withDiagnose>false</withDiagnose>
<displayFluxesOnConsole>false</displayFluxesOnConsole> <displayFluxesOnConsole>false</displayFluxesOnConsole>
</species.ReproduceAndSurviveAfterReproductionWithDiagnose> </species.ReproduceAndSurviveAfterReproductionWithDiagnose>
......
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