YXS
/
nmWTAI-Platform
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
188 Commits
14 Branches
0 Tags
61 MiB
develop
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 'develop'
${ noResults }
Commit Graph

35 Commits (develop)

Author SHA1 Message Date
lh 8b7f63f063 fix(nmNum): 修复求解完成后PEBI网格数量显示为0 
- 网格划分完成后、卸载DLL前保存getPEBInum返回值
- 求解完成弹框同时显示PEBI网格数量和求解耗时
- 更新中文翻译资源
 11 hours ago
lh d0ab4cd518 feat(nmNum): 集成PEBI CPU加速求解器配置 
- 新增求解器库、OpenMP线程数和ILU复用步数设置
- 支持求解器配置的工程保存与恢复
- 计算前将加速参数传递给PEBI求解器DLL
- 记录PEBI网格数量并在计算完成后显示求解耗时
- 更新CPU加速运行库和中文翻译资源
 1 day ago
lh 7bbc44b7d5 chore(nmNum): 重新生成中文翻译资源、更新单位加密文件 2 days 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
 2 days ago
lvjunjie 76cc20ed14 恢复框架代码 2 days ago
lvjunjie 1d5c0bfdb6 Merge branch 'feature/MultiWellAutoFit-20260805' into develop 
# Conflicts:
#	Bin/Config/Lang/cn/nmNum_cn.qm   resolved by feature/MultiWellAutoFit-20260805 version
 2 days ago
lh dbe5ac328f feat(nmNum): 按求解模型优化储层参数编辑 
- 根据求解器模型动态显示 PVT、压缩系数和饱和度参数
- 隐藏储层类型和 KxKy，清理无效的单值参数定义
- 补充油水饱和度之和校验及关联错误提示
- 优化对话框初始高度和参数分组名称
- 更新中英文参数 XML 及中文翻译资源
 2 days ago
lh d847d428f5 refactor(nmNum): 优化复合区和区域标记参数布局及命名 5 days ago
lh 6b2009bf62 fix(nmNum): 修正压裂井型及井参数分组名称 5 days ago
lh c11454e4a7 fix(nmNum): 修复压裂井参数单位绑定 
- 将排水角度和裂缝角度单位统一为 deg
- 补充 mD.m 流动能力单位组
- 修复裂缝角度和导流能力数值显示为空的问题
 5 days ago
lvjunjie 83a29152c9 调整局部收敛判定 5 days ago
lh 226b942bbf refactor(nmNum): 优化储层参数对象切换布局 
- 使用原生分组框承载对象切换下拉框
- 统一对象显示标签并移除重复页面标题
- 保持原有切换、校验和提交逻辑不变
 5 days ago
lh 8eebf98ba2 refactor(nmNum): 统一渗透率基准单位为 mD 
- 统一储层、诊断、自动拟合及属性插值的渗透率单位
- 调整渗透率默认值、拟合范围和参数配置
- 在 PEBI 求解器入口将 mD 转换为 D
- 移除储层参数面板对 D/d 单位歧义的特殊处理
 5 days ago
lvjunjie e73b5ab453 1.增加压裂井裂缝半长拟合参数 2.参数物理边界统一用框架中的 5 days ago
lvjunjie e8563506b9 增加压裂井导流能力 Dfc 自动拟合参数 5 days ago
lh efc590edc6 feat(nmNum): 重构储层参数设置对话框 
- 新增模块化参数页面、字段目录和编辑会话
- 通过数据源注入实现工作副本及统一提交
- 支持单位换算、参数校验和分类联动
- 无对应对象时禁用分类按钮
- 统一渗透率基准单位为 D
 6 days ago
lh a4366fb711 Merge remote-tracking branch 'origin/feature/Interpolation-20260803' into develop 
# Conflicts:
#	Bin/Config/Lang/cn/nmNum_cn.qm   resolved by origin/feature/Interpolation-20260803(远端) version
#	Src/nmNum/nmSubWxs/nmWxParaPropertyPebi.cpp
 2 weeks ago
lvjunjie 5539150b5b 1.自动拟合参数范围设置与校验 2.移除GA相关代码 2 weeks ago
lvjunjie f0d90f9513 更改渗透率的基准单位为Darcy 2 weeks ago
lvjunjie 18fda630a7 完善网格属性插值交互与预览显示 2 weeks ago
lvjunjie 5548533fdf 更新属性插值菜单图标 2 weeks ago
lvjunjie ba63afa1a4 完善网格属性插值单位与求解配置界面 2 weeks ago
lh 9d823f4772 feat: 添加后处理井显示开关 
- 新增井名和井线显示开关
- 切换时同步更新现有井名和井线 Actor
- 补充中文翻译并更新 qm 文件
 2 weeks ago
lvjunjie fde6316a37 完善网格属性插值结果预览功能 
- 封装Kriging插值接口并校验输入输出数据
- 支持独立窗口分级色带预览、边界裁剪和测点标签显示
 2 weeks ago
lvjunjie 0e091ff593 完善网格属性插值测点管理功能 
- 支持多数据组创建、删除及插值参数保存读取
- 支持地图选点、测点标记和当前数据组显隐管理
 2 weeks ago
lvjunjie 19ed90ce86 新增网格属性插值功能入口 
- 新增属性插值菜单及基础参数配置窗口
- 完成中英文界面配置与窗口生命周期管理
 2 weeks ago
lvjunjie 0a1350b188 统一渗透率和井筒储集系数单位 
- 将渗透率显示单位统一为 mD
- 将井筒储集系数单位统一为 m^3/MPa
- 更新中英文参数配置及加密数据文件
 3 weeks 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
 3 weeks ago
lh 4deee62207 fix(nmNum): 修复数值面板初始化和多段压裂水平井适配 
- 补充数值面板初始化失败提示和空数据保护
- 统一使用 HorizontalMultiFracturedWell 井型
- 防止求解结果为空时发生越界
- 优化 Release 下左侧面板高度分配
- 同步中文翻译
 4 weeks ago
lh d7fa5676db feat:合并框架其他目录文件及代码 4 weeks ago
lvjunjie b1ebaad1bb 在界面中可通过下拉框选择当前模型 2 months ago
lh 4e574b76d6 fix:合并框架代码，已修复获取不到PVT数据的问题 2 months ago
lvjunjie 7ae104839d 在界面中添加显示当前模型 2 months ago
lvjunjie da8d6ce1c8 把计算后查看井结果放到左侧界面中，计算后不再弹出 3 months ago
lh 34209bc128 feat:初始化仓库代码 3 months ago