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/COMergeCalcService.cs | 134 ++++++++++++++++++++++++++------------------
1 files changed, 78 insertions(+), 56 deletions(-)
diff --git a/ErrorAnalysis.Service/COMergeCalcService.cs b/ErrorAnalysis.Service/COMergeCalcService.cs
index 7dd3fe1..08c53d8 100644
--- a/ErrorAnalysis.Service/COMergeCalcService.cs
+++ b/ErrorAnalysis.Service/COMergeCalcService.cs
@@ -22,52 +22,78 @@
const int _oWinStartIndex = (int)(4.88 / _gg + _offset); // org
const int _oWinEndIndex = (int)(6.36 / _gg + _offset); // width = 6.36-4.88=1.48
- private static double GetFarInterplolateResult(string modelId, double porosity, double sw, int readSw, double speed, double depth)
- {
- double result = 0;
- var cResult = RepositoryInstance.Instance.COFarResultRepository?.GetCOFarResult(modelId, (int)porosity, readSw);
- if (cResult == null)
- throw new InvalidDataException("COFarResult not found");
- var cArr = cResult.InelasticSpec?.Split(',').Select(v => Convert.ToDouble(v)).ToArray();
- if (cArr == null)
- throw new InvalidDataException("COFarResult InelasticSpec is null");
+ const double _coef = 1e8 * 2.54 * 2.54 * 4 * 6 * 2 * 11 * 77 * 0.2 / 0.6;
- var length = readSw == 0 ? _cWinEndIndex - _cWinStartIndex + 1 : _oWinEndIndex - _oWinStartIndex + 1;
- var originC = cArr.Skip(readSw == 0 ? _cWinStartIndex : _oWinStartIndex).Take(length).Sum();
- var coef = originC * 1e8 * 2.54 * 2.54 * 4 * 6 * 2 * 11 * 77 * 0.2 / 0.6 / speed * depth * 0.07;
- result = coef;
- if (sw > 0 && sw < 100)
+ private static (double, double) GetFarInterplolateResult(string modelId, double porosity, double sw, double speed, double depth)
+ {
+ var cWinLength = _cWinEndIndex - _cWinStartIndex + 1;
+ var oWinLength = _oWinEndIndex - _oWinStartIndex + 1;
+ var oilLine = RepositoryInstance.Instance.COFarResultRepository?.GetCOFarResult(modelId, (int)porosity, 0);
+ var waterLine = RepositoryInstance.Instance.COFarResultRepository?.GetCOFarResult(modelId, (int)porosity, 100);
+ if (oilLine == null || waterLine == null)
+ throw new InvalidDataException("COFarResult Line is null");
+ var oilLineValArr = oilLine.InelasticSpec.Split(',').Select(v => Convert.ToDouble(v)).ToArray();
+ var waterLineValArr = waterLine.InelasticSpec.Split(',').Select(v => Convert.ToDouble(v)).ToArray();
+
+ var oilLineC = oilLineValArr.Skip(_cWinStartIndex).Take(cWinLength).Sum() * _coef / speed * depth * 0.07;
+ var oilLineO = oilLineValArr.Skip(_oWinStartIndex).Take(oWinLength).Sum() * _coef / speed * depth * 0.07;
+
+ var waterLineC = waterLineValArr.Skip(_cWinStartIndex).Take(cWinLength).Sum() * _coef / speed * depth * 0.07;
+ var waterLineO = waterLineValArr.Skip(_oWinStartIndex).Take(oWinLength).Sum() * _coef / speed * depth * 0.07;
+
+ double cRes = 0, oRes = 0;
+ if (sw == 0)
{
- if (readSw == 0)
- result = Utility.Interpolate(sw, 100, 0, 0, coef);
- else
- result = Utility.Interpolate(sw, 0, 0, 100, coef);
+ cRes = waterLineC;
+ oRes = waterLineO;
}
- return result;
+ else if (sw == 100)
+ {
+ cRes = waterLineC;
+ oRes = waterLineO;
+ }
+ else if (sw > 0 && sw < 100)
+ {
+ cRes = Utility.Interpolate(sw, 100, waterLineC, 0, oilLineC);
+ oRes = Utility.Interpolate(sw, 0, oilLineO, 100, waterLineO);
+ }
+ return (cRes, oRes);
}
- private static double GetNearInterplolateResult(string modelId, double porosity, double sw, int readSw, double speed, double depth)
+ private static (double, double) GetNearInterplolateResult(string modelId, double porosity, double sw, double speed, double depth)
{
- double result = 0;
- var cResult = RepositoryInstance.Instance.CONearResultRepository?.GetCONearResult(modelId, (int)porosity, readSw);
- if (cResult == null)
- throw new InvalidDataException("CONearResult not found");
- var cArr = cResult.InelasticSpec?.Split(',').Select(v => Convert.ToDouble(v)).ToArray();
- if (cArr == null)
- throw new InvalidDataException("CONearResult InelasticSpec is null");
+ var cWinLength = _cWinEndIndex - _cWinStartIndex + 1;
+ var oWinLength = _oWinEndIndex - _oWinStartIndex + 1;
+ var oilLine = RepositoryInstance.Instance.CONearResultRepository?.GetCONearResult(modelId, (int)porosity, 0);
+ var waterLine = RepositoryInstance.Instance.CONearResultRepository?.GetCONearResult(modelId, (int)porosity, 100);
+ if (oilLine == null || waterLine == null)
+ throw new InvalidDataException("COFarResult Line is null");
+ var oilLineValArr = oilLine.InelasticSpec.Split(',').Select(v => Convert.ToDouble(v)).ToArray();
+ var waterLineValArr = waterLine.InelasticSpec.Split(',').Select(v => Convert.ToDouble(v)).ToArray();
- var length = readSw == 0 ? _cWinEndIndex - _cWinStartIndex + 1 : _oWinEndIndex - _oWinStartIndex + 1;
- var originC = cArr.Skip(readSw == 0 ? _cWinStartIndex : _oWinStartIndex).Take(length).Sum();
- var coef = originC * 1e8 * 2.54 * 2.54 * 2 * 6 * 11 * 2 * 77 * 0.2 / 0.6 / speed * depth * 0.07;
- result = coef;
- if (sw > 0 && sw < 100)
+ var oilLineC = oilLineValArr.Skip(_cWinStartIndex).Take(cWinLength).Sum() * _coef / speed * depth * 0.07;
+ var oilLineO = oilLineValArr.Skip(_oWinStartIndex).Take(oWinLength).Sum() * _coef / speed * depth * 0.07;
+
+ var waterLineC = waterLineValArr.Skip(_cWinStartIndex).Take(cWinLength).Sum() * _coef / speed * depth * 0.07;
+ var waterLineO = waterLineValArr.Skip(_oWinStartIndex).Take(oWinLength).Sum() * _coef / speed * depth * 0.07;
+
+ double cRes = 0, oRes = 0;
+ if (sw == 0)
{
- if (readSw == 0)
- result = Utility.Interpolate(sw, 100, 0, 0, coef);
- else
- result = Utility.Interpolate(sw, 0, 0, 100, coef);
+ cRes = waterLineC;
+ oRes = waterLineO;
}
- return result;
+ else if (sw == 100)
+ {
+ cRes = waterLineC;
+ oRes = waterLineO;
+ }
+ else if (sw > 0 && sw < 100)
+ {
+ cRes = Utility.Interpolate(sw, 100, waterLineC, 0, oilLineC);
+ oRes = Utility.Interpolate(sw, 0, oilLineO, 100, waterLineO);
+ }
+ return (cRes, oRes);
}
/// <summary>
@@ -80,30 +106,28 @@
/// <param name="readSw">璇诲彇鍚按楗卞拰搴︼紙0涓虹⒊锛�100涓烘哀锛�</param>
/// <param name="speed">娴嬮��</param>
/// <param name="depth">娣卞害</param>
- /// <returns>纰虫垨姘у��</returns>
+ /// <returns>纰冲拰姘у��</returns>
/// <exception cref="InvalidDataException">瀛旈殭搴﹁秴杩囪寖鍥�</exception>
- public static double GetFarMergeCOResult(string modelId, double porosity, double sw, int readSw, double speed, double depth)
+ public static (double, double) GetFarMergeCOResult(string modelId, double porosity, double sw, double speed, double depth)
{
if (porosity > 40)
throw new InvalidDataException("Porosity value out of range!");
- double result = 0;
+ (double, double) result = (0, 0);
if (porosity % 5 == 0)
{
- result = GetFarInterplolateResult(modelId, porosity, sw, readSw, speed, depth);
+ result = GetFarInterplolateResult(modelId, porosity, sw, speed, depth);
}
else
{
- double ceilingResult = 0;
var ceilingPorosity = Math.Ceiling(porosity / 5) * 5;
- ceilingResult = GetFarInterplolateResult(modelId, ceilingPorosity, sw, readSw, speed, depth);
+ var ceilingResult = GetFarInterplolateResult(modelId, ceilingPorosity, sw, speed, depth);
-
- double floorResult = 0;
var floorPorosity = Math.Floor(porosity / 5) * 5;
- floorResult = GetFarInterplolateResult(modelId, floorPorosity, sw, readSw, speed, depth);
+ var floorResult = GetFarInterplolateResult(modelId, floorPorosity, sw, speed, depth);
- result = Utility.Interpolate(porosity, floorPorosity, floorResult, ceilingPorosity, ceilingResult);
+ result.Item1 = Utility.Interpolate(porosity, floorPorosity, floorResult.Item1, ceilingPorosity, ceilingResult.Item1);
+ result.Item2 = Utility.Interpolate(porosity, floorPorosity, floorResult.Item2, ceilingPorosity, ceilingResult.Item2);
}
return result;
}
@@ -120,28 +144,26 @@
/// <param name="depth">娣卞害</param>
/// <returns>纰虫垨姘у��</returns>
/// <exception cref="InvalidDataException">瀛旈殭搴﹁秴杩囪寖鍥�</exception>
- public static double GetNearMergeCOResult(string modelId, double porosity, double sw, int readSw, double speed, double depth)
+ public static (double, double) GetNearMergeCOResult(string modelId, double porosity, double sw, double speed, double depth)
{
if (porosity > 40)
throw new InvalidDataException("Porosity value out of range!");
- double result = 0;
+ (double, double) result = (0, 0);
if (porosity % 5 == 0)
{
- result = GetNearInterplolateResult(modelId, porosity, sw, readSw, speed, depth);
+ result = GetNearInterplolateResult(modelId, porosity, sw, speed, depth);
}
else
{
- double ceilingResult = 0;
var ceilingPorosity = Math.Ceiling(porosity / 5) * 5;
- ceilingResult = GetNearInterplolateResult(modelId, ceilingPorosity, sw, readSw, speed, depth);
+ var ceilingResult = GetNearInterplolateResult(modelId, ceilingPorosity, sw, speed, depth);
-
- double floorResult = 0;
var floorPorosity = Math.Floor(porosity / 5) * 5;
- floorResult = GetNearInterplolateResult(modelId, floorPorosity, sw, readSw, speed, depth);
+ var floorResult = GetNearInterplolateResult(modelId, floorPorosity, sw, speed, depth);
- result = Utility.Interpolate(porosity, floorPorosity, floorResult, ceilingPorosity, ceilingResult);
+ result.Item1 = Utility.Interpolate(porosity, floorPorosity, floorResult.Item1, ceilingPorosity, ceilingResult.Item1);
+ result.Item2 = Utility.Interpolate(porosity, floorPorosity, floorResult.Item2, ceilingPorosity, ceilingResult.Item2);
}
return result;
}
--
Gitblit v1.9.3