升级求解器至2.0

wuww

2025-05-14 ddee792c3e8991a72990dbb485bde26bdb968c93

 src/main/java/com/se/nsl/domain/vo/ConfigVo.java

@@ -14,53 +14,49 @@

    private Integer kSt;

    private Integer initial_depth;

    private Integer initial_xmomentum;

    private Integer initial_ymomentum;

    private String raingage;

    private String infiltration;

    private Integer duration;

    private Boolean save_state;

    private List<String> save_variables;

    private Integer save_interval;

    private Integer save_frames;

    private Integer save_start;

    private Double dt;

    private Boolean variable_dt;

    private ResultVo result;

    public ConfigVo() {
        terrain = new ArrayList<Object>(Arrays.asList("Data/Hillzone.tif", 1));
        landuse = new ArrayList<Object>(Arrays.asList("Data/landuse.tif", 1));
        station = new ArrayList<Object>(Arrays.asList("Data/station.tif", 1));
        kSt = 40;
        raingage = "Data/beijing.dat";
        infiltration = "Data/landuse_to_infiltration.dat";
        duration = 3600 * 24;
        save_state = true;
        save_variables = new ArrayList<>(Arrays.asList("depth"));
        save_interval = 60;
        save_frames = 60;
        save_start = 0;
        dt = 0.1;
        variable_dt = true;
        this.terrain = new ArrayList<Object>(Arrays.asList("case1/LiuLiMiaoZhen_5m_f32.tif", 1));
        // 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.kSt = 40;
        this.initial_depth = 0;
        this.initial_xmomentum = 0;
        this.initial_ymomentum = 0;
        this.infiltration = "case1/landuse_to_infiltration.dat";
        this.dt = 0.1;
        this.variable_dt = true;
    }

    public ConfigVo(int duration, int frames, String terrain, String landuse, String station, String raingage) {
    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.duration = duration;
        this.save_frames = frames;
        this.save_interval = this.duration / frames;
        this.terrain.set(0, terrain); // 地形高程数据
        this.landuse.set(0, landuse); // 土地利用类型
        this.station.set(0, station); // 雨量站索引
        this.raingage = raingage;

        this.result = new ResultVo(saveName, duration, frames);
    }

    public List<Object> getTerrain() {
@@ -95,6 +91,30 @@
        this.kSt = kSt;
    }

    public Integer getInitial_depth() {
        return initial_depth;
    }

    public void setInitial_depth(Integer initial_depth) {
        this.initial_depth = initial_depth;
    }

    public Integer getInitial_xmomentum() {
        return initial_xmomentum;
    }

    public void setInitial_xmomentum(Integer initial_xmomentum) {
        this.initial_xmomentum = initial_xmomentum;
    }

    public Integer getInitial_ymomentum() {
        return initial_ymomentum;
    }

    public void setInitial_ymomentum(Integer initial_ymomentum) {
        this.initial_ymomentum = initial_ymomentum;
    }

    public String getRaingage() {
        return raingage;
    }
@@ -119,46 +139,6 @@
        this.duration = duration;
    }

    public Boolean getSave_state() {
        return save_state;
    }

    public void setSave_state(Boolean save_state) {
        this.save_state = save_state;
    }

    public List<String> getSave_variables() {
        return save_variables;
    }

    public void setSave_variables(List<String> save_variables) {
        this.save_variables = save_variables;
    }

    public Integer getSave_interval() {
        return save_interval;
    }

    public void setSave_interval(Integer save_interval) {
        this.save_interval = save_interval;
    }

    public Integer getSave_frames() {
        return save_frames;
    }

    public void setSave_frames(Integer save_frames) {
        this.save_frames = save_frames;
    }

    public Integer getSave_start() {
        return save_start;
    }

    public void setSave_start(Integer save_start) {
        this.save_start = save_start;
    }

    public Double getDt() {
        return dt;
    }
@@ -174,4 +154,12 @@
    public void setVariable_dt(Boolean variable_dt) {
        this.variable_dt = variable_dt;
    }

    public ResultVo getResult() {
        return result;
    }

    public void setResult(ResultVo result) {
        this.result = result;
    }
}