src/java/m/wrfhydro/V1_0.java
| @@ -22,7 +22,7 @@ |
| import static m.wrfhydro.V1_0.*; |
| |
| /** |
| - * WRF Hydro model. |
| + * WRF-Hydro model. |
| * |
| * @author od |
| */ |
| @@ -36,7 +36,7 @@ |
| @Category("Hydrology") |
| @Category("Flood prediction") |
| |
| -@Path("m/wrf-hydro/5.0.3") |
| +@Path("m/5.0.3") |
| @Resource(file = MPI, type = REFERENCE, id = MPI) |
| @Resource(file = "diag_hydro.* *.txt", type = OUTPUT) |
| public class V1_0 extends ModelDataService { |
| @@ -44,19 +44,18 @@ |
| public static final String MPI = "mpirun"; |
| |
| // in case the exe path needs adjustment. |
| - String wrf_hydro = Config.getString("wrf_hydro_exe", "/usr/local/tomcat/WRF/wrf_hydro_NoahMP.exe"); |
| + static String wrf_hydro = Config.getString("wrf_hydro_exe", |
| + "/usr/local/tomcat/WRF/wrf_hydro_NoahMP.exe"); |
| |
| |
| @Override |
| protected void doProcess() throws Exception { |
| |
| // allow for num cores configuration |
| - int threads = Config.getInt("mpi.cores", 2); |
| - threads = metainfo().getInt("mpi.cores", threads); |
| + int threads = Config.getInt("mpirun.np", 2); |
| + threads = metainfo().getInt("mpirun.np", threads); |
| |
| - |
| - File exe = new File(wrf_hydro); |
| - if (!exe.exists()) { |
| + if (!new File(wrf_hydro).exists()) { |
| throw new ServiceException("Not found: " + wrf_hydro.toString()); |
| } |
| |