From 6b2009bf6272d9a3a9ec4998157843f57bd265be Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Fri, 14 Aug 2026 16:33:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(nmNum):=20=E4=BF=AE=E6=AD=A3=E5=8E=8B?= =?UTF-8?q?=E8=A3=82=E4=BA=95=E5=9E=8B=E5=8F=8A=E4=BA=95=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 112435 -> 112543 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 7 ++++--- .../nmSubWxs/nmReservoirParameterCatalog.cpp | 15 +++++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index fb8dbc0f9b5d0d6bc3593263aea801d6324fc8e3..b0806ed38e70a34dd02a8e15b97ac17122c3cc39 100644 GIT binary patch delta 1151 zcmYk)drX^E6aesZF8x}*j=~0%$3|OPXe(sE3<%5Q5i_A-j)%iqoe{)YHezX|4~o3s zZ?;QF5zMR8vw&8z+t!V zMK*){IRHlt;OI@_LhFNNwH=^)KIBnZ$gfxa6?;nQ4p)Trq!nLgeH!{ntimrzCQ;!v%8*>cTnb7~Gnau-3*`S83B7aTHy`YMRMt3 z{DHjE3LK+#sT-%MVUvmflSM3j0NDMJZ)MY6)U;-^d-;<9G4mmdj)bwP{eTfqg^6eP z0XFTVfXs&Xs5o+hjqRsEWFZ^PCwWvS`e-Vu1~+Ius!rOb3j6E~0k$0=^X8`|5yriM zuQk%b<_f$|+?HR{+p9#!N-qL-JQK3V9P+4DVM_zvDCe;csW z9I^{YtE>>_%B6gQ7L__|raQ_B<^Xc3Y9+g4geo~NQ9zZ4LnKSiWF1l}NUp(~bTZkG z^JG-l2oDQt9c$T1t7;{4tWi*{$19}ORI~O}>en=}<`iF0qemfGZK@t`QCVt7bW2#o z%yS(8?2m}qQ}uu?cWE{CP3q9*;=8ntU z%T2$OPlbc9#KMj*vDY4Oy6omxlAAmqPh+-!`55j&PwjCW$&Gw|>#Ga@gjjN_9sdhT zEpu6%^$ut4L3485!}vosdwq+|>hvs4W2XQ9aZC#HoSDWEKD>OYbzkK>M=w+5qSE6% nfhj4G|6P?w4lQ>o9;Tx(nJt!=ZFY0A!=sqSUH+UI{44%%T6TFd delta 1054 zcmY+?YfPI}7zgn4ob_#aI|}1ciqH!%-~|F~i|a^cfSAQKEEd=Z6m^A=S=^MHK+DFh zgHf*QCixFKa9g)Ih%sV}b=E`&G6Tsn7fg1MWFu-K`!X3C%@#l4e6_~JlbrMW@SHp+ z`JczXt_(a@z7tE8quMq~81))?>(kMhr^!yngclff{}!^ZD&#;^$l*yW&}mV=Wx2v= zC?;U%eiE&WwZt$QaY0a6C>~aYF3QUk%Pox3G)(dHc1DdlI2A$4M~<+IyO-e*B+|hv zmR9S6{|ua2}n~e@)NUIQ<~^aXjCS83puJK+Kmm>G;f{7 zR9F@7xeP(vMg=g7Hd4VWX6inBeh;I8GB!I^z^Ljd`#P_jQST+(6)mKPL4BGYVMbj- z8Q4&_$=#frZQ?i&pZkbWPkG?(=7+@FmvBvEMJKT6M=4o8~_NqmE~&-?ATzTZ(A_+NdX4o$HFTMPD-N`Xyv<#J@fY*?%+S z&;gjEZQ?7653{G_jL%>!dYTX2Lw?L&b@!YgoIAs4xDwu&IVyrRc899svWHR2D7s%DKmHjtJ=Nlx964Yd-*SpUw}EzBIYY|^&d0pY=ti^##27G0OFY zWW|`igiKh~TPOlKhIIA7ZBg-UAEUt}*bRjw;k?0>a{Rtn`^^nTmRzxJ-%pIfwu_D0 z_ZSs9Lb}hvY%Gz-!()6=b$j%nJU!!BFiI4QHRCDXd=Xuy8ay=ZqEr}?a(UM@tVz}6 z!c0<-O5sSZmJ18X>HOFotR>5ny%U-giQa%YrHXfcg|QSDZ<`Bfwn{{aFsDj10()wA z^f7<9zp|S#{zv$wD@Pc$_hKz|LUpg`fgJCT@TBF*fnQ5Ai3h@e4Zg~#?+2`=waM?= z(@nGkUFrSY^$7&YM*Crx+%$m|DV-m^4D ztYCWbjj(EoCEv*L_QSNGH}d*BokfHalMTt)HcApJS4SedYP24IX}% zRGZ?|rSFd~7Do(TcN@Z(yp-~eE%Vj-X}6@d^}2rlyHoMle>Gi&qq+6Sp_;m+|259> OHC>>g;6*<@)BOcOs#tyi diff --git a/Bin/Config/Lang/cn/nmNum_cn.ts b/Bin/Config/Lang/cn/nmNum_cn.ts index 4b2d7a6..d27e00e 100644 --- a/Bin/Config/Lang/cn/nmNum_cn.ts +++ b/Bin/Config/Lang/cn/nmNum_cn.ts @@ -6822,10 +6822,11 @@ Average pressure in contour: %2 MPa Finite conductivity有限导流 Infinite conductivity无限导流 Vertical well直井 - Vertical fractured well垂直压裂井 - Horizontal fractured well水平压裂井 + Fractured vertical well压裂直井 + Multistage fractured horizontal well多段压裂水平井 Position and wellbore位置与井筒 - Storage and fracture储集与裂缝 + Wellbore storage井筒储集 + Wellbore storage and fracture井筒储集与裂缝 Basic properties基础特性 Fluid parameters流体参数 Compression and saturation压缩与饱和度 diff --git a/Src/nmNum/nmSubWxs/nmReservoirParameterCatalog.cpp b/Src/nmNum/nmSubWxs/nmReservoirParameterCatalog.cpp index 4115645..6dd421d 100644 --- a/Src/nmNum/nmSubWxs/nmReservoirParameterCatalog.cpp +++ b/Src/nmNum/nmSubWxs/nmReservoirParameterCatalog.cpp @@ -27,14 +27,15 @@ static const char* const s_pCatalogTranslationMarkers[] = QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Finite conductivity"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Infinite conductivity"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Position and wellbore"), - QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Storage and fracture"), + QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Wellbore storage"), + QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Wellbore storage and fracture"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Basic properties"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Fluid parameters"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Compression and saturation"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Reservoir parameters"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Vertical well"), - QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Vertical fractured well"), - QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Horizontal fractured well"), + QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Fractured vertical well"), + QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Multistage fractured horizontal well"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Dual-medium parameters"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Geometry"), QT_TRANSLATE_NOOP("nmWxReservoirPropertiesEditor", "Flow properties"), @@ -193,8 +194,10 @@ void createWellGroups(nmReservoirPropertyObjectInfo& oInfo, prefixed(oInfo.m_sObjectCode, "W_Skin"), "W_Skin")); } + const char* pStorageGroupTitle = eWellType == Vertical_Well + ? "Wellbore storage" : "Wellbore storage and fracture"; nmReservoirParameterGroupInfo oStorage = - parameterGroup("Storage and fracture", 0, 1, 1); + parameterGroup(pStorageGroupTitle, 0, 1, 1); oStorage.m_listFields.append(numericField( prefixed(oInfo.m_sObjectCode, "W_C"), "W_C")); if (eWellType == Vertical_Fractured_Well) @@ -490,7 +493,7 @@ nmReservoirParameterCatalog::createObjectInfos( oInfo.m_nSourceIndex = nIndex; oInfo.m_sObjectCode = wellCode(oWell, "VFWELL", nIndex); oInfo.m_sDisplayName = oWell.getWellName() + " - " + - editorText("Vertical fractured well"); + editorText("Fractured vertical well"); createWellGroups(oInfo, Vertical_Fractured_Well, oWell.getPerforationCount() > 0); listInfos.append(oInfo); @@ -508,7 +511,7 @@ nmReservoirParameterCatalog::createObjectInfos( oInfo.m_nSourceIndex = nIndex; oInfo.m_sObjectCode = wellCode(oWell, "HFWELL", nIndex); oInfo.m_sDisplayName = oWell.getWellName() + " - " + - editorText("Horizontal fractured well"); + editorText("Multistage fractured horizontal well"); createWellGroups(oInfo, Horizontal_Fractured_Well, oWell.getPerforationCount() > 0); listInfos.append(oInfo);