fmk - updating pro file, updating version

NHERI-SimCenter · May 21, 2021 · e863818 · e863818
1 parent 587648c
commit e863818
Show file tree

Hide file tree

Showing 5 changed files with 158 additions and 6 deletions.
diff --git a/MainWindow.cpp b/MainWindow.cpp
@@ -1774,7 +1774,7 @@ void MainWindow::copyright()
 void MainWindow::version()
 {
     QMessageBox::about(this, tr("Version"),
-                       tr("Version 2.2.2 "));
+                       tr("Version 2.3.0 "));
 }
 
 void MainWindow::preferences()

diff --git a/images/aboutQUOFEM.html b/images/aboutQUOFEM.html
@@ -5,8 +5,6 @@ <h1>
 
 It is an application intended to augment finite element applications with sampling and optimization methods. These methods will allow users to provide, for example, uncertainty quantification in the structural responses and parameter estimation of input variables in calibration studies.
 <p>
-Version 2.2.1 of this tool utilizes the Dakota software to provide the UQ and optimization methods. Dakota will repeatedly invoke the finite element application either locally on the users dekstop machine or remotely on high performance computing resources at the Texas Advanced Computing Center through the NHERI DesignSafe cyberinfrastructure.
-<p>
 <h2>Acknowledgment</h2>
 <p>
 <img src=":/imagesCommon/nsf.gif">

diff --git a/main.cpp b/main.cpp
@@ -85,8 +85,8 @@ int main(int argc, char *argv[])
     //Setting Core Application Name, Organization, Version and Google Analytics Tracking Id
     QCoreApplication::setApplicationName("quoFEM");
     QCoreApplication::setOrganizationName("SimCenter");
-    QCoreApplication::setApplicationVersion("2.2.2");
-    //GoogleAnalytics::SetTrackingId("UA-121636495-1");
+    QCoreApplication::setApplicationVersion("2.3.0");
+    GoogleAnalytics::SetTrackingId("UA-121636495-1");
     GoogleAnalytics::StartSession();
     GoogleAnalytics::ReportStart();
 

