YXS
/
nmWTAI-Platform
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
184 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 'feature/PebiSolver-Integration-20260818'
${ noResults }
Commit Graph

33 Commits (feature/PebiSolver-Integration-20260818)

Author SHA1 Message Date
lh d0ab4cd518 feat(nmNum): 集成PEBI CPU加速求解器配置 
- 新增求解器库、OpenMP线程数和ILU复用步数设置
- 支持求解器配置的工程保存与恢复
- 计算前将加速参数传递给PEBI求解器DLL
- 记录PEBI网格数量并在计算完成后显示求解耗时
- 更新CPU加速运行库和中文翻译资源
 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 1d5c0bfdb6 Merge branch 'feature/MultiWellAutoFit-20260805' into develop 
# Conflicts:
#	Bin/Config/Lang/cn/nmNum_cn.qm   resolved by feature/MultiWellAutoFit-20260805 version
 3 days ago
lh 8eebf98ba2 refactor(nmNum): 统一渗透率基准单位为 mD 
- 统一储层、诊断、自动拟合及属性插值的渗透率单位
- 调整渗透率默认值、拟合范围和参数配置
- 在 PEBI 求解器入口将 mD 转换为 D
- 移除储层参数面板对 D/d 单位歧义的特殊处理
 6 days ago
lvjunjie e73b5ab453 1.增加压裂井裂缝半长拟合参数 2.参数物理边界统一用框架中的 6 days ago
lvjunjie e8563506b9 增加压裂井导流能力 Dfc 自动拟合参数 6 days ago
lh efc590edc6 feat(nmNum): 重构储层参数设置对话框 
- 新增模块化参数页面、字段目录和编辑会话
- 通过数据源注入实现工作副本及统一提交
- 支持单位换算、参数校验和分类联动
- 无对应对象时禁用分类按钮
- 统一渗透率基准单位为 D
 6 days ago
lvjunjie 5539150b5b 1.自动拟合参数范围设置与校验 2.移除GA相关代码 2 weeks ago
lvjunjie da033b5a82 扩展网格属性插值数据配置 2 weeks ago
lvjunjie 0e091ff593 完善网格属性插值测点管理功能 
- 支持多数据组创建、删除及插值参数保存读取
- 支持地图选点、测点标记和当前数据组显隐管理
 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
lvjunjie 705e2f11f8 Merge branch 'feature/Model-20260625' into develop 
# Conflicts:
#	3rd/Pebi/include/pch.h
 3 weeks ago
lvjunjie baa38e99e3 调整自动拟合参数并移除初始压力 3 weeks ago
lvjunjie bfbcfd2f3b 支持气井数据集拟压力转换 
- 接入当前气井的压力与拟压力转换表
- 仅在T5场景和数据集中保存转换表
- Runner将气井求解压力转换为拟压力后生成曲线
- 增加转换表完整性和单调性检查
 3 weeks ago
lh 4deee62207 fix(nmNum): 修复数值面板初始化和多段压裂水平井适配 
- 补充数值面板初始化失败提示和空数据保护
- 统一使用 HorizontalMultiFracturedWell 井型
- 防止求解结果为空时发生越界
- 优化 Release 下左侧面板高度分配
- 同步中文翻译
 4 weeks ago
lvjunjie 00d5cfdca1 移除15代之后误差小于目标两倍就停止的逻辑 1 month ago
lvjunjie 09d7f1b9d9 调整综合压缩系数范围 1 month ago
lvjunjie 11833dc5a1 调整生成数据集以及参数标准化 2 months ago
lvjunjie 955b2e19fe 删除自动拟合不需要的参数 2 months ago
lh e81c9e0b41 refactor: 重构PVT初始化逻辑，按相态获取参数并简化代码结构 
1. nmDataReservoir新增Gas/Water独立字段(Bg/Miug/Bw/Miuw)，消除复用Bo/Miuo的语义混淆
2. nmDataReservoir成员变量按相态分组排列(油/气/水)，构造/拷贝/序列化/getter-setter顺序同步
3. 重构initPvtParaFromSubFit：提取tryFetchPhasePvtCurves辅助函数，234行→~80行
4. 重构createReservoir：拆分为readPvtSingleValues/populateReservoirByPhase/createDefaultLayer，206行→~50行
5. solver task新增fillPvtInputByModel，ConstPvt从reservoir单值扩展为200元素数组
6. Ct/Cf统一获取，不再按ConstPvt/VariablePvt互斥
7. 移除油水两相多余的PVT.Sw传递，与PEBI示例对齐
 2 months ago
lvjunjie c6d08b13cf 根据PVT参数获取情况调整Base参数的获取 2 months ago
lvjunjie 6f3246690e 1.调整求解前计算网格的逻辑，避免部分变量为空 2.获取参数时，如果有一个获取不到就都用默认参数 2 months ago
lvjunjie e9cc8313a7 修改求解器参数获取 2 months ago
lh 418c8e4d99 fix: 禁止通过数据层和地图删除入口移除当前井 2 months ago
lh c8cdbafc68 fix: 修复地图中删除最后一口井后的崩溃 
- 删除井对象前清理当前井和参与计算井列表中的失效引用
- 刷新结果井下拉框时跳过已被删除的井名
 3 months ago
lvjunjie 95ec8e7486 默认参数修改 3 months ago
lvjunjie 9ea50d76e8 关闭成果窗口或者流动段窗口时清空数据 3 months ago
lvjunjie 91f0fdd86c 保存当前查看结果的井下次打开时显示 3 months ago
lvjunjie 2ed05a95bb 保存成果前先删除文件夹中旧文件再保存 3 months ago
lvjunjie 779b2b183e 关闭网格界面时，清理网格数据 3 months ago
lvjunjie f2d58bf502 修改nmDataReservoir默认构造的参数，以及调整获取的参数 3 months ago
lh 34209bc128 feat:初始化仓库代码 3 months ago