| @@ -46,19 +46,19 @@ |
| @Polling(first = 25000, next = 2000) |
| |
| // weps |
| -//@Resource(type = EXECUTABLE, file = "/bin/${csip.arch}/weps-1.3.9", id = WEPS_139) |
| +@Resource(type = EXECUTABLE, file = "/bin/${arch}/weps-1.3.9", id = WEPS_139) |
| //@Resource(type = EXECUTABLE, file = "/bin/${csip.arch}/weps", id = WEPS_139) |
| -@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/weps", id = WEPS_139) |
| +////@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/weps-1.3.9", id = WEPS_139) |
| // cligen |
| -//@Resource(type = EXECUTABLE, file = "/bin/${csip.arch}/cligen", id = CLIGEN) |
| -@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/cligen", id = CLIGEN) |
| +@Resource(type = EXECUTABLE, file = "/bin/${arch}/cligen", id = CLIGEN) |
| +//@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/cligen", id = CLIGEN) |
| @Resource(type = FILE, file = "/data/upd_US_cligen_stations.par", id = STATION_PAR) |
| // windgen |
| @Resource(type = EXECUTABLE, file = "/bin/win-x86/wind_gen4.exe", wine = true, id = WINDGEN) |
| -//@Resource(type = EXECUTABLE, file = "/bin/${csip.arch}/interpolate", id = INTERPOLATE) |
| -@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/interpolate", id = INTERPOLATE) |
| -//@Resource(type = EXECUTABLE, file = "/bin/${csip.arch}/interp_wdb", id = INTERP_WDB) |
| -@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/interp_wdb", id = INTERP_WDB) |
| +@Resource(type = EXECUTABLE, file = "/bin/${arch}/interpolate", id = INTERPOLATE) |
| +////@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/interpolate", id = INTERPOLATE) |
| +@Resource(type = EXECUTABLE, file = "/bin/${arch}/interp_wdb", id = INTERP_WDB) |
| +////@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/interp_wdb", id = INTERP_WDB) |
| @Resource(type = FILE, file = "/data/wind_gen_his_upper_US_NRCS.idx", id = WINDGEN_IDX) |
| @Resource(type = FILE, file = "/data/wind_gen_his_upper_US.wdb", id = DEFAULT_WIND_STATION_DB) |
| @Resource(type = FILE, file = "/data/interpolation_boundary.pol", id = BOUNDARY_POL) |
| @@ -67,7 +67,7 @@ |
| public class V1_3_1 extends ModelDataService { |
| |
| static final String REPORT_JSON_ID = "weps_report"; |
| - static final String WEPS_139 = "weps_139"; |
| + static final String WEPS_139 = "weps-1.3.9"; |
| static final String CLIGEN = "cligen"; |
| static final String WINDGEN = "windgen"; |
| static final String INTERPOLATE = "interpolate"; |
| @@ -227,8 +227,8 @@ |
| protected void postProcess() throws Exception { |
| putResult(new File(getWorkspaceDir(), "stir_energy.out")); |
| putResult(new File(getWorkspaceDir(), "sci_energy.out")); |
| - putResult(new File(getWorkspaceDir(), "weps-stdout.txt")); |
| - putResult(new File(getWorkspaceDir(), "weps-stderr.txt")); |
| + putResult(new File(getWorkspaceDir(), WEPS_139 + "-stdout.txt")); |
| + putResult(new File(getWorkspaceDir(), WEPS_139 + "-stderr.txt")); |
| |
| } |
| |