YXS
/
nmWTAI-Platform
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
221 Commits
24 Branches
0 Tags
71 MiB
feature/Adapt-Autofit-20260904
develop
feature/nmNum-postprocessing-view-20260910
feature/nmNum-multi-gauge-record
feature/pebi-result-snapshot-20260831
feature/grid-solver-workflow-20260827
feature/AutoFit-Optimize-20260826
feature/refactor-numerical-model-panel-20260824
feature/AutoFit-Optimize-20260821
feature/refactor-well-editor-20260821
feature/AutoFit-Benchmark-20260820
feature/Auotfit-20260817
feature/PebiSolver-Integration-20260818
feature/ReservoirPropertiesDlg-Refactoring-20260813
feature/MultiWellAutoFit-20260805
feature/Interpolation-20260803
feature/prepost-render-refactor
feature/Model-20260625
feature/nm-para-property-20260615
feature/Merge-Framework-20260721
feature/ModelOpt20260526
feature/UI-20260528
feature/DialogBox-20260526
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'acb39fe350'
${ noResults }
Commit Graph

58 Commits (acb39fe350e84c699cedbb08cb4c36447ffae086)

Author SHA1 Message Date
lh acb39fe350 feat(numerical): 实现 PEBI 结果快照原子提交 
- 在工作线程构建并校验完整结果快照候选
- 在主线程按输入版本、井 UUID 和槽位顺序一次发布
- 失败、取消、结果过期或内存不足时保留旧快照
- 通过弱引用兼容 nmDataWellBase 现有结果 getter
- 转移井曲线容器并隔离旧 UI 结果网格，降低复制和污染风险
- 保持自动拟合逻辑不变
 1 week ago
lh 1798c851a7 refactor(numerical): 移除建网场景临时文件导出 
- 删除场景二进制文件写入和模型文件名映射
- 避免建网前不必要的目录创建与磁盘读写
- 清理不再使用的 Qt 头文件
 2 weeks ago
lh 5427b97308 fix(numerical): 完善求解结果状态与窗口提示 
- 区分求解失败与输入变化导致的结果丢弃
- 根据结果窗口实际创建状态显示完成或失败提示
- 延迟首次结果页面填充及最终提示，避免 Qt 4.8 布局重入
- 补充相关中文翻译并更新 qm 文件
 2 weeks ago
lh 0e63dc2185 fix(Nm):修复手工求解建网混入默认演示井问题 
- 清空网格输入对象构造时自带的演示井
- 避免直接求解时生成额外井和异常网格
- 保持直接求解与独立建网的输入一致
 2 weeks ago
lh 69895a6717 perf(numerical): 降低复用网格求解的内存峰值 
- 复用缓存网格时直接将 DLL 输出复制到任务结果，移除中间局部副本
- 将 DLL 网格输出峰值由三套降低为两套
- 直接使用 GRID 构造模型输入，避免临时模型输入产生的完整网格复制
 2 weeks ago
lh cc7300668e feat(numerical): 优化网格生成与模型求解流程，增加进度与停止处理 
- 拆分求解输入准备、网格生成和模型求解流程，减少界面阻塞
- 增加计算进度提示和协作式停止处理
- 完善输入快照隔离、结果提交校验及窗口关闭时的任务清理
- 保持网格与求解 DLL 的串行互斥保护
- 优化后处理结果刷新并更新中文翻译
 2 weeks ago
lh d8af516478 Merge branch 'feature/refactor-numerical-model-panel-20260824' into develop 2 weeks ago
lvjunjie 51eaa263f1 调整渗透率约束范围，避免PSO算法无法开启代理模型 2 weeks ago
lvjunjie a0d3fc7c89 拟合后显示调用求解器总次数 2 weeks ago
lvjunjie 4a5500d927 增加日志翻译 2 weeks ago
lvjunjie d4756e0ba6 整理自动拟合部分PSO和LM两种算法 2 weeks ago
lvjunjie c210cd7b39 1.流量为空时，流量段数量设为 0，不会出现 -1 被转换成巨大数组长度的问题。 
2.计算误差时跳过目标曲线第一个点，修复公共时间轴端点的浮点误差
 3 weeks ago
lh 8b7f63f063 fix(nmNum): 修复求解完成后PEBI网格数量显示为0 
- 网格划分完成后、卸载DLL前保存getPEBInum返回值
- 求解完成弹框同时显示PEBI网格数量和求解耗时
- 更新中文翻译资源
 3 weeks ago
lvjunjie 0afcfaa6ca Merge branch 'feature/Auotfit-20260817' into develop 3 weeks ago
lvjunjie a551c3e283 1.生成不同算例的压力流量数据 2.压裂井的裂缝宽度从界面读取 3.油水两相导入流量传给qo，qg和qw使用等长零数组(临时) 3 weeks ago
lh d0ab4cd518 feat(nmNum): 集成PEBI CPU加速求解器配置 
- 新增求解器库、OpenMP线程数和ILU复用步数设置
- 支持求解器配置的工程保存与恢复
- 计算前将加速参数传递给PEBI求解器DLL
- 记录PEBI网格数量并在计算完成后显示求解耗时
- 更新CPU加速运行库和中文翻译资源
 3 weeks ago
lh 7204c54b07 Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop 
# Conflicts:
#	Bin/Config/Common/ModelParaDefinesNM_cn.dat   resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version
#	Bin/Config/Common/ModelParaDefinesNM_en.dat   resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version
#	Bin/Config/Common/UnitDefault_cn.dat   resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version
#	Bin/Config/Lang/cn/nmNum_cn.qm   resolved by develop version
#	Bin/XmlFiles/ModelParaDefinesNM_cn.xml
#	Bin/XmlFiles/ModelParaDefinesNM_en.xml
#	Src/nmNum/nmData/nmDataAutomaticFitting.cpp
#	Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp
 4 weeks ago
