From 1798c851a7fa80cf44776ec8ef0beab6ac75b062 Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Fri, 28 Aug 2026 16:18:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor(numerical):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=BB=BA=E7=BD=91=E5=9C=BA=E6=99=AF=E4=B8=B4=E6=97=B6=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除场景二进制文件写入和模型文件名映射 - 避免建网前不必要的目录创建与磁盘读写 - 清理不再使用的 Qt 头文件 --- .../nmCalculation/nmCalculationPebiGrid.cpp | 47 ------------------- 1 file changed, 47 deletions(-) diff --git a/Src/nmNum/nmCalculation/nmCalculationPebiGrid.cpp b/Src/nmNum/nmCalculation/nmCalculationPebiGrid.cpp index 0f783b1..32d6134 100644 --- a/Src/nmNum/nmCalculation/nmCalculationPebiGrid.cpp +++ b/Src/nmNum/nmCalculation/nmCalculationPebiGrid.cpp @@ -1,8 +1,6 @@ #include "nmCalculationPebiGrid.h" #include -#include #include -#include #include #include #include @@ -122,26 +120,6 @@ std::vector buildConstantPvtPressure() return pressure; } -QString solverModelFileTag(NM_SOLVER_MODEL_TYPE modelType) -{ - switch(modelType) { - case SMT_Oil_ConstPvt: - return "T1_oil_const_pvt"; - case SMT_Oil_VariablePvt: - return "T2_oil_variable_pvt"; - case SMT_Water_ConstPvt: - return "T3_water_const_pvt"; - case SMT_Water_VariablePvt: - return "T4_water_variable_pvt"; - case SMT_Gas_VariablePvt: - return "T5_gas_variable_pvt"; - case SMT_Oil_Water_TwoPhase: - return "T8_oil_water_two_phase"; - default: - return QString("T%1_unsupported").arg(static_cast(modelType)); - } -} - void fillScenePvtByModel(nmDataBinaryTools::NM_PEBI_SCENE& scene, NM_SOLVER_MODEL_TYPE modelType, nmDataPvtParaForPebi* pvt, @@ -1703,31 +1681,6 @@ bool nmCalculationPebiGrid::calculateSnapshot( } try { - // 第一步:后台写出已经值化的场景,不再回查当前成果或井对象。 - QDir oAppDir(QCoreApplication::applicationDirPath()); - QDir oDataDir(oAppDir.filePath( - "../../ML/nmWTAI-ML/data/temp")); - if(!oDataDir.exists()) { - oDataDir.mkpath("."); - } - - const NM_SOLVER_MODEL_TYPE eSolverModelType = - static_cast( - oSnapshot.m_oScene.solverType); - const QString sScenePath = oDataDir.filePath( - QString("scene_%1.bin") - .arg(solverModelFileTag(eSolverModelType))); - if(!nmDataBinaryTools::savePebiSceneBin( - sScenePath, oSnapshot.m_oScene)) { - zxLogInstance::getInstance()->writeLogF( - "savePebiSceneBin failed: " + - nmDataBinaryTools::getLastError()); - FreeLibrary(hGridModule); - return false; - } - zxLogInstance::getInstance()->writeLogF( - "scene exported: " + sScenePath); - if(isCancellationRequested(pCancelRequested)) { FreeLibrary(hGridModule); return false;