From 4c4d0f591f94428ed7e5d2f4ae5df5c5087d8c26 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期三, 18 六月 2025 09:51:35 +0800
Subject: [PATCH] 求解器版本升级到2.2
---
src/main/java/com/se/nsl/domain/vo/ConfigVo.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 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 3118f11..bbf08e7 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 Object 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;
@@ -47,40 +46,44 @@
this.variable_dt = true;
}
- public ConfigVo(String terrain, String landuse, String station, String raingage, String saveName, int duration, int frames) {
+ public ConfigVo(String terrain, String landuse, String station,
+ String raingage, String saveName, int duration,
+ int frames, String saveMode, String startTime) {
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);
+ this.result = new ResultVo(saveName, frames, saveInterval, saveMode, startTime);
}
- 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 Object getStation() {
return station;
}
- public void setStation(List<Object> station) {
+ public void setStation(Object station) {
this.station = station;
}
@@ -116,11 +119,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;
}
--
Gitblit v1.9.3