| @@ -80,7 +80,7 @@ |
| |
| try { |
| management = getManagementFile(fileData); |
| - }catch (IOException ex) { |
| + } catch (IOException ex) { |
| badModelRun = true; |
| badModelMessage += "##\n"; |
| badModelMessage += ex.getMessage(); |
| @@ -172,6 +172,7 @@ |
| wepsMetaData = new WEPSMetaData(); |
| } |
| |
| + wepsMetaData.suid(this.suid); |
| wepsMetaData.annualPrecip(cligenData.annualAvgPrecip()); |
| wepsMetaData.crustStability(ifcFile.crustStability); |
| wepsMetaData.surfRockFrag(ifcFile.surfaceFragmentCover); |
| @@ -218,15 +219,15 @@ |
| bufferWriter.write(data); |
| bufferWriter.flush(); |
| bufferWriter.close(); |
| - |
| + |
| try { |
| wepsManagement.readManData(managementFile); |
| } catch (ParserException | ServiceException ex) { |
| Logger.getLogger(WEPSModelArchive.class.getName()).log(Level.SEVERE, null, ex); |
| badModelRun = true; |
| badModelMessage += "##\n"; |
| - badModelMessage += "Error parsing the WEPS management file: " + ex.getMessage(); |
| - } |
| + badModelMessage += "Error parsing the WEPS management file: " + ex.getMessage(); |
| + } |
| |
| return wepsManagement; |
| } |
| @@ -314,6 +315,15 @@ |
| private double crustStability; |
| private double surfRockFrag; |
| private double errosionRate; |
| + private String suid; |
| + |
| + public String suid() { |
| + return suid; |
| + } |
| + |
| + public void suid(String value) { |
| + suid = value; |
| + } |
| |
| public double windEnergy() { |
| return windEnergy; |
| @@ -403,9 +413,23 @@ |
| errosionRate = value; |
| } |
| |
| - public JSONArray toJSON() { |
| + public JSONArray toJSON() throws JSONException { |
| JSONArray ret_val = new JSONArray(); |
| + JSONObject results = new JSONObject(); |
| |
| + results.put("weps_archive_suid", wepsMetaData.suid()); |
| + results.put("annual_precipitation", wepsMetaData.annualPrecip()); |
| + results.put("crust_stability", wepsMetaData.crustStability()); |
| + results.put("surface_rock_fragments", wepsMetaData.surfRockFrag()); |
| + results.put("aggregate_stability", wepsMetaData.aggStability()); |
| + results.put("soil_wilting_poiont", wepsMetaData.soilWiltPoint()); |
| + results.put("rotation_weighted_biomass", wepsMetaData.rotWeightResBiomass()); |
| + results.put("annual_precipitation", wepsMetaData.annualPrecip()); |
| + |
| + results.put("rotation_weighted_soil_tillage_intensity", wepsMetaData.rotWeightSoilTillIntensity()); |
| + results.put("erosion_rate", wepsMetaData.errosionRate()); |
| + |
| + ret_val.put(results); |
| return ret_val; |
| } |
| } |