Merge pull request #142 from NHERI-SimCenter/develop

version 2.1 release candidate 1

InstallScripts/makeInstallPackagePGT.sh

@@ -6,9 +6,9 @@
 
 APP=PileGroupTool
 QWT_FRAMEWORK=qwt.framework
-QWT_FRAMEWORK_PATH=/usr/local/qwt-6.2.0-svn/lib/
+QWT_FRAMEWORK_PATH=/usr/local/qwt-6.1.4-svn/lib/
 
-QT_DEPLOY=/Users/pmackenz/Qt/5.11.1/clang_64/bin/macdeployqt
+QT_DEPLOY=/Users/pmackenz/Qt/5.11.2/clang_64/bin/macdeployqt
 #
 # ---- do not change anything below this line -----------------------------------
 #

PileGroupTool.pro

@@ -1,120 +1,127 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2016-02-17T19:23:56
-#
-#-------------------------------------------------
-
-## common compile issues
-#
-# -- Windows 10
-#
-#   * missing lapack.lib and/or blas.lib:
-#
-#     download and install Intel MKL (math kernel library).
-#     it is free from intel's web site, easy to install, and efficient.
-#
-#   * LNK1104: cannot open file 'qwt.lib'
-#
-#     - in Qt Creator, open existing project PileGroupTool\qwt-6.2\qwt.pro
-#     - configure the kit to compile in "[your_path]\build-qwt-[....]" (the full path is important)
-#     - adjust the path in the LIBS line below to reflect your build directory
-#     - in Qt Creator, PileGroupTool, rerun QMake and Build
-#
-# -- MacOS
-#
-#   * cannot open file 'qwt.lib'
-#
-#     first time compile only:
-#     - open Terminal, navigate to your source folder
-#     - cd qwt-6.1
-#     - ~/Qt/5.10.0/clang_64/bin/qmake qwt.pro
-#     - make
-#
-#     now, and with future updates, work as usual:
-#     - return to Qt Creator and Build the PileGroupTool.
-#
-# -- Linux
-#
-
-QT       += core gui
-unix: QT += svg opengl concurrent
-
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport network
-
-TARGET   = PileGroupTool
-TEMPLATE = app
-VERSION  = 2.0.4
-
-#M_REV     = $Rev: $
-
-PRODUCT_NAME = 'PileGroupTool'
-
-#DEFINES += APPLICATION_NAME=\"\\\"$$PRODUCT_NAME\\\"\"
-#DEFINES += APPLICATION_VERSION=\"\\\"$$M_VERSION$$member(M_REV, 1)\\\"\"
-DEFINES += APP_VERSION=\\\"$$VERSION\\\"
-
-unix:  QMAKE_CXXFLAGS_WARN_ON = -Wall -Wno-unused-variable -std=c++11
-win32: QMAKE_CXXFLAGS += /Y- -wd"4100"
-
-unix: DEPENDPATH += /usr/local/qwt-6.1.4-svn
-win32: DEPENDPATH += C:\Qwt-6.1.3
-
-win32: include(C:\qwt-6.1.3\features\qwt.prf)
-unix: include(/usr/local/qwt-6.1.4-svn/features/qwt.prf)
-
-include(OPS_includes.pro)
-
-INCLUDEPATH += includes
-INCLUDEPATH += mainWindow
-INCLUDEPATH += dialogs
-INCLUDEPATH += plots
-INCLUDEPATH += FEA
-
-SOURCES += main.cpp \
-        mainWindow/mainwindow.cpp \
-        FEA/getPyParam.cpp \
-        FEA/getQzParam.cpp \
-        FEA/getTZParam.cpp \
-        FEA/soilmat.cpp \
-        FEA/pilefeamodeler.cpp \
-        dialogs/materialdbinterface.cpp \
-        utilWindows/copyrightdialog.cpp \
-        utilWindows/dialogabout.cpp \
-        utilWindows/dialogpreferences.cpp \
-        utilWindows/dialogfuturefeature.cpp \
-        plots/systemplotsuper.cpp \
-        plots/systemplotqwt.cpp \
-        plots/resultplotsuper.cpp \
-        plots/resultplotqwt.cpp \
-        ../SimCenterCommon/Common/FooterWidget.cpp \
-        ../SimCenterCommon/Common/HeaderWidget.cpp
-
-HEADERS  += \
-        mainWindow/mainwindow.h \
-        includes/pilegrouptool_parameters.h \
-        FEA/soilmat.h \
-        FEA/pilefeamodeler.h \
-        dialogs/materialdbinterface.h \
-        utilWindows/copyrightdialog.h \
-        utilWindows/dialogabout.h \
-        utilWindows/dialogpreferences.h \
-        utilWindows/dialogfuturefeature.h \
-        plots/systemplotsuper.h \
-        plots/systemplotqwt.h \
-        plots/resultplotsuper.h \
-        plots/resultplotqwt.h \
-        ../SimCenterCommon/Common/FooterWidget.h \
-        ../SimCenterCommon/Common/HeaderWidget.h
-
-FORMS    += mainWindow/mainwindow.ui \
-        dialogs/materialdbinterface.ui \
-        utilWindows/copyrightdialog.ui \
-        utilWindows/dialogabout.ui \
-        utilWindows/dialogpreferences.ui \
-        utilWindows/dialogfuturefeature.ui
-
-RESOURCES += \
-	qtpileresources.qrc
-
-DISTFILES +=
+#-------------------------------------------------
+#
+# Project created by QtCreator 2016-02-17T19:23:56
+#
+#-------------------------------------------------
+
+## common compile issues
+#
+# -- Windows 10
+#
+#   * missing lapack.lib and/or blas.lib:
+#
+#     download and install Intel MKL (math kernel library).
+#     it is free from intel's web site, easy to install, and efficient.
+#
+#   * LNK1104: cannot open file 'qwt.lib'
+#
+#     - in Qt Creator, open existing project PileGroupTool\qwt-6.2\qwt.pro
+#     - configure the kit to compile in "[your_path]\build-qwt-[....]" (the full path is important)
+#     - adjust the path in the LIBS line below to reflect your build directory
+#     - in Qt Creator, PileGroupTool, rerun QMake and Build
+#
+# -- MacOS
+#
+#   * cannot open file 'qwt.lib'
+#
+#     first time compile only:
+#     - open Terminal, navigate to your source folder
+#     - cd qwt-6.1
+#     - ~/Qt/5.10.0/clang_64/bin/qmake qwt.pro
+#     - make
+#
+#     now, and with future updates, work as usual:
+#     - return to Qt Creator and Build the PileGroupTool.
+#
+# -- Linux
+#
+
+QT       += core gui
+unix: QT += svg opengl concurrent
+
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport network
+
+TARGET   = PileGroupTool
+TEMPLATE = app
+VERSION  = 2.1.0
+
+#M_REV     = $Rev: $
+
+PRODUCT_NAME = 'PileGroupTool'
+
+#DEFINES += APPLICATION_NAME=\"\\\"$$PRODUCT_NAME\\\"\"
+#DEFINES += APPLICATION_VERSION=\"\\\"$$M_VERSION$$member(M_REV, 1)\\\"\"
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+
+unix:  QMAKE_CXXFLAGS_WARN_ON = -Wall -Wno-unused-variable -std=c++11
+win32: QMAKE_CXXFLAGS += /Y- -wd"4100"
+
+unix: DEPENDPATH += /usr/local/qwt-6.1.4-svn
+win32: DEPENDPATH += C:\Qwt-6.1.3
+
+win32: include(C:\qwt-6.1.3\features\qwt.prf)
+unix: include(/usr/local/qwt-6.1.4-svn/features/qwt.prf)
+
+include(OPS_includes.pro)
+
+INCLUDEPATH += includes
+INCLUDEPATH += mainWindow
+INCLUDEPATH += widgets
+INCLUDEPATH += dialogs
+INCLUDEPATH += plots
+INCLUDEPATH += FEA
+
+SOURCES += main.cpp \
+        mainWindow/mainwindow.cpp \
+        FEA/getPyParam.cpp \
+        FEA/getQzParam.cpp \
+        FEA/getTZParam.cpp \
+        FEA/soilmat.cpp \
+        FEA/pilefeamodeler.cpp \
+        dialogs/materialdbinterface.cpp \
+        utilWindows/copyrightdialog.cpp \
+        utilWindows/dialogabout.cpp \
+        utilWindows/dialogpreferences.cpp \
+        utilWindows/dialogfuturefeature.cpp \
+        plots/systemplotsuper.cpp \
+        plots/systemplotqwt.cpp \
+        plots/resultplotsuper.cpp \
+        plots/resultplotqwt.cpp \
+        ../SimCenterCommon/Common/FooterWidget.cpp \
+        ../SimCenterCommon/Common/HeaderWidget.cpp \
+    widgets/sctrinputgroup.cpp \
+    utilWindows/dialogquicktips.cpp
+
+HEADERS  += \
+        mainWindow/mainwindow.h \
+        includes/pilegrouptool_parameters.h \
+        FEA/soilmat.h \
+        FEA/pilefeamodeler.h \
+        dialogs/materialdbinterface.h \
+        utilWindows/copyrightdialog.h \
+        utilWindows/dialogabout.h \
+        utilWindows/dialogpreferences.h \
+        utilWindows/dialogfuturefeature.h \
+        plots/systemplotsuper.h \
+        plots/systemplotqwt.h \
+        plots/resultplotsuper.h \
+        plots/resultplotqwt.h \
+        ../SimCenterCommon/Common/FooterWidget.h \
+        ../SimCenterCommon/Common/HeaderWidget.h \
+    widgets/sctrinputgroup.h \
+    utilWindows/dialogquicktips.h
+
+FORMS    += mainWindow/mainwindow.ui \
+        dialogs/materialdbinterface.ui \
+        utilWindows/copyrightdialog.ui \
+        utilWindows/dialogabout.ui \
+        utilWindows/dialogpreferences.ui \
+        utilWindows/dialogfuturefeature.ui \
+    widgets/sctrinputgroup.ui \
+    utilWindows/dialogquicktips.ui
+
+RESOURCES += \
+	qtpileresources.qrc
+
+DISTFILES +=

