From 62aecf38e35a8a7fe14a4c8167441ae785cd6681 Mon Sep 17 00:00:00 2001
From: lx <ex_lixiang17@cosl.com.cn>
Date: 星期四, 17 七月 2025 17:36:34 +0800
Subject: [PATCH] upload
---
ErrorAnalysis.Service/PDEVCalcService.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ErrorAnalysis.Service/PDEVCalcService.cs b/ErrorAnalysis.Service/PDEVCalcService.cs
index a549385..8c3e548 100644
--- a/ErrorAnalysis.Service/PDEVCalcService.cs
+++ b/ErrorAnalysis.Service/PDEVCalcService.cs
@@ -8,14 +8,14 @@
{
public class PDEVCalcService
{
- public static double GetMergePDEV(string connectionString, string modelId, int porosity)
+ 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 farC = COMergeCalcService.GetFarMergeCOResult( modelId, porosity, sw, 0, speed, depth);
+ var farO = COMergeCalcService.GetFarMergeCOResult( modelId, porosity, sw, 100, speed, depth);
var farPDEV = CalcPDEV(farC, farO);
- var nearC = COMergeCalcService.GetNearMergeCResult(connectionString, modelId, porosity);
- var nearO = COMergeCalcService.GetNearMergeOResult(connectionString, modelId, porosity);
+ var nearC = COMergeCalcService.GetNearMergeCOResult( modelId, porosity, sw, 0, speed, depth);
+ var nearO = COMergeCalcService.GetNearMergeCOResult( modelId, porosity, sw, 100, speed, depth);
var nearPDEV = CalcPDEV(nearC, nearO);
return nearPDEV * 0.65 + farPDEV * 0.35;
--
Gitblit v1.9.3