update

lx

2025-07-11 05946b151e7010b2b1a851892152e6b5d34151b3

 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;