| @@ -72,9 +72,9 @@ |
| private Parameter parameter; |
| |
| String cligen_db = Config.getString("rhem.cligen_db", "file:/Users/rumpal/Documents/Work/csipDocuments/RHEM/cligen"); |
| - |
| - |
| + |
| RhemModel rhemModel; |
| + int unit; |
| |
| |
| @Override |
| @@ -85,7 +85,7 @@ |
| int rhemSiteId = parameters.getInt("rhem_site_id", 0); |
| String scenarioName = parameters.getString("scenarioname"); |
| String scenarioDescription = parameters.getString("scenariodescription"); |
| - int unit = parameters.getInt("units"); |
| + unit = parameters.getInt("units"); |
| String stateId = parameters.getString("stateid"); |
| String climatestationId = parameters.getString("climatestationid"); |
| String soilTexture = parameters.getString("soiltexture"); |
| @@ -100,7 +100,6 @@ |
| double litterCover = parameters.getDouble("littercover", 0.0); |
| double cryptogamsCover = parameters.getDouble("cryptogamscover", 0.0); |
| double sar = parameters.getDouble("sar", 0.0); |
| - |
| |
| /////////////////////////////// |
| // BEGIN Validations of input |
| @@ -108,7 +107,7 @@ |
| if (sar < 0.0 || sar > 50.0) { |
| throw new ServiceException("invalid sar (0.0 ... 50.0): " + sar); |
| } |
| - |
| + |
| double slopeLength; |
| switch (unit) { |
| case 1: |
| @@ -209,24 +208,24 @@ |
| |
| results.put("AoAID", aoa.getAoaId(), "Area of Analysis Identifier"); |
| results.put("rhem_site_id", aoa.getRhemSiteId(), "RHEM Evaluation Site Identifier"); |
| - results.put("CLEN", parameter.getClen()); |
| - results.put("UNITS", "metric"); |
| - results.put("DIAMS", parameter.getDiams()); |
| - results.put("DENSITY", parameter.getDensity()); |
| - results.put("CHEZY", parameter.getChezy()); |
| - results.put("RCHEZY", parameter.getRchezy()); |
| - results.put("SL", parameter.getSl()); |
| - results.put("SX", parameter.getSx()); |
| - results.put("KSS", parameter.getKss()); |
| - results.put("KE", parameter.getKe()); |
| - results.put("G", parameter.getG()); |
| - 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("CLEN", parameter.getClen(), "characteristic length of hillsope"); |
| + results.put("UNITS", (unit == 1) ? "metric" : "English", "unit of measure, metric or English"); |
| + results.put("DIAMS", parameter.getDiams(), "list of representative soil particle diameters for up to 5 particle classes"); |
| + results.put("DENSITY", parameter.getDensity(), "list of densities corresponding to the DIAMS particle classes"); |
| + results.put("CHEZY", parameter.getChezy(), "overland flow Chezy coefficient"); |
| + results.put("RCHEZY", parameter.getRchezy(), "concentrated flow Chezy coefficient"); |
| + results.put("SL", parameter.getSl(), "slope expressed as fractional rise/run"); |
| + results.put("SX", parameter.getSx(), "normalized distance"); |
| + results.put("KSS", parameter.getKss(), "splash and sheet erodibility coefficient"); |
| + results.put("KE", parameter.getKe(), "effective hydraulic conductivity"); |
| + results.put("G", parameter.getG(), "mean capillary drive"); |
| + 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(getWorkspaceFile(parameterFileName), "Parameter input file"); |
| results.put(getWorkspaceFile(stormFileName), "Storm input file"); |
| results.put(getWorkspaceFile(summaryFileName), "Summary file"); |
| - results.put(getWorkspaceFile(detailedOutputFileName), "Detailed"); |
| + results.put(getWorkspaceFile(detailedOutputFileName), "Detailed summary file"); |
| } |
| } |