From f93438379d67b96d7677ce1d272f08c853f48beb Mon Sep 17 00:00:00 2001
From: "camille.poulet" <camille.poulet@irstea.fr>
Date: Wed, 1 Jul 2020 13:28:17 +0200
Subject: [PATCH] Clean in file output Round 2
---
data/input/atlanticarea/fishTryRealBV_CC_Alosa.xml | 8 ++++----
src/main/java/species/DiadromousFishGroup.java | 6 +++---
src/main/java/species/WriteNutrientExportFluxes.java | 2 +-
src/main/java/species/WriteNutrientImportFluxes.java | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/data/input/atlanticarea/fishTryRealBV_CC_Alosa.xml b/data/input/atlanticarea/fishTryRealBV_CC_Alosa.xml
index 494329c..db94a6d 100644
--- a/data/input/atlanticarea/fishTryRealBV_CC_Alosa.xml
+++ b/data/input/atlanticarea/fishTryRealBV_CC_Alosa.xml
@@ -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>
diff --git a/src/main/java/species/DiadromousFishGroup.java b/src/main/java/species/DiadromousFishGroup.java
index 72de7dd..3601347 100644
--- a/src/main/java/species/DiadromousFishGroup.java
+++ b/src/main/java/species/DiadromousFishGroup.java
@@ -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 {
diff --git a/src/main/java/species/WriteNutrientExportFluxes.java b/src/main/java/species/WriteNutrientExportFluxes.java
index adf39b3..fcc8c7e 100644
--- a/src/main/java/species/WriteNutrientExportFluxes.java
+++ b/src/main/java/species/WriteNutrientExportFluxes.java
@@ -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 {
diff --git a/src/main/java/species/WriteNutrientImportFluxes.java b/src/main/java/species/WriteNutrientImportFluxes.java
index 4d95777..b481016 100644
--- a/src/main/java/species/WriteNutrientImportFluxes.java
+++ b/src/main/java/species/WriteNutrientImportFluxes.java
@@ -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 {
--
GitLab