Commit 3837a134 authored by patrick.lambert's avatar patrick.lambert
Browse files

with a simulationName in env.xml

parent a7f77b00
......@@ -4,6 +4,7 @@
<cVthresholdForFinalStates>5.0</cVthresholdForFinalStates>
<RecruitmentThresholdForFsAndKappa>50.0</RecruitmentThresholdForFsAndKappa>
<yearOfTheBegin>1801</yearOfTheBegin>
<simulationName>reference</simulationName>
<riverBasinFile>data/input/northeastamerica/nea_riverbasins.csv</riverBasinFile>
<offshoreBasinFile>data/input/northeastamerica/nea_offshorebasins.csv</offshoreBasinFile>
......
......@@ -15,6 +15,13 @@ public abstract class BasinNetwork extends Environment<Basin, DiadromousFish> {
protected long yearOfTheBegin = 1800;
/**
* a generic name use to identify simulation
*
* @unit
*/
protected String simulationName = "";
protected transient double[][] distanceGrid;
protected transient Time time;
......@@ -53,19 +60,19 @@ public abstract class BasinNetwork extends Environment<Basin, DiadromousFish> {
@Override
public void addAquaNism(DiadromousFish fish, AquaNismsGroup group) {
// TODO Auto-generated method stub
// Auto-generated method stub
}
@Override
public void moveAquaNism(DiadromousFish fish, AquaNismsGroup group, Basin destination) {
// TODO Auto-generated method stub
// Auto-generated method stub
}
@Override
public void removeAquaNism(DiadromousFish fish, AquaNismsGroup group) {
// TODO Auto-generated method stub
// Auto-generated method stub
}
......@@ -92,9 +99,10 @@ public abstract class BasinNetwork extends Environment<Basin, DiadromousFish> {
*/
public String getSimulationId() {
String id = "_";
id = id.concat(Integer.toString(getPilot().getParameters().getRngStatusIndex()));
String temperatureFile = getTemperatureCatchmentFile();
id = id.concat("-").concat(temperatureFile);
if (!simulationName.equalsIgnoreCase(""))
id = id.concat(simulationName).concat("-");
id = id.concat(Integer.toString(getPilot().getParameters().getRngStatusIndex())).concat("-")
.concat(getTemperatureCatchmentFile());
return id;
}
......
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