Commit 12575da1 authored by Lambert Patrick's avatar Lambert Patrick
Browse files

no buffered Writer created when fileNameFluxes is empty

Showing with 6 additions and 7 deletions
+6 -7
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
<parameterSetLine>0</parameterSetLine> <parameterSetLine>0</parameterSetLine>
<yearOfTheUpdate>0</yearOfTheUpdate> <yearOfTheUpdate>0</yearOfTheUpdate>
<basinsToUpdateFile>data/input/reality/basinsToUpdate.csv</basinsToUpdateFile> <basinsToUpdateFile>data/input/reality/basinsToUpdate.csv</basinsToUpdateFile>
<outputPath>data/output/</outputPath> <outputPath>data/output/atlanticarea/</outputPath>
<minYearToWrite>1900</minYearToWrite> <minYearToWrite>1900</minYearToWrite>
<fileNameFluxes>nutrientFluxes</fileNameFluxes> <fileNameFluxes></fileNameFluxes>
<lengthAtHatching>2.0</lengthAtHatching> <lengthAtHatching>2.0</lengthAtHatching>
<linfVonBertForFemale>70.0</linfVonBertForFemale> <linfVonBertForFemale>70.0</linfVonBertForFemale>
<linfVonBertForMale>70.0</linfVonBertForMale> <linfVonBertForMale>70.0</linfVonBertForMale>
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
<processesAtEnd> <processesAtEnd>
<species.WriteNutrientImportFluxes> <species.WriteNutrientImportFluxes>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode> <synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<fileName>fluxes</fileName> <fileName>nutrientImportFluxes</fileName>
</species.WriteNutrientImportFluxes> </species.WriteNutrientImportFluxes>
<species.WriteNutrientExportFluxes> <species.WriteNutrientExportFluxes>
......
...@@ -8,7 +8,6 @@ import java.io.FileWriter; ...@@ -8,7 +8,6 @@ import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
...@@ -465,8 +464,8 @@ public class DiadromousFishGroup extends AquaNismsGroup<DiadromousFish, BasinNet ...@@ -465,8 +464,8 @@ public class DiadromousFishGroup extends AquaNismsGroup<DiadromousFish, BasinNet
tempMinRep = parameterSets.get(parameterSetLine - 1).getSecond(); tempMinRep = parameterSets.get(parameterSetLine - 1).getSecond();
} }
// open an bufferad writer to export fluxes // open an buffered writer to export fluxes
if (fileNameFluxes != null) { if (!fileNameFluxes.isEmpty()) {
sep = ";"; sep = ";";
new File(this.outputPath + fileNameFluxes).getParentFile().mkdirs(); new File(this.outputPath + fileNameFluxes).getParentFile().mkdirs();
try { try {
...@@ -502,7 +501,7 @@ public class DiadromousFishGroup extends AquaNismsGroup<DiadromousFish, BasinNet ...@@ -502,7 +501,7 @@ public class DiadromousFishGroup extends AquaNismsGroup<DiadromousFish, BasinNet
while (scanner.hasNextLine()) { while (scanner.hasNextLine()) {
String[] fields = scanner.nextLine().split(","); String[] fields = scanner.nextLine().split(",");
System.out.println(Arrays.toString(fields)); // System.out.println(Arrays.toString(fields));
if (fields.length > 2) { if (fields.length > 2) {
if (!fields[2].isEmpty()) if (!fields[2].isEmpty())
obs1900.put(fields[1], Integer.valueOf(fields[2])); obs1900.put(fields[1], Integer.valueOf(fields[2]));
......
Supports Markdown
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