lvjunjie 1d5c0bfdb6 Merge branch 'feature/MultiWellAutoFit-20260805' into develop 
# Conflicts:
#	Bin/Config/Lang/cn/nmNum_cn.qm   resolved by feature/MultiWellAutoFit-20260805 version
 4 weeks ago
lvjunjie 924f6f4ee8 删除候选评价中的参数专属硬编码阈值。 4 weeks ago
lvjunjie 83a29152c9 调整局部收敛判定 4 weeks ago
lvjunjie e1a8610df4 曲线采样点数改为80 4 weeks ago
lh 8eebf98ba2 refactor(nmNum): 统一渗透率基准单位为 mD 
- 统一储层、诊断、自动拟合及属性插值的渗透率单位
- 调整渗透率默认值、拟合范围和参数配置
- 在 PEBI 求解器入口将 mD 转换为 D
- 移除储层参数面板对 D/d 单位歧义的特殊处理
 4 weeks ago
lvjunjie e73b5ab453 1.增加压裂井裂缝半长拟合参数 2.参数物理边界统一用框架中的 4 weeks ago
lvjunjie 50606d3564 自动拟合损失函数改用普通对数 RMSE 4 weeks ago
lvjunjie e8563506b9 增加压裂井导流能力 Dfc 自动拟合参数 4 weeks ago
lvjunjie efda31f388 优化自动拟合，引入灵敏度分析与信赖域求解 4 weeks ago
lvjunjie 6abd1913c7 修改损失函数，增加上下，左右，形状，早中晚误差诊断 1 month ago
lvjunjie 5539150b5b 1.自动拟合参数范围设置与校验 2.移除GA相关代码 1 month ago
lvjunjie d58d083981 接入网格属性插值求解流程 1 month ago
lvjunjie eb6ef39007 优化多井自动拟合求解流程 1 month ago
lvjunjie fde6316a37 完善网格属性插值结果预览功能 
- 封装Kriging插值接口并校验输入输出数据
- 支持独立窗口分级色带预览、边界裁剪和测点标签显示
 1 month ago
lvjunjie 34a82fe087 Merge branch 'feature/nm-para-property-20260615' into develop 
# Conflicts:
#	3rd/Pebi/include/pch.h
#	Bin/Config/Common/MenuDefines_Ribbon_cn.dat   resolved by feature/nm-para-property-20260615 version
#	Bin/Config/Common/ModelParaDefinesNM_cn.dat   resolved by feature/nm-para-property-20260615 version
#	Bin/Config/Common/ModelParaDefinesNM_en.dat   resolved by feature/nm-para-property-20260615 version
#	Src/nmNum/nmData/nmDataAnalyzeManager.cpp
#	Src/nmNum/nmPlot/nmGuiPlot.cpp
#	Src/nmNum/nmPlot/nmObjPointWell.cpp
 1 month ago
lvjunjie 705e2f11f8 Merge branch 'feature/Model-20260625' into develop 
# Conflicts:
#	3rd/Pebi/include/pch.h
 1 month ago
lvjunjie baa38e99e3 调整自动拟合参数并移除初始压力 1 month ago
lvjunjie 9ba0df411d 统一代理模型与相态场景路径 
- 按实验标签解析T1到T4融合模型和T5专用模型
- 移除C++硬编码路径和Python旧路径回退
- 仅保存按相态命名的scene文件，避免覆盖通用scene.bin
 1 month ago
lvjunjie 57b3d8f66c 优化代理筛选和模型路由 
- T1到T4使用融合模型，T5使用气井专用模型
- 常规每代真实求解比例下限由55%调整为45%
- 使用guide pbest改善被筛选粒子的移动方向
- 增加模型预热、初始解复用和求解等待优化
- 修正代理模式下的粒子停滞率统计
 1 month ago
lvjunjie bfbcfd2f3b 支持气井数据集拟压力转换 
- 接入当前气井的压力与拟压力转换表
- 仅在T5场景和数据集中保存转换表
- Runner将气井求解压力转换为拟压力后生成曲线
- 增加转换表完整性和单调性检查
 1 month ago
lvjunjie 5ef6a8d9c9 新增solverType参数，区分不同相态 2 months ago
lvjunjie c9750eeb63 移除ct参数 2 months ago
lvjunjie 8c90dffadd 分相态导出数据 2 months ago
lvjunjie c64dc6ce88 结果拟压力转换 2 months ago
lvjunjie fdf4a10f4c 调整误差计算方式 2 months ago
lvjunjie 00d5cfdca1 移除15代之后误差小于目标两倍就停止的逻辑 2 months ago
lvjunjie 1f0c44e270 更新求解器相关代码同步到develop 2 months ago
lvjunjie 11833dc5a1 调整生成数据集以及参数标准化 2 months ago
lvjunjie 955b2e19fe 删除自动拟合不需要的参数 2 months ago
1294271022 6c82c1a9b9 Merge branch 'feature/ModelOpt20260526' into develop 3 months ago
1294271022 e8387acd8b 1、训练域适配 3 months ago
1294271022 88b47c3359 1、移除时间条件模型 2、移除不确定性量化相关代码 3、移除160维slope 4、整理代码 3 months ago
lh aa1c498180 refactor: fillPvtInputByModel压力横坐标读取移入各分支，ConstPvt不依赖pPvt 
1. 移除顶部公共压力读取，各VariablePvt分支内部自行读取pPvt->getPressure()
2. ConstPvt分支完全不碰pPvt参数，职责更清晰
 3 months ago