help/About/PGTabout.html

@@ -1,4 +1,4 @@
-<h1 id="top">This is the SimCenter Educational Pile Group Tool Version 2.0.3</h1>
+<h1 id="top">This is the SimCenter Educational Pile Group Tool Version 2.0.4</h1>
 
 <p>
 Please be aware that this software is not intended to be used in any commercial analysis and/or design. All contributors of NHERI SimCenter are free of responsibility and liability resulting from the use of this software. Use of this software is at your own risk.

help/QuickTips/QuickTips.html

@@ -0,0 +1,31 @@
+<h1>Useful Quick Tips</h1>
+<p>
+<ul>
+<li>
+    The Pile Group Tool uses metric units: meters, kN, and kPa.
+    <br>
+</li>
+<li>
+    Select piles or soil layers to display and/or change by clicking on the pile inside the System Plot
+    <br>
+</li>
+<li>
+    Explore different loading scenarios by switching between:
+    <br>
+    <ol>
+    <li>Force control: control forces and moments at the center of the pile cap</li>
+    <li>Push-over and Pull-out: use displacement control to experiment with limit states</li>
+    <li>Soil motion profile: a quasi-static approach to model liquefaction effects on the pile group</li>
+    </ol>
+    <br>
+</li>
+<li>
+    You can export the current analysis to a fully functional OpenSees inputfile (File menu).
+    <br>
+</li>
+<li>
+    Go to Preferences to select which result plots are shown. 
+    This allows you to hide unnecessary result plots or to reactivate those previously hidden.
+    <br>
+</li>
+</ul>

includes/pilegrouptool_parameters.h

@@ -13,11 +13,16 @@
 #define MAX_ELEMENTS_PER_LAYER   40
 #define NUM_ELEMENTS_IN_AIR       4
 
-// #define MAX_FORCE 5000.0
-#define MAX_H_FORCE  1000.0
-#define MAX_V_FORCE 10000.0
-#define MAX_MOMENT 2500.0
-#define MAX_DISP   1.0
+/*
+ *  force limits are given as integers to work with the sliders.
+ *  They are converted to floats when generating the FEA model.
+ */
+
+// #define MAX_FORCE 5000
+#define MAX_H_FORCE  1000
+#define MAX_V_FORCE 10000
+#define MAX_MOMENT 2500
+#define MAX_DISP   1
 
 // global constants
 #define GAMMA_WATER 9.81