src/java/cfa/DurationCurve.java
| @@ -752,6 +752,7 @@ |
| String yaxis_title, |
| String wqTest, |
| double conversion, |
| + double wqTarget, |
| String[][] sortedData_combined, |
| String[][] sortedData_user, |
| String[][] WQdata_combined, |
| @@ -811,7 +812,7 @@ |
| totalCount = totalCount+1; |
| //Create an XYSeries for WQ points |
| double tempWQValue = Double.parseDouble(WQdata_combined[i][1]); |
| - WQ_load = (Double.parseDouble(sortedData_combined[j][1]))*conversion*tempWQValue; |
| + WQ_load = (Double.parseDouble(sortedData_combined[j][1]))*conversion*tempWQValue/wqTarget; |
| WQ_pts.add(xyRanks[j][0],WQ_load); |
| |
| //Create an XYSeries only if user WQ data is not empty |
| @@ -856,14 +857,14 @@ |
| for(int k=0;k<seasonalWQ_combined.length;k++){ |
| if(seasonalWQ_combined[k][0].equalsIgnoreCase(sortedData_combined[j][0])){ |
| double tempSeasonalWQValue = Double.parseDouble(seasonalWQ_combined[k][1]); |
| - Seasonal_WQ_load = (Double.parseDouble(sortedData_combined[j][1]))*conversion*tempSeasonalWQValue; |
| + Seasonal_WQ_load = (Double.parseDouble(sortedData_combined[j][1]))*conversion*tempSeasonalWQValue/wqTarget; |
| Seasonal_WQ_pts.add(xyRanks[j][0],Seasonal_WQ_load); |
| } |
| } |
| for(int k=0;k<seasonalWQ_user.length;k++){ |
| if(seasonalWQ_user[k][0].equalsIgnoreCase(sortedData_combined[j][0])){ |
| double tempSeasonalWQValue = Double.parseDouble(seasonalWQ_user[k][1]); |
| - Seasonal_WQ_load = (Double.parseDouble(sortedData_combined[j][1]))*conversion*tempSeasonalWQValue; |
| + Seasonal_WQ_load = (Double.parseDouble(sortedData_combined[j][1]))*conversion*tempSeasonalWQValue/wqTarget; |
| Seasonal_WQ_pts_user.add(xyRanks[j][0],Seasonal_WQ_load); |
| } |
| } |
src/java/cfa/guiDC_Model.java
| @@ -433,7 +433,7 @@ |
| String graphTitle = "Load Duration Curve for Station No. " + stationID + " - " + stationName; |
| String yaxisTitle = WQlabel + " [" + endUnits + "]"; |
| Object[] returnArray = durationCurve.graphLDC(mainFolder, stationName, start, end, graphTitle, yaxisTitle, wqTest, |
| - conversion, sortedData_combined, sortedData_user, WQdata_combined, WQdata_user, seasonalWQ_combined, seasonalWQ_user, mQn, m, n); |
| + conversion, wqTarget, sortedData_combined, sortedData_user, WQdata_combined, WQdata_user, seasonalWQ_combined, seasonalWQ_user, mQn, m, n); |
| String paragraphTitle = (String) returnArray[0]; |
| double totalCount = (Double) returnArray[1]; |
| |