From e0279fe6db39d1071ef04ad0080b887cb6a0d335 Mon Sep 17 00:00:00 2001
From: lx <ex_lixiang17@cosl.com.cn>
Date: 星期一, 04 八月 2025 17:27:47 +0800
Subject: [PATCH] upload
---
ErrorAnalysis.Service/PDEVCalcService.cs | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ErrorAnalysis.Service/PDEVCalcService.cs b/ErrorAnalysis.Service/PDEVCalcService.cs
index d16210c..ccfc05f 100644
--- a/ErrorAnalysis.Service/PDEVCalcService.cs
+++ b/ErrorAnalysis.Service/PDEVCalcService.cs
@@ -8,15 +8,13 @@
{
public class PDEVCalcService
{
- public static double GetMergePDEV(string connectionString, string modelId, double porosity, double sw, double speed)
+ public static double GetMergePDEV(string modelId, double porosity, double sw, double speed, double depth)
{
- var farC = COMergeCalcService.GetFarMergeCResult(connectionString, modelId, porosity);
- var farO = COMergeCalcService.GetFarMergeOResult(connectionString, modelId, porosity);
- var farPDEV = CalcPDEV(farC, farO);
+ var farResult = COMergeCalcService.GetFarMergeCOResult(modelId, porosity, sw, speed, depth);
+ var farPDEV = CalcPDEV(farResult.Item1, farResult.Item2);
- var nearC = COMergeCalcService.GetNearMergeCResult(connectionString, modelId, porosity);
- var nearO = COMergeCalcService.GetNearMergeOResult(connectionString, modelId, porosity);
- var nearPDEV = CalcPDEV(nearC, nearO);
+ var nearResult = COMergeCalcService.GetNearMergeCOResult(modelId, porosity, sw, speed, depth);
+ var nearPDEV = CalcPDEV(nearResult.Item1, nearResult.Item2);
return nearPDEV * 0.65 + farPDEV * 0.35;
}
--
Gitblit v1.9.3