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

with a simulationName in env.xml

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