Add contaminant dispersion setup widget, update fluid help and translations, show only latest run in convergence report

Author: tomas-soltys

src/fea/CMakeLists.txt

@@ -134,6 +134,7 @@ qt_add_executable(fea
     src/monitoring_points_dialog.cpp
     src/move_node_dialog.cpp
     src/new_model_dialog.cpp
+    src/particle_setup_widget.cpp
     src/pick_details_tree.cpp
     src/pick_item.cpp
     src/pick_list.cpp
@@ -316,6 +317,7 @@ qt_add_executable(fea
     src/monitoring_points_dialog.h
     src/move_node_dialog.h
     src/new_model_dialog.h
+    src/particle_setup_widget.h
     src/pick_details_tree.h
     src/pick_item.h
     src/pick_list.h

src/fea/help/theory/en/theory_fluid.md

@@ -1,5 +1,6 @@
 #include <QString>
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QMessageBox>
 
 #include <rbl_error.h>
@@ -2118,26 +2119,52 @@ void Action::onReportConvergenceGraph()
 
     for (int i=0;i<modelIDs.size();i++)
     {
-        QStringList fileNames;
+        const Model &rModel = Application::instance()->getSession()->getModel(modelIDs[i]);
 
-        QString filePattern(Application::instance()->getSession()->getModel(modelIDs[i]).buildTmpFileName("cvg",QString("*")));
+        QString filePattern(rModel.buildTmpFileName("cvg",QString("*")));
+        // Convergence files are named <model>-<task ID>-<suffix>.cvg
+        QString filePrefix(QFileInfo(rModel.buildTmpFileName("cvg",QString())).completeBaseName() + "-");
 
+        QStringList suffixes;
         std::vector<RProblemType> problemTypes = RProblem::getTypes(R_PROBLEM_ALL);
-        for (uint i=0;i<problemTypes.size();i++)
+        for (uint j=0;j<problemTypes.size();j++)
+        {
+            suffixes.append(RProblem::getId(problemTypes[j]));
+        }
+        for (RMatrixSolverType type=RMatrixSolverConf::None;type<RMatrixSolverConf::NTypes;type++)
+        {
+            suffixes.append(RMatrixSolverConf::getId(type));
+        }
+
+        // Newest file of each problem and matrix solver type together with its task ID.
+        QStringList lastFileNames;
+        QStringList lastTaskIDs;
+        QString latestTaskID;
+        for (const QString &suffix : std::as_const(suffixes))
         {
-            QString fileName(RFileUtils::findLastFile(RFileUtils::getFileNameWithSuffix(filePattern,RProblem::getId(problemTypes[i]))));
-            if (!fileName.isEmpty())
+            QString fileName(RFileUtils::findLastFile(RFileUtils::getFileNameWithSuffix(filePattern,suffix)));
+            if (fileName.isEmpty())
+            {
+                continue;
+            }
+            QString baseName(QFileInfo(fileName).completeBaseName());
+            QString taskID(baseName.mid(filePrefix.length(),baseName.length() - filePrefix.length() - suffix.length() - 1));
+
+            lastFileNames.append(fileName);
+            lastTaskIDs.append(taskID);
+            if (taskID > latestTaskID)
             {
-                fileNames.append(fileName);
+                latestTaskID = taskID;
             }
         }
 
-        for (RMatrixSolverType type=RMatrixSolverConf::None;type<RMatrixSolverConf::NTypes;type++)
+        // Show only files written by the latest solver run - older files belong to tasks which were not solved in it.
+        QStringList fileNames;
+        for (int j=0;j<lastFileNames.size();j++)
         {
-            QString fileName(RFileUtils::findLastFile(RFileUtils::getFileNameWithSuffix(filePattern,RMatrixSolverConf::getId(type))));
-            if (!fileName.isEmpty())
+            if (lastTaskIDs.at(j) == latestTaskID)
             {
-                fileNames.append(fileName);
+                fileNames.append(lastFileNames.at(j));
             }
         }
 

src/fea/help/theory/sk/theory_fluid.md

@@ -111,6 +111,11 @@ void ConvergenceGraphObject::readSource()
 
     this->graphData.clear();
 
+    // Matrix solver files hold one block per solve, each counting its iterations from 1.
+    // Blocks are chained so that a new solve is appended instead of overwriting the previous one.
+    double iterationOffset = 0.0;
+    double lastIteration = 0.0;
+
     bool isFirst = true;
     while (!in.atEnd())
     {
@@ -136,7 +141,14 @@ void ConvergenceGraphObject::readSource()
             iteration = query.at(0).toDouble();
             error[0] = query.at(this->dataColumn).toDouble();
 
-            this->graphData[iteration] = error;
+            if (iteration <= lastIteration)
+            {
+                // Iteration number did not grow - next solve has started.
+                iterationOffset += lastIteration;
+            }
+            lastIteration = iteration;
+
+            this->graphData[iterationOffset + iteration] = error;
         }
     }
 

src/fea/src/action.cpp

@@ -0,0 +1,64 @@
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QVBoxLayout>
+
+#include "particle_setup_widget.h"
+#include "value_line_edit.h"
+
+ParticleSetupWidget::ParticleSetupWidget(const RParticleSetup &particleSetup, QWidget *parent)
+    : QWidget(parent)
+    , particleSetup(particleSetup)
+{
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    this->setLayout(mainLayout);
+
+    QGroupBox *groupBox = new QGroupBox(tr("Contaminant dispersion setup"));
+    mainLayout->addWidget(groupBox);
+
+    QGridLayout *groupLayout = new QGridLayout;
+    groupBox->setLayout(groupLayout);
+
+    int groupLayoutRow = 0;
+
+    // Maximum saturation
+    QLabel *labelMaximumSaturation = new QLabel(tr("Maximum saturation") + " [kg/m^3]");
+    groupLayout->addWidget(labelMaximumSaturation,groupLayoutRow,0);
+
+    ValueLineEdit *lineMaximumSaturation = new ValueLineEdit(R_PARTICLE_MAXIMUM_SATURATION_MIN_VALUE,R_PARTICLE_MAXIMUM_SATURATION_MAX_VALUE);
+    lineMaximumSaturation->setValue(this->particleSetup.getMaximumSaturation());
+    lineMaximumSaturation->setToolTip(tr("Maximum possible concentration of the contaminant. "
+                                         "Particle rate decreases as the concentration approaches this value and stops at saturation. "
+                                         "Relative saturation is computed when set. "
+                                         "Zero means unlimited."));
+    groupLayout->addWidget(lineMaximumSaturation,groupLayoutRow++,1);
+
+    QObject::connect(lineMaximumSaturation,&ValueLineEdit::valueChanged,this,&ParticleSetupWidget::onMaximumSaturationChanged);
+
+    // Diffusion coefficient
+    QLabel *labelDiffusionCoefficient = new QLabel(tr("Diffusion coefficient") + " [m^2/s]");
+    groupLayout->addWidget(labelDiffusionCoefficient,groupLayoutRow,0);
+
+    ValueLineEdit *lineDiffusionCoefficient = new ValueLineEdit(R_PARTICLE_DIFFUSION_COEFFICIENT_MIN_VALUE,R_PARTICLE_DIFFUSION_COEFFICIENT_MAX_VALUE);
+    lineDiffusionCoefficient->setValue(this->particleSetup.getDiffusionCoefficient());
+    lineDiffusionCoefficient->setToolTip(tr("Effective diffusion coefficient of the contaminant in the fluid. "
+                                            "Molecular diffusion (about 1e-5 m^2/s in gases, 1e-9 m^2/s in liquids) is negligible in most flows; "
+                                            "mixing is dominated by turbulence, which can be estimated as turbulent viscosity divided by 0.7. "
+                                            "When diffusion dominates, use backward difference time march approximation to avoid oscillations. "
+                                            "Zero means no diffusion."));
+    groupLayout->addWidget(lineDiffusionCoefficient,groupLayoutRow++,1);
+
+    QObject::connect(lineDiffusionCoefficient,&ValueLineEdit::valueChanged,this,&ParticleSetupWidget::onDiffusionCoefficientChanged);
+}
+
+void ParticleSetupWidget::onMaximumSaturationChanged(double maximumSaturation)
+{
+    this->particleSetup.setMaximumSaturation(maximumSaturation);
+    emit this->changed(this->particleSetup);
+}
+
+void ParticleSetupWidget::onDiffusionCoefficientChanged(double diffusionCoefficient)
+{
+    this->particleSetup.setDiffusionCoefficient(diffusionCoefficient);
+    emit this->changed(this->particleSetup);
+}

src/fea/src/convergence_graph_object.cpp

@@ -0,0 +1,35 @@
+#ifndef PARTICLE_SETUP_WIDGET_H
+#define PARTICLE_SETUP_WIDGET_H
+
+#include <QWidget>
+
+#include <rml_particle_setup.h>
+
+class ParticleSetupWidget : public QWidget
+{
+    Q_OBJECT
+
+    protected:
+
+        //! Particle setup.
+        RParticleSetup particleSetup;
+
+    public:
+
+        //! Constructor.
+        explicit ParticleSetupWidget(const RParticleSetup &particleSetup, QWidget *parent = nullptr);
+
+    signals:
+
+        //! Particle setup has changed.
+        void changed(const RParticleSetup &particleSetup);
+
+    private slots:
+
+        void onMaximumSaturationChanged(double maximumSaturation);
+
+        void onDiffusionCoefficientChanged(double diffusionCoefficient);
+
+};
+
+#endif // PARTICLE_SETUP_WIDGET_H

src/fea/src/particle_setup_widget.cpp

@@ -3,6 +3,7 @@
 #include "application.h"
 #include "mesh_setup_widget.h"
 #include "modal_setup_widget.h"
+#include "particle_setup_widget.h"
 #include "radiation_setup_widget.h"
 #include "time_solver_setup_widget.h"
 
@@ -90,6 +91,14 @@ void ProblemTree::populate()
         QObject::connect(acousticSetupWidget,&AcousticSetupWidget::changed,this,&ProblemTree::onAcousticSetupChanged);
     }
 
+    if (rModel.getProblemTaskTree().getProblemTypeMask() & R_PROBLEM_FLUID_PARTICLE)
+    {
+        QTreeWidgetItem *particleSetup = new QTreeWidgetItem(this);
+        ParticleSetupWidget *particleSetupWidget = new ParticleSetupWidget(rModel.getProblemSetup().getParticleSetup());
+        this->setItemWidget(particleSetup,PROBLEM_TREE_COLUMN_1,particleSetupWidget);
+        QObject::connect(particleSetupWidget,&ParticleSetupWidget::changed,this,&ProblemTree::onParticleSetupChanged);
+    }
+
     if (rModel.getProblemTaskTree().getProblemTypeMask() & R_PROBLEM_RADIATIVE_HEAT)
     {
         QString vfFileName = rModel.buildDataFileName(RViewFactorMatrix::getDefaultFileExtension(true),rModel.getTimeSolver().getEnabled());
@@ -158,6 +167,17 @@ void ProblemTree::onAcousticSetupChanged(const RAcousticSetup &acousticSetup)
     }
 }
 
+void ProblemTree::onParticleSetupChanged(const RParticleSetup &particleSetup)
+{
+    QList<uint> modelIDs = Application::instance()->getSession()->getSelectedModelIDs();
+
+    for (int i=0;i<modelIDs.size();i++)
+    {
+        Application::instance()->getSession()->getModel(modelIDs[i]).getProblemSetup().setParticleSetup(particleSetup);
+        Application::instance()->getSession()->setProblemChanged(modelIDs[i]);
+    }
+}
+
 void ProblemTree::onRadiationSetupChanged(const RRadiationSetup &radiationSetup)
 {
     QList<uint> modelIDs = Application::instance()->getSession()->getSelectedModelIDs();

src/fea/src/particle_setup_widget.h

@@ -40,6 +40,9 @@ class ProblemTree : public QTreeWidget
         //! Acoustic setup has changed.
         void onAcousticSetupChanged(const RAcousticSetup &acousticSetup);
 
+        //! Particle setup has changed.
+        void onParticleSetupChanged(const RParticleSetup &particleSetup);
+
         //! Radiation setup has changed.
         void onRadiationSetupChanged(const RRadiationSetup &radiationSetup);