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

Clean in file output Round 2

parent f3b2a63b
......@@ -198,9 +198,9 @@
<parameterSetLine>0</parameterSetLine>
<yearOfTheUpdate>0</yearOfTheUpdate>
<basinsToUpdateFile>data/input/reality/basinsToUpdate.csv</basinsToUpdateFile>
<outputPath>data/output/</outputPath>
<outputPath>data/output/atlanticarea/</outputPath>
<minYearToWrite>1900</minYearToWrite>
<fileNameFluxes>nutrientFluxes</fileNameFluxes>
<fileNameFluxes></fileNameFluxes>
<lengthAtHatching>2.0</lengthAtHatching>
<linfVonBertForFemale>70.0</linfVonBertForFemale>
<linfVonBertForMale>70.0</linfVonBertForMale>
......@@ -297,7 +297,7 @@
<initialLength>2.0</initialLength>
<sigmaRecruitment>0.2</sigmaRecruitment>
<survivalRateAfterReproduction>0.1</survivalRateAfterReproduction>
<maxNumberOfSuperIndividualPerReproduction>500.0
<maxNumberOfSuperIndividualPerReproduction>100.0
</maxNumberOfSuperIndividualPerReproduction>
<withDiagnose>false</withDiagnose>
<displayFluxesOnConsole>false</displayFluxesOnConsole>
......@@ -318,7 +318,7 @@
<processesAtEnd>
<species.WriteNutrientImportFluxes>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<fileName>fluxes</fileName>
<fileName>nutrientImportFluxes</fileName>
</species.WriteNutrientImportFluxes>
<species.WriteNutrientExportFluxes>
......
......@@ -93,12 +93,12 @@ public class DiadromousFishGroup extends AquaNismsGroup< DiadromousFish, BasinNe
*/
private String basinsToUpdateFile = "data/input/reality/basinsToUpdate.csv";
private String outputPath = "data/output/" ;
private String outputPath = "data/output/atlanticarea/" ;
private long minYearToWrite = 1900;
//TODO:remove fileNameFluxes
private String fileNameFluxes = "fluxes";
private String fileNameFluxes = "nutrientsImportfluxes";
private transient BufferedWriter bWForFluxes;
private transient String sep;
......@@ -458,7 +458,7 @@ public class DiadromousFishGroup extends AquaNismsGroup< DiadromousFish, BasinNe
}
// open an bufferad writer to export fluxes
if (fileNameFluxes != null){
if (!fileNameFluxes.isEmpty()){
sep = ";";
new File(this.outputPath +fileNameFluxes).getParentFile().mkdirs();
try {
......
......@@ -30,7 +30,7 @@ public class WriteNutrientExportFluxes extends AquaNismsGroupProcess<DiadromousF
BufferedWriter bW;
String outputPath = "data/output/" ;
String outputPath = group.getOutputPath() ;
String sep = ";";
new File(outputPath + fileName).getParentFile().mkdirs();
try {
......
......@@ -17,7 +17,7 @@ import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
public class WriteNutrientImportFluxes extends AquaNismsGroupProcess<DiadromousFish, DiadromousFishGroup> {
private String fileName= "fluxes";
private String fileName= "nutrientImportFluxes";
......@@ -32,7 +32,7 @@ public class WriteNutrientImportFluxes extends AquaNismsGroupProcess<DiadromousF
BufferedWriter bW;
String outputPath = "data/output/" ;
String outputPath = group.getOutputPath();
String sep = ";";
new File(outputPath + fileName).getParentFile().mkdirs();
try {
......
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