src/java/m/rhem/model/Parameter.java
@@ -91,11 +91,11 @@ |
return formatDoubleString(value, DEFAULT_DOUBLE_PRECISION_FORMAT); |
} |
|
- protected String formatDouble(double value) { |
+ public static String formatDouble(double value) { |
return formatDoubleString(value, DEFAULT_DOUBLE_FORMAT); |
} |
|
- private String formatDoubleString(double value, String format) { |
+ private static String formatDoubleString(double value, String format) { |
return String.format(format, value); |
} |
|
src/java/m/rhem/model/RhemModel.java
@@ -225,8 +225,8 @@ |
double avgSoilLoss; |
|
|
- public double getTDS() { |
- return (2.36 * (avgSoilLoss * 1000) + 0.99) / 1000.0; |
+ public String getTDS() { |
+ return Parameter.formatDouble((2.36 * (avgSoilLoss * 1000) + 0.99) / 1000.0); |
} |
|
|
src/java/m/rhem/rhem01_runmodel/V1_0.java
@@ -222,7 +222,7 @@ |
results.put("DIST", parameter.getDist(), "pore size distribution index"); |
results.put("POR", parameter.getPor(), "porosity"); |
results.put("FRACT", parameter.getFract(), "list of particle class fractions"); |
- results.put("TDS", rhemModel.getTDS(), "total dissolved solids."); |
+ results.put("TDS", rhemModel.getTDS(), "total dissolved solids"); |
results.put(getWorkspaceFile(parameterFileName), "Parameter input file"); |
results.put(getWorkspaceFile(stormFileName), "Storm input file"); |
results.put(getWorkspaceFile(summaryFileName), "Summary file"); |