From 9490957edfc694a0378ee52af47e921b8ac44e7a Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期二, 04 六月 2024 09:12:11 +0800
Subject: [PATCH] 冲突
---
Hydraulic/Hydro.CommonBase/Helper/CalcExt.cs | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/Hydraulic/Hydro.CommonBase/Helper/CalcExt.cs b/Hydraulic/Hydro.CommonBase/Helper/CalcExt.cs
index 2cf435d..ccb0c58 100644
--- a/Hydraulic/Hydro.CommonBase/Helper/CalcExt.cs
+++ b/Hydraulic/Hydro.CommonBase/Helper/CalcExt.cs
@@ -38,10 +38,7 @@
/// </summary>
public int MaxThread { get; set; } = 4;
- /// <summary>
- /// 澶氭椂鍒�
- /// </summary>
- public int MultiTimes { get; set; } = 0;
+
/// <summary>
/// 鏄惁鍙樉绀烘渶浼樿В
@@ -167,15 +164,32 @@
///// </summary>
//public int[] ChildSolutionsThread = new int[0];
+
+ /// <summary>
+ /// 妯″瀷鐨勮绠楁椂鍒伙紝-1鍒欒绠楄妯″瀷鐨勬墍鏈夋椂鍒伙紝n鍒欒〃绀鸿绠楄妯″瀷鐨勭n涓椂鍒伙紙n>=0锛夛紱
+ /// 鏈�缁堜細鐢熸垚褰卞搷TimeStep鍜孴imeDuration鐨勫�硷紝浠庤�屽喅瀹歅eriodCount鐨勫�硷紝瀹為檯鐢熸晥鐨勪负PeriodCount
+ /// </summary>
+ public int MultiTimes { get; set; } = 0;
+ public int EPAPeriodCount { get; set; }
+
+
+ /// <summary>
+ /// 绋嬪簭璁＄畻鐨勬闀匡紝鍗曚綅鏄垎閽�
+ /// </summary>
public int TimeStep;
-
+ /// <summary>
+ /// 绋嬪簭璁＄畻鐨勬�绘椂闀匡紝鍗曚綅鏄垎閽�
+ /// </summary>
public int TimeDuration;
-
+ /// <summary>
+ /// 绋嬪簭鐨勯樁娈垫暟锛屽嵆绋嬪簭璁＄畻鐨勬�绘椂闀�/绋嬪簭璁＄畻鐨勬闀�
+ /// </summary>
public int PeriodCount;
-
- //public string SolutionSaveName;
-
-
+ /// <summary>
+ /// 寮�濮嬬殑鏃堕棿锛屼富瑕佺敤鏉ユ樉绀猴紝鍗曚綅鏄垎閽�
+ /// </summary>
+ public int TimeStart { get; set; }
+ public string[] Branchs { get; set; }
}
//public class Solution
--
Gitblit v1.9.3