int xCoordColumnIndex = model.getXCoordIndex();
int yCoordColumnIndex = model.getYCoordIndex();
int zCoordColumnIndex = model.getZCoordIndex();
+ int altElevationIndex = model.getAlternativeElevationIndex();
int supplyTempColumnIndex = model.getSupplyTempIndex();
int returnTempColumnIndex = model.getReturnTempIndex();
int supplyPressureColumnIndex = model.getSupplyPressureIndex();
int dpIndex = model.getDeltaPressureIndex();
int dtIndex = model.getDeltaTemperatureIndex();
int heatPowerIndex = model.getHeatPowerIndex();
+ int peakPowerIndex = model.getPeakPowerIndex();
int valvePositionIndex = model.getValvePositionIndx();
int nominalHeadMIndex = model.getNominalHeadMIndex();
int nominalHeadBIndex = model.getNominalHeadBIndex();
}
}
}
-
+
double[] coords;
if (actualDoTransform) {
DirectPosition2D targetPos = new DirectPosition2D();
writeStringValue(graph, row, idColumn, vertex, DN.HasId);
+ writeValue(graph, row, altElevationIndex, vertex, DN.Vertex_HasAltElevation);
+
writeValue(graph, row, supplyTempColumnIndex, vertex, DN.Vertex_HasSupplyTemperature);
writeValue(graph, row, returnTempColumnIndex, vertex, DN.Vertex_HasReturnTemperature);
writeValue(graph, row, supplyPressureColumnIndex, vertex, DN.Vertex_HasSupplyPressure);
writeValue(graph, row, dpIndex, vertex, DN.Vertex_HasDeltaPressure);
writeValue(graph, row, dtIndex, vertex, DN.Vertex_HasDeltaTemperature);
writeValue(graph, row, heatPowerIndex, vertex, DN.Vertex_HasHeatPower);
+ writeValue(graph, row, peakPowerIndex, vertex, DN.Vertex_HasPeakPower);
writeValue(graph, row, valvePositionIndex, vertex, DN.Vertex_HasValvePosition);
writeValue(graph, row, nominalHeadMIndex, vertex, DN.Vertex_HasNominalHeadM);
writeValue(graph, row, nominalHeadBIndex, vertex, DN.Vertex_HasNominalHeadB);
double y = Double.parseDouble(p[1]);
if (actualTransform != null) {
DirectPosition2D targetPos = new DirectPosition2D();
- DirectPosition2D sourcePos = new DirectPosition2D(y, x);
+ DirectPosition2D sourcePos = new DirectPosition2D(x, y);
DirectPosition res = actualTransform.transform(sourcePos, targetPos);
double[] coords = res.getCoordinate();
x = coords[1];