diff --git a/quoFEM-legacy.pro b/quoFEM-legacy.pro
@@ -0,0 +1,154 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2017-05-30T09:46:13
+#
+#-------------------------------------------------
+
+QT       += core gui charts concurrent network printsupport
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = quoFEM
+TEMPLATE = app
+
+VERSION=2.1.0
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+
+INCLUDEPATH += ../SimCenterCommon/RandomVariables
+INCLUDEPATH += ../SimCenterCommon/Workflow/WORKFLOW
+# INCLUDEPATH += ../simcenterAgave/interface
+
+macos:LIBS += /usr/lib/libcurl.dylib
+#win32:INCLUDEPATH += "../curl-7.71.1-win64-mingw/include"
+#win32:LIBS += "../curl-7.71.1-win64-mingw/lib/libcurl.dll.a"
+win32:INCLUDEPATH+=C:/Users/yisan/Anaconda3/pkgs/libcurl-7.65.2-h2a8f88b_0/Library/include
+win32:LIBS += C:/Users/yisan/Anaconda3/pkgs/libcurl-7.65.2-h2a8f88b_0/Library/lib/libcurl.lib
+
+win32:DEFINES +=  CURL_STATICLIB
+#win32:INCLUDEPATH+=../libCurl-7.59.0/include
+#win32:LIBS += ../libCurl-7.59.0/lib/libcurl.lib
+linux:LIBS += /usr/lib/x86_64-linux-gnu/libcurl.so
+
+win32 {
+    RC_ICONS = icons/NHERI-quoFEM-Icon.ico
+} else {
+    mac {
+    ICON = icons/NHERI-quoFEM-Icon.icns
+    }
+}
+
+include(../SimCenterCommon/RandomVariables/RandomVariables.pri)
+include(../SimCenterCommon/Common/Common.pri)
+include(../SimCenterCommon/Workflow/JsonConfiguredWidgets.pri)
+
+SOURCES += main.cpp\
+        MainWindow.cpp \
+    EDP.cpp  \
+        SidebarWidgetSelection.cpp \
+        InputWidgetEDP.cpp \
+        InputWidgetFEM.cpp \
+        UQ_EngineSelection.cpp \
+        DakotaInputSampling.cpp \
+        SimCenterUQInputSampling.cpp \
+        DakotaInputSensitivity.cpp \
+        SimCenterUQInputSensitivity.cpp \
+        UQ_Results.cpp \
+        DakotaResultsSampling.cpp \
+        SimCenterUQResultsSampling.cpp \
+        DakotaResultsSensitivity.cpp \
+        SimCenterUQResultsSensitivity.cpp \
+        DakotaResultsCalibration.cpp \
+        DakotaInputCalibration.cpp \
+        UQ_Engine.cpp \
+        DakotaEngine.cpp \
+        SimCenterUQEngine.cpp \
+        UQpyEngine.cpp \
+	filterEngine.cpp \
+        InputWidgetParameters.cpp \
+        DakotaResultsBayesianCalibration.cpp \
+        DakotaInputBayesianCalibration.cpp \
+        OpenSeesParser.cpp \
+        FEAPpvParser.cpp \
+        OpenSeesPyParser.cpp \
+    RemoteJobCreator.cpp \
+    MyTableWidget.cpp \
+    RemoteJobManager.cpp \
+    AgaveCurl.cpp \
+    RemoteService.cpp \
+    CustomizedItemModel.cpp \
+    UQ_MethodInputWidget.cpp \
+    MonteCarloInputWidget.cpp \
+    MultiFidelityMonteCarlo.cpp \
+    LatinHypercubeInputWidget.cpp \
+    ImportanceSamplingInputWidget.cpp \
+    GaussianProcessInputWidget.cpp \
+    PCEInputWidget.cpp \
+    DakotaInputReliability.cpp \
+    LocalReliabilityWidget.cpp \
+    GlobalReliabilityWidget.cpp \
+    SimCenterGraphPlot.cpp \
+    qcustomplot.cpp \
+    DakotaResultsReliability.cpp \
+    UQ_JsonEngine.cpp \
+    UCSD_Engine.cpp \
+    UCSD_TMMC.cpp \
+    UCSD_Results.cpp \
+    CustomUQ_Results.cpp
+
+HEADERS  += MainWindow.h \
+    InputWidgetEDP.h \
+    EDP.h \
+    InputWidgetFEM.h \
+    SidebarWidgetSelection.h \
+    UQ_EngineSelection.h \
+    DakotaInputSampling.h \
+    SimCenterUQInputSampling.h \
+    DakotaInputSensitivity.h \
+    SimCenterUQInputSensitivity.h \
+    UQ_Results.h \
+    DakotaResultsSampling.h \
+    SimCenterUQResultsSampling.h \
+    DakotaInputCalibration.h \
+    DakotaResultsCalibration.h \
+    DakotaResultsSensitivity.h \
+    SimCenterUQResultsSensitivity.h \
+    UQ_Engine.h \
+    DakotaEngine.h \
+    SimCenterUQEngine.h \
+    UQpyEngine.h \
+    filterEngine.h \
+    InputWidgetParameters.h \
+    DakotaInputBayesianCalibration.h \
+    DakotaResultsBayesianCalibration.h \
+    OpenSeesParser.h \
+    FEAPpvParser.h \
+    OpenSeesPyParser.h \
+    RemoteJobCreator.h \
+    MyTableWidget.h \
+    RemoteJobManager.h \
+    AgaveCurl.h \
+    RemoteService.h \
+    UQ_MethodInputWidget.h \
+    MonteCarloInputWidget.h \
+    MultiFidelityMonteCarlo.h \
+    LatinHypercubeInputWidget.h \
+    CustomizedItemModel.h \
+    ImportanceSamplingInputWidget.h \
+    GaussianProcessInputWidget.h \
+    PCEInputWidget.h \
+    SimCenterGraphPlot.h \
+    DakotaInputReliability.h \
+    LocalReliabilityWidget.h \
+    GlobalReliabilityWidget.h \
+    qcustomplot.h \
+    DakotaResultsReliability.h \
+    UQ_JsonEngine.h \
+    UCSD_Engine.h \
+    UCSD_TMMC.h \
+    UCSD_Results.h \
+    CustomUQ_Results.h
+
+FORMS    += mainwindow.ui
+
+RESOURCES += \
+    styles.qrc
diff --git a/quoFEM.pro b/quoFEM.pro
@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = quoFEM
 TEMPLATE = app
 
-VERSION=2.2.2
+VERSION=2.3.0
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
 INCLUDEPATH += ../SimCenterCommon/RandomVariables