From 0b108f56b2d0c35d01ee361dc593119ac52a14e1 Mon Sep 17 00:00:00 2001
From: lx <ex_lixiang17@cosl.com.cn>
Date: 星期五, 05 九月 2025 16:39:13 +0800
Subject: [PATCH] update
---
ErrorAnalysis.Service/PDEVCalcService.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ErrorAnalysis.Service/PDEVCalcService.cs b/ErrorAnalysis.Service/PDEVCalcService.cs
index ccfc05f..1bb718f 100644
--- a/ErrorAnalysis.Service/PDEVCalcService.cs
+++ b/ErrorAnalysis.Service/PDEVCalcService.cs
@@ -8,17 +8,19 @@
{
public class PDEVCalcService
{
- public static double GetMergePDEV(string modelId, double porosity, double sw, double speed, double depth)
+ //搴熷純
+ public static double GetMergePDEV(string modelId, double porosity, double sw, double speed, double depth, double yieldCounting, double nearCofe, double farCofe)
{
- var farResult = COMergeCalcService.GetFarMergeCOResult(modelId, porosity, sw, speed, depth);
+ var farResult = COMergeCalcService.GetFarMergeCOResult(modelId, porosity, sw, speed, depth, yieldCounting);
var farPDEV = CalcPDEV(farResult.Item1, farResult.Item2);
- var nearResult = COMergeCalcService.GetNearMergeCOResult(modelId, porosity, sw, speed, depth);
+ var nearResult = COMergeCalcService.GetNearMergeCOResult(modelId, porosity, sw, speed, depth, yieldCounting);
var nearPDEV = CalcPDEV(nearResult.Item1, nearResult.Item2);
- return nearPDEV * 0.65 + farPDEV * 0.35;
+ return Math.Sqrt(Math.Pow(nearPDEV * nearCofe, 2) + Math.Pow(farPDEV * farCofe, 2));
}
- private static double CalcPDEV(double c, double o) => Math.Sqrt(Math.Pow(c / o, 2) * (1 / c + 1 / o));
+ //搴熷純
+ private static double CalcPDEV(double c, double o) => c / o * Math.Sqrt((1 / c + 1 / o));
}
}
--
Gitblit v1.9.3