Commit 85da8f77 authored by Eric Duminil's avatar Eric Duminil
Browse files

Add Psy value too.

parent 8717c842
This diff is collapsed.
...@@ -81,8 +81,8 @@ public class TreeWaterDemand ...@@ -81,8 +81,8 @@ public class TreeWaterDemand
DateTimeFormatter f = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"); DateTimeFormatter f = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm");
Locale.setDefault(new Locale("en", "US")); Locale.setDefault(new Locale("en", "US"));
try (BufferedWriter bw = Files.newBufferedWriter(Paths.get("all_values.csv"), StandardCharsets.UTF_8)) { try (BufferedWriter bw = Files.newBufferedWriter(Paths.get("all_values.csv"), StandardCharsets.UTF_8)) {
bw.write("DateTime;Temperature;Humidity;GHI;WindSpeed;SaturationVaporPressure;ActualVaporPressure;ET0;ET0u\n"); bw.write("DateTime;Temperature;Humidity;GHI;WindSpeed;SaturationVaporPressure;ActualVaporPressure;Psy;ET0;ET0u\n");
bw.write("dd/mm/yyyy HH:MM;[°C];[%];[W/m²];[m/s];[?];[?];[l/h];[l/h]\n"); bw.write("dd/mm/yyyy HH:MM;[°C];[%];[W/m²];[m/s];[kPa];[kPa];[kPa/°C];[l/h];[l/h]\n");
for (int i = startHours; i <= startHours + hours; i++) { for (int i = startHours; i <= startHours + hours; i++) {
bw.write(String.format("%s;", counter.format(f))); bw.write(String.format("%s;", counter.format(f)));
String[] row = csvValues.get(i + 2); String[] row = csvValues.get(i + 2);
...@@ -106,8 +106,9 @@ public class TreeWaterDemand ...@@ -106,8 +106,9 @@ public class TreeWaterDemand
double et0u = et0u(svf, advection, et0); double et0u = et0u(svf, advection, et0);
bw.write(String.format(";%.1f", windSpeed)); bw.write(String.format(";%.1f", windSpeed));
bw.write(String.format(";%.3f", saturationVaporPressure)); bw.write(String.format(";%.5f", saturationVaporPressure));
bw.write(String.format(";%.3f", actualVaporPressure)); bw.write(String.format(";%.5f", actualVaporPressure));
bw.write(String.format(";%.5f", gamma(height)));
bw.write(String.format(";%.3f", et0)); bw.write(String.format(";%.3f", et0));
bw.write(String.format(";%.3f", et0u)); bw.write(String.format(";%.3f", et0u));
......
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