YXS
/
AppFlow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、补充计算控制的两个数据（并行开关、mpi库类型）

Browse Source
feature/struct-menu-20241023
mzh 1 week ago
parent 570b0cf2cd
commit abb80ac863
3 changed files with 116 additions and 105 deletions
Show Stats Download Patch File Download Diff File

6
CFDStruct/CFDStructDataManager/CFDStructDataSolverComputingControlManager.cpp
Unescape Escape View File

@ -29,6 +29,8 @@ void CFDStructDataSolverComputingControlManager::saveDataToDom(rapidjson::Docume
jsonAdd(dom, m_DataSaveFrequency, {"couplingSolver", "unSteady", "savedSteps"});
jsonAdd(dom, m_DataSaveFrequency, {"couplingSolver", "steady", "savedIters"});
jsonAdd(dom, m_NumericalComputationCores, {"couplingSolver", "mpi", "core"});
jsonAdd(dom, m_enableMPI, {"couplingSolver", "mpi", "on"});
jsonAdd(dom, m_mpiLibType, {"couplingSolver", "mpi", "type"});
}
CUIConfig *CFDStructDataSolverComputingControlManager::genUIConfig() {
@ -59,10 +61,14 @@ CUIConfig *CFDStructDataSolverComputingControlManager::genUIConfig() {
new CUIConfig({
{"type", "CheckBox"}, // 并行
{"name", tr("parallel")},
{"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_enableMPI)},
}),
new CUIConfig({
{"type", "ComboBox"}, // MPI库
{"name", tr("MPI library")},
{"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_mpiLibType)},
},
{
new CUIConfig({

6
CFDStruct/CFDStructDataManager/CFDStructDataSolverComputingControlManager.h
Unescape Escape View File

@ -32,6 +32,12 @@ class CFDSTRUCTDATAMANAGER_EXPORT CFDStructDataSolverComputingControlManager : p
// ??表中没有
// 网格组装核数
int m_MeshAssemblyCores = 0;
// 并行开关
int m_enableMPI = 0;
// mpi库类型
int m_mpiLibType = 0;
};
#endif // CFDSTRUCTDATASOLVERCOMPUTINGCONTROLMANAGER_H

209
CFDStruct/CFDStructDataManager/CFDStructDataSolverTimeModeManager.cpp
Unescape Escape View File

@ -1,39 +1,33 @@
#include "CFDStructDataSolverTimeModeManager.h"
#include "CUIProperty/CUIConfig.h"
#include "CFDStructDataManagerBase.h"
#include "CFDStructMain/CFDStructDefine.h"
#include "CFDStructSigsCenter.h"
#include "CUIProperty/CUIConfig.h"
#include "CUIProperty/CUISigsCenter.h"
#include <QVariant>
#include "CFDStructDataManagerBase.h"
#include <rapidjson/document.h>
#include <rapidjson/writer.h>
#include <rapidjson/stringbuffer.h>
#include <rapidjson/writer.h>
CFDStructDataSolverTimeModeManager::CFDStructDataSolverTimeModeManager(QObject *parent) : CFDStructDataManagerBase(parent)
{
CFDStructDataSolverTimeModeManager::CFDStructDataSolverTimeModeManager(QObject *parent) : CFDStructDataManagerBase(parent) {
m_uiConfig = nullptr;
connect(m_cuiSigsCenter, &CUISigsCenter::sig_cuiPropertyChanged, this, [ = ](int semaphore) {
emit CFDStructSigsCenter::getInstance()->sig_solverModuleProperty((SolutionAnalysisModuleProperty)semaphore);
connect(m_cuiSigsCenter, &CUISigsCenter::sig_cuiPropertyChanged, this, [=](int semaphore) {
emit CFDStructSigsCenter::getInstance() -> sig_solverModuleProperty((SolutionAnalysisModuleProperty)semaphore);
});
}
CFDStructDataSolverTimeModeManager::~CFDStructDataSolverTimeModeManager()
{
// CFDStructDataManagerBase::~CFDStructDataManagerBase();
CFDStructDataSolverTimeModeManager::~CFDStructDataSolverTimeModeManager() {
// CFDStructDataManagerBase::~CFDStructDataManagerBase();
}
CUIConfig *CFDStructDataSolverTimeModeManager::getParamUIConfig()
{
CUIConfig *CFDStructDataSolverTimeModeManager::getParamUIConfig() {
if (m_uiConfig != nullptr) {
delete m_uiConfig;
m_uiConfig = nullptr;
}
// qDebug()<<m_mcyc;
// qDebug()<<m_mcyc;
// 如果是定常
if (m_runtype == 0) {
m_uiConfig = this->genSteadyModeUIConfig();
@ -41,99 +35,104 @@ CUIConfig *CFDStructDataSolverTimeModeManager::getParamUIConfig()
// 如果是非定常
m_uiConfig = this->genUnsteadyModeUIConfig();
}
// m_uiConfig->printConfig();
// m_uiConfig->printConfig();
return m_uiConfig;
}
void CFDStructDataSolverTimeModeManager::saveDataToDom(rapidjson::Document &dom)
{
jsonAdd(dom,m_runtype,{"region",0,"solver","time"});
jsonAdd(dom,m_innerIters,{"couplingSolver", "unSteady", "innerIters",});
jsonAdd(dom,m_iters,{"couplingSolver", "steady", "iters",});
jsonAdd(dom,m_alf0,{"couplingSolver", "unSteady", "stepType",});
jsonAdd(dom,m_realdt,{"couplingSolver", "unSteady", "timeStep",});
jsonAdd(dom,m_nstep,{"couplingSolver", "unSteady", "timeStepsNumber",});
jsonAdd(dom,m_timeaverage,{"couplingSolver", "unSteady", "Timeverage",});
void CFDStructDataSolverTimeModeManager::saveDataToDom(rapidjson::Document &dom) {
jsonAdd(dom, m_runtype, {"region", 0, "solver", "time"});
jsonAdd(dom, m_innerIters, {
"couplingSolver",
"unSteady",
"innerIters",
});
jsonAdd(dom, m_iters, {
"couplingSolver",
"steady",
"iters",
});
jsonAdd(dom, m_alf0, {
"couplingSolver",
"unSteady",
"stepType",
});
jsonAdd(dom, m_realdt, {
"couplingSolver",
"unSteady",
"timeStep",
});
jsonAdd(dom, m_nstep, {
"couplingSolver",
"unSteady",
"timeStepsNumber",
});
jsonAdd(dom, m_timeaverage, {
"couplingSolver",
"unSteady",
"Timeverage",
});
}
CUIConfig *CFDStructDataSolverTimeModeManager::genSteadyModeUIConfig()
{
return new CUIConfig({
{"type", "Widget"}}, {
new CUIConfig({
{"type", "ComboBox"},
{"name", "Time Mode"},
{"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_runtype)},
{"semaphore", (int)SolutionAnalysisModuleProperty::Time_Mode},
}, {
new CUIConfig({
{"type", "Item"},
{"name", "steady"},
}),
new CUIConfig({
{"type", "Item"},
{"name", "unsteady"},
})
}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "iteration count"},
{"value_type", CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_iters)},
})
});
CUIConfig *CFDStructDataSolverTimeModeManager::genSteadyModeUIConfig() {
return new CUIConfig({{"type", "Widget"}}, {new CUIConfig({
{"type", "ComboBox"},
{"name", "Time Mode"},
{"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_runtype)},
{"semaphore", (int)SolutionAnalysisModuleProperty::Time_Mode},
},
{new CUIConfig({
{"type", "Item"},
{"name", "steady"},
}),
new CUIConfig({
{"type", "Item"},
{"name", "unsteady"},
})}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "iteration count"},
{"value_type", CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_iters)},
})});
}
CUIConfig *CFDStructDataSolverTimeModeManager::genUnsteadyModeUIConfig()
{
return new CUIConfig({
{"type", "Widget"}
}, {
new CUIConfig({
{"type", "ComboBox"},
{"name", "Time Mode"},
{"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_runtype)},
{"semaphore", (int)SolutionAnalysisModuleProperty::Time_Mode},
}, {
new CUIConfig({
{"type", "Item"},
{"name", "steady"}
}),
new CUIConfig({
{"type", "Item"},
{"name", "unsteady"}
})
}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "alf0"},
{"value_type", CUI_DATA_TYPE_DOUBLE},
{"value_origin", QVA_GLOBAL(&m_alf0)},
}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "realdt"},
{"value_type", CUI_DATA_TYPE_DOUBLE},
{"value_origin", QVA_GLOBAL(&m_realdt)},
}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "nstep"},
{"value_type", CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_nstep)},
}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "mcyc"},
{"value_type", CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_iters)},
}),
new CUIConfig({
{"type", "CheckBox"},
{"name", "Time Average"},
{"value_type", CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_timeaverage)},
})
});
CUIConfig *CFDStructDataSolverTimeModeManager::genUnsteadyModeUIConfig() {
return new CUIConfig({{"type", "Widget"}}, {new CUIConfig({
{"type", "ComboBox"},
{"name", "Time Mode"},
{"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_runtype)},
{"semaphore", (int)SolutionAnalysisModuleProperty::Time_Mode},
},
{new CUIConfig({{"type", "Item"}, {"name", "steady"}}), new CUIConfig({{"type", "Item"}, {"name", "unsteady"}})}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "alf0"},
{"value_type", CUI_DATA_TYPE_DOUBLE},
{"value_origin", QVA_GLOBAL(&m_alf0)},
}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "realdt"},
{"value_type", CUI_DATA_TYPE_DOUBLE},
{"value_origin", QVA_GLOBAL(&m_realdt)},
}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "nstep"},
{"value_type", CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_nstep)},
}),
new CUIConfig({
{"type", "LineEdit"},
{"name", "mcyc"},
{"value_type", CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_iters)},
}),
new CUIConfig({
{"type", "CheckBox"},
{"name", "Time Average"},
{"value_type", CUI_DATA_TYPE_INT},
{"value_origin", QVA_GLOBAL(&m_timeaverage)},
})});
}

Write Preview
Loading…
Cancel
Save