diff --git a/data/input/atlanticarea/fishTryRealBV_CC_Alosa.xml b/data/input/atlanticarea/fishTryRealBV_CC_Alosa.xml index 494329c3e8e087623c56702c8cbb971b2edf2041..db94a6dda8939f77700713b860fd07d1fbbf8f83 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 72de7dd24619ae27e66f842f3bf05d1d01983385..360134709f09a3276d8142959f8d41ce427be2ef 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 adf39b394d52a0d03021c169e8d85e792e6b63ad..fcc8c7e2726ed3f66a75a67b17fa97b72668402e 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 4d957775845d353bd0c2acf0aa3967c956fdcb16..b481016a80ef52da768c746408528bac675e495b 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 {