| @@ -55,6 +55,10 @@ |
| static final double DEFAULT_SLOPE_LENGTH_1 = 50.0; |
| static final double DEFAULT_SLOPE_LENGTH_2 = 164.04; |
| |
| + static final String CLIGEN_RECORD_PRISM_PAR = "cligenRecordPrism.par"; |
| + static final String CLIGEN_RECORD_PAR = "cligenRecord.par"; |
| + static final String CLIGEN_TXT = "cligen.txt"; |
| + |
| AoA aoa; |
| String parameterFileName; |
| String stormFileName; |
| @@ -167,8 +171,9 @@ |
| private ModelDataServiceCall fetchClimate(String stormfileName) throws JSONException, Exception { |
| ModelDataServiceCall res = new ModelDataServiceCall() |
| .put("duration", 300) |
| - .put("outputFile", "cligen.txt") |
| + .put("outputFile", CLIGEN_TXT) |
| .put("usePRISM", true) |
| + .put("returnParFiles", true) |
| .put("input_zone_features", new JSONObject( |
| "{ 'type': 'FeatureCollection'," |
| + " 'features': [{" |
| @@ -188,7 +193,9 @@ |
| .call(); |
| |
| if (res.serviceFinished()) { |
| - res.download("cligen.txt", workspace().getFile(stormfileName)); |
| + res.download(CLIGEN_TXT, workspace().getFile(stormfileName)); |
| + res.download(CLIGEN_RECORD_PAR, workspace().getFile(CLIGEN_RECORD_PAR)); |
| + res.download(CLIGEN_RECORD_PRISM_PAR, workspace().getFile(CLIGEN_RECORD_PRISM_PAR)); |
| return res; |
| } else { |
| throw new ServiceException("Climate service error: " + res.getError()); |
| @@ -196,6 +203,7 @@ |
| } |
| |
| |
| + |
| private void runModel() throws ServiceException, IOException { |
| Executable rh = resources().getExe(RHEM4_INTL_EXE); |
| rh.setArguments("-b", workspace().getFile(runFileName)); |
| @@ -245,6 +253,10 @@ |
| results().put(workspace().getFile(stormFileName), "Storm input file"); |
| results().put(workspace().getFile(summaryFileName), "Summary file"); |
| results().put(workspace().getFile(detailedOutputFileName), "Detailed summary file"); |
| + results().put(workspace().getFile(CLIGEN_RECORD_PAR), "Cligen Par file"); |
| + results().put(workspace().getFile(CLIGEN_RECORD_PRISM_PAR), "Cligen Prism Par file"); |
| + |
| // results().put(getWorkspaceFile("temp_" + summaryFileName), "Temp Summary file"); |
| } |
| + |
| } |
| @@ -1,5 +1,5 @@ |
| { |
| - "csip.context.version": "$version: 2.1.20 default 194 dd742bf6e03a 2021-02-02 od, built at 2021-02-02 09:35 by od$", |
| + "csip.context.version": "$version: 2.1.22 default 196 7262e795796e 2021-02-02 od, built at 2021-02-03 10:25 by od$", |
| "csip.archive.max.filesize": "1KB", |
| "esd.db": "jdbc:sqlserver://129.82.20.129:1433;databaseName=esd;user=sa;password=csurams#1", |
| "crdb.db": "jdbc:sqlserver://129.82.20.129:1433;databaseName=conservation_resources;user=sa;password=csurams#1", |