From 8d5d01cdbda51fd72c70fd444ad3ab84939a07eb Mon Sep 17 00:00:00 2001 From: Peter Mackenzie-Helnwein Date: Mon, 8 Jul 2019 14:49:55 -0700 Subject: [PATCH 1/2] Fixing typos in map keys --- Inflow/inflowparameterwidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Inflow/inflowparameterwidget.cpp b/Inflow/inflowparameterwidget.cpp index a95b710..48d19ad 100644 --- a/Inflow/inflowparameterwidget.cpp +++ b/Inflow/inflowparameterwidget.cpp @@ -781,7 +781,7 @@ void InflowParameterWidget::exportInflowParameterFile(QString fileName) out << "// turbulence length scale profile for u component" << endl; out << "LuxDict" << endl; out << "{" << endl; - out << " referenceValue " << theParameters.value("Lux") << ";" << endl; + out << " referenceValue " << theParameters.value("Lu0") << ";" << endl; out << " profile " << profile << ";" << endl; @@ -797,7 +797,7 @@ void InflowParameterWidget::exportInflowParameterFile(QString fileName) out << "// turbulence length scale profile for v component" << endl; out << "LvxDict" << endl; out << "{" << endl; - out << " referenceValue " << theParameters.value("Luv") << ";" << endl; + out << " referenceValue " << theParameters.value("Lv0") << ";" << endl; out << " profile " << profile << ";" << endl; @@ -814,7 +814,7 @@ void InflowParameterWidget::exportInflowParameterFile(QString fileName) out << "// turbulence length scale profile for w component" << endl; out << "LwxDict" << endl; out << "{" << endl; - out << " referenceValue " << theParameters.value("Luw") << ";" << endl; + out << " referenceValue " << theParameters.value("Lw0") << ";" << endl; out << " profile " << profile << ";" << endl; From 5f4e1e5a45378d63cd8b8d625584b18c4ff0af47 Mon Sep 17 00:00:00 2001 From: Peter Mackenzie-Helnwein Date: Mon, 8 Jul 2019 17:14:58 -0700 Subject: [PATCH 2/2] fixing export of controlDict file --- Inflow/inflowparameterwidget.cpp | 11 ++++++++--- Inflow/inflowparameterwidget.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Inflow/inflowparameterwidget.cpp b/Inflow/inflowparameterwidget.cpp index 48d19ad..b576229 100644 --- a/Inflow/inflowparameterwidget.cpp +++ b/Inflow/inflowparameterwidget.cpp @@ -943,9 +943,14 @@ void InflowParameterWidget::exportUFile(QString fileName) UFile.close(); } -void InflowParameterWidget::exportControlDictFile(QString fileName) +void InflowParameterWidget::exportControlDictFile(QString origFileName, QString fileName) { // file handle for the controlDict file + QFile CDictIn(origFileName); + CDictIn.open(QFile::ReadOnly); + CDictContents = CDictIn.readAll(); + CDictIn.close(); + QFile CDict(fileName); CDict.open(QFile::WriteOnly); QTextStream out(&CDict); @@ -1037,7 +1042,7 @@ void InflowParameterWidget::on_btn_export_clicked() qDebug() << "move" << newFile << origFile; // update controlDict file - this->exportControlDictFile(newFile); + this->exportControlDictFile(origFile, newFile); } void InflowParameterWidget::on_UFileChanged(QString uFilePath) @@ -1185,7 +1190,7 @@ bool InflowParameterWidget::copyFiles(QString &dirName) qDebug() << "move" << newFile << origFile; // update controlDict file - this->exportControlDictFile(newFile); + this->exportControlDictFile(origFile, newFile); return true; } diff --git a/Inflow/inflowparameterwidget.h b/Inflow/inflowparameterwidget.h index f17c812..3135a98 100644 --- a/Inflow/inflowparameterwidget.h +++ b/Inflow/inflowparameterwidget.h @@ -103,7 +103,7 @@ private slots: void setExponentialTurbulent(void); void exportInflowParameterFile(QString); void exportUFile(QString); - void exportControlDictFile(QString); + void exportControlDictFile(QString, QString); void clearBoundaryMap(void); bool readUfile(QString); bool readControlDict(QString);