From 35d1a18c3936bdd2e7640cd37360d6eff8925e39 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期五, 30 五月 2025 10:24:19 +0800
Subject: [PATCH] 升级求解器版本到2.1.1
---
src/main/java/com/se/nsl/service/ResolveService.java | 8 ++-
src/main/resources/application-dev.yml | 16 +++----
src/main/java/com/se/nsl/domain/vo/ConfigVo.java | 45 +++++++++++-----------
3 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/se/nsl/domain/vo/ConfigVo.java b/src/main/java/com/se/nsl/domain/vo/ConfigVo.java
index 9a4e4ae..a783741 100644
--- a/src/main/java/com/se/nsl/domain/vo/ConfigVo.java
+++ b/src/main/java/com/se/nsl/domain/vo/ConfigVo.java
@@ -1,16 +1,15 @@
package com.se.nsl.domain.vo;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@SuppressWarnings("ALL")
public class ConfigVo {
- private List<Object> terrain;
+ private String terrain;
- private List<Object> landuse;
+ private String landuse;
- private List<Object> station;
+ private int station;
private Integer kSt;
@@ -20,7 +19,7 @@
private Integer initial_ymomentum;
- private String raingage;
+ private List<String> raingage;
private String infiltration;
@@ -33,11 +32,11 @@
private ResultVo result;
public ConfigVo() {
- this.terrain = new ArrayList<Object>(Arrays.asList("case1/LiuLiMiaoZhen_5m_f32.tif", 1));
+// this.terrain = new ArrayList<Object>(Arrays.asList("case1/LiuLiMiaoZhen_5m_f32.tif"));
// 1-Cropland,2-Forest,3-Shrub,4-Grassland,5-Water,6-Snow/Ice,7-Barren,8-Impervious,9-Wetland
- this.landuse = new ArrayList<Object>(Arrays.asList("case1/LiuLiMiaoZhen_5m_landuse_grassland.tif", 1));
- this.station = new ArrayList<Object>(Arrays.asList("case1/LiuLiMiaoZhen_5m_station.tif", 1));
-
+// this.landuse = new ArrayList<Object>(Arrays.asList("case1/LiuLiMiaoZhen_5m_landuse_grassland.tif"));
+// this.station = new ArrayList<Object>(Arrays.asList("case1/LiuLiMiaoZhen_5m_station.tif", 1));
+ this.station = 0;
this.kSt = 40;
this.initial_depth = 0;
this.initial_xmomentum = 0;
@@ -50,37 +49,39 @@
public ConfigVo(String terrain, String landuse, String station, String raingage, String saveName, int duration, int frames) {
this();
- this.terrain.set(0, terrain.replace("\\", "/")); // 鍦板舰楂樼▼鏁版嵁
- this.landuse.set(0, landuse.replace("\\", "/")); // 鍦熷湴鍒╃敤绫诲瀷
- this.station.set(0, station.replace("\\", "/")); // 闆ㄩ噺绔欑储寮�
- this.raingage = raingage.replace("\\", "/");
+// this.terrain.set(0, terrain.replace("\\", "/")); // 鍦板舰楂樼▼鏁版嵁
+// this.landuse.set(0, landuse.replace("\\", "/")); // 鍦熷湴鍒╃敤绫诲瀷
+// this.station.set(0, station.replace("\\", "/")); // 闆ㄩ噺绔欑储寮�
+// this.raingage = raingage.replace("\\", "/");
+ this.terrain = terrain;
+ this.landuse = landuse;
+ this.raingage = Arrays.asList(raingage, "mm/min");
this.duration = duration;
-
int saveInterval = duration / frames - 5; // 淇鏈�鍚庝竴甯у彲鑳戒负绌烘暟鎹�
this.result = new ResultVo(saveName, frames, saveInterval);
}
- public List<Object> getTerrain() {
+ public String getTerrain() {
return terrain;
}
- public void setTerrain(List<Object> terrain) {
+ public void setTerrain(String terrain) {
this.terrain = terrain;
}
- public List<Object> getLanduse() {
+ public String getLanduse() {
return landuse;
}
- public void setLanduse(List<Object> landuse) {
+ public void setLanduse(String landuse) {
this.landuse = landuse;
}
- public List<Object> getStation() {
+ public int getStation() {
return station;
}
- public void setStation(List<Object> station) {
+ public void setStation(int station) {
this.station = station;
}
@@ -116,11 +117,11 @@
this.initial_ymomentum = initial_ymomentum;
}
- public String getRaingage() {
+ public List<String> getRaingage() {
return raingage;
}
- public void setRaingage(String raingage) {
+ public void setRaingage(List<String> raingage) {
this.raingage = raingage;
}
diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index 475cd87..5edd663 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -131,6 +131,7 @@
createNsl(data);
update(simu, 10, "瀹屾垚");
+ log.info("妯℃嫙瀹屾垚");
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
update(simu, 20, ex.getMessage());
@@ -293,7 +294,7 @@
}
//list.add(prefix + YYYYMDHM.format(rainfalls.get(c).getTime()) + getMinVal(rainfalls.get(c).getIntensity() / unit, DIGIT));
list.add(String.format("%s%s%f", prefix, YYYYMDHM.format(rainfalls.get(c).getTime()), getMinVal(rainfalls.get(c).getIntensity() / unit, DIGIT)));
- list.add(0, "1 " + (list.size() - 1));
+// list.add(0, "1 " + (list.size() - 1));
Files.write(Paths.get(rainfallFile), list, StandardCharsets.UTF_8);
}
@@ -387,8 +388,9 @@
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), "GBK"))) {
String line;
while ((line = reader.readLine()) != null) {
- System.out.println(line);
+// System.out.println(line);
//sb.append(line);
+ log.info(line);
}
}
@@ -539,7 +541,7 @@
cal.add(Calendar.MINUTE, 1);
}
- list.add(0, "1 " + (list.size() - 1));
+// list.add(0, "1 " + (list.size() - 1));
Files.write(Paths.get(dat), list, StandardCharsets.UTF_8);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 955b14b..3eafa1d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -141,18 +141,16 @@
flowUnits: CMS
solverBat: D:\other\simu\uwsolver\run_solver.bat
sww2tifBat: D:\other\simu\uwsolver\sww2tif.bat
- uwSolverBat: D:\other\simu\CudaUWSolver-2.0\start.bat
-# uwSolverBat: D:\other\simu\CudaUWSolver.Demo.NoVis.20250430\start.bat
+ uwSolverBat: D:\other\simu\CudaUWSolver-2.1.1\cuws.bat
+# uwSolverBat: D:\other\simu\CudaUWSolver-2.0\start.bat
zarr2tifBat: D:\other\simu\zarr2tif-2.1\start.bat
-# zarr2tifBat: D:\other\simu\zarr2tif1.0\start.bat
-# zarr2tifBat: D:\other\simu\zarr2tif-2.0-mkl\start.bat
createRainfall: '"C:\Program Files\Python310\python.exe" D:\terrait\NslServer\data\CreatRainfall.py'
rainfallTitle: Station Longitude Latitude Year Month Day Hour Minute Intensity
rainfallSite: beijing
epsg: 4548
- saveFrames: 3
+# saveFrames: 3
#鐢熸垚甯ф暟鐨勯棿闅旀椂闂达紝鍗曚綅鏄垎閽燂紝璁剧疆涓�5琛ㄧず姣忛殧5鍒嗛挓鐢熸垚涓�甯�
- saveFrameInterval: 5
+ saveFrameInterval: 10
# 鍦熷湴鍒╃敤锛�1-Cropland,2-Forest,3-Shrub,4-Grassland,5-Water,6-Snow/Ice,7-Barren,8-Impervious,9-Wetland
landuse: 2
#sizes: 64,128,256,512,1024,2048,4096
@@ -165,10 +163,10 @@
waterPath: depth
flowPath: velocity
landuseFile: Landuse.tif
- sourceDem: D:\other\simu\CudaUWSolver-2.0\Beijing-Data-10m\Beijing-4548-ASTERDEMV3-10m.tif
- sourceLanduse: D:\other\simu\CudaUWSolver-2.0\Beijing-Data-10m\Beijing-4548-Landuse-10m-Nonodata.tif
+ sourceDem: D:\other\simu\CudaUWSolver-2.1.1\Beijing-Data-10m\Beijing-4548-ASTERDEMV3-10m.tif
+ sourceLanduse: D:\other\simu\CudaUWSolver-2.1.1\Beijing-Data-10m\Beijing-4548-Landuse-10m-Nonodata.tif
copyTif: false
tifPath: D:\other\simu\uwsolver\5ca43c87cd8e48c5a9c5399a5da46dbc\tongzhou_raster_4548_1m_clip_river_fill.tif
#tif涓殑楂樼▼鏂囦欢鍚嶈鍚湁dem锛屽湡鍦板埄鐢ㄨ鍚湁landuse锛岀珯鐐硅鍚湁station锛屼笉闄愬埗澶у皬鍐欙紝鏂囧瓧灏介噺鐢ㄨ嫳鏂囧瓧姣嶈〃杈�
- keyDitch: D:\other\simu\CudaUWSolver-2.0\KeyDitch
+ keyDitch: D:\other\simu\CudaUWSolver-2.1.1\KeyDitch
--
Gitblit v1.9.3