From ddee792c3e8991a72990dbb485bde26bdb968c93 Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期三, 14 五月 2025 14:07:42 +0800
Subject: [PATCH] 升级求解器至2.0
---
src/main/java/com/se/nsl/service/ResolveService.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index 73b1841..e7115d5 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -138,7 +138,7 @@
/**
* 鍒濆鍖栧弬鏁�
*/
- private void initArgs(SimuData data) throws IOException {
+ public void initArgs(SimuData data) throws IOException {
String inPath = config.getInPath() + File.separator + data.getInPath();
createDir(inPath);
createDir(inPath + File.separator + "depth");
@@ -147,7 +147,7 @@
// 涓存椂澶嶅埗楂樼▼tif锛屼互鍚庨渶瑕佽嚜琛屽垏鍓�
File uwBat = new File(config.getUwSolverBat());
- String sourceTif = uwBat.getParent() + File.separator + "data" + File.separator + "Hillzone.tif";
+ String sourceTif = uwBat.getParent() + File.separator + "case1" + File.separator + "LiuLiMiaoZhen_5m_f32.tif";
String targetTif = inPath + File.separator + config.getDemFile();
Files.copy(Paths.get(sourceTif), Paths.get(targetTif), StandardCopyOption.REPLACE_EXISTING);
}
@@ -160,7 +160,7 @@
f.mkdirs();
}
- private void createRainfallFile(Simu simu, SimuData data) throws Exception {
+ public void createRainfallFile(Simu simu, SimuData data) throws Exception {
List<Rainfall> rainfalls = data.getRainfalls();
if (null == rainfalls || rainfalls.size() < 2) createRainfall(simu);
@@ -218,7 +218,7 @@
/**
* 璋冪敤UWSolver
*/
- private String callUwSolver(SimuData data) throws Exception {
+ public String callUwSolver(SimuData data) throws Exception {
File uwBat = new File(config.getUwSolverBat());
int duration = 3600 * data.getDuration(); // 绉掓暟
@@ -227,16 +227,17 @@
}
String inPath = config.getInPath() + File.separator + data.getInPath();
- String terrainFile = (inPath + File.separator + config.getDemFile()).replace("\\", "/");
- String rainfallFile = (inPath + File.separator + "rainfall.dat").replace("\\", "/");
- ConfigVo vo = new ConfigVo(duration, config.getSaveFrames(), terrainFile, terrainFile, terrainFile, rainfallFile);
+ String terrainFile = (inPath + File.separator + config.getDemFile());
+ String rainfallFile = (inPath + File.separator + "rainfall.dat");
+ String saveName = inPath + File.separator + "result.zarr";
+ ConfigVo vo = new ConfigVo(terrainFile, terrainFile, terrainFile, rainfallFile, saveName, duration, config.getSaveFrames());
String configFile = config.getInPath() + File.separator + data.getInPath() + File.separator + data.getInPath() + ".json";
ComHelper.writeJson(configFile, JSON.toJSONString(vo));
String cmd = String.format("%s %s", config.getUwSolverBat(), configFile);
- return callBat(cmd);
+ return callBat2(cmd);
}
/**
--
Gitblit v1.9.3