Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Autoates #3

Draft
wants to merge 17 commits into
base: master
Choose a base branch
from
Draft

Autoates #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b22fd2f
started forest_friction
Iceman-bfw Jan 11, 2022
00a158d
cleaned out repo
Iceman-bfw Jan 11, 2022
de4ac59
implementet forest till flow_core, ToDo: implement calculation
Iceman-bfw Jan 12, 2022
4040627
fully implemented the forest friction model from gr4a
Iceman-bfw Jan 12, 2022
5608aa9
Detrainment and friction roughed in, however there is an error in the…
Maverick-bfw Apr 18, 2022
d2a8a90
edited hard coded forest values out of core, and worked on friction m…
Maverick-bfw Apr 22, 2022
1949789
Bux fix for row and col index for forest layer when being handed to c…
Maverick-bfw Apr 25, 2022
e556ca4
updated to convert the forest no effect velocity from m/s to m of kin…
Maverick-bfw Apr 27, 2022
81f9a2e
added argv statement so it runs from IED
Maverick-bfw Apr 28, 2022
b74cee5
fixed 2 bugs in forest interactions 1 in friction and 1 in detrainment.
Maverick-bfw Apr 28, 2022
04bff0b
commented out line 620 to take command line inputs
jmasseysykes Sep 1, 2022
a4645cc
update local files
jmasseysykes Sep 1, 2022
87fcaa1
update main.py for batch processing
jmasseysykes Sep 1, 2022
584cdc5
WIP for VM
blt2589 May 22, 2023
19c1533
updated path for flowpy res dir
blt2589 May 23, 2023
ae6caa7
updated path for flowpy res dir
blt2589 May 24, 2023
acd930f
updated max detrainment and max friction
blt2589 Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
636 changes: 636 additions & 0 deletions .ipynb_checkpoints/main-checkpoint.py
View file
Open in desktop

Large diffs are not rendered by default.

636 changes: 636 additions & 0 deletions .ipynb_checkpoints/main_edit-checkpoint.py
View file
Open in desktop

Large diffs are not rendered by default.

159 changes: 86 additions & 73 deletions Flow_GUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,77 @@

# Form implementation generated from reading ui file '.\Flow_GUI.ui'
#
# Created by: PyQt5 UI code generator 5.9.2
# Created by: PyQt5 UI code generator 5.15.5
#
# WARNING! All changes made in this file will be lost!
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.


from PyQt5 import QtCore, QtGui, QtWidgets


class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(546, 352)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap("FlowPylogo.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
icon.addPixmap(QtGui.QPixmap(".\\FlowPylogo.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
MainWindow.setWindowIcon(icon)
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.gridLayout = QtWidgets.QGridLayout(self.centralwidget)
self.gridLayout.setObjectName("gridLayout")
self.forest_Label = QtWidgets.QLabel(self.centralwidget)
self.forest_Label.setObjectName("forest_Label")
self.gridLayout.addWidget(self.forest_Label, 6, 1, 1, 1)
self.label = QtWidgets.QLabel(self.centralwidget)
self.label.setObjectName("label")
self.gridLayout.addWidget(self.label, 11, 1, 1, 1)
self.gridLayout.addWidget(self.label, 12, 1, 1, 1)
self.line = QtWidgets.QFrame(self.centralwidget)
self.line.setFrameShape(QtWidgets.QFrame.HLine)
self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line.setObjectName("line")
self.gridLayout.addWidget(self.line, 4, 1, 1, 1)
self.infra_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.infra_lineEdit.setObjectName("infra_lineEdit")
self.gridLayout.addWidget(self.infra_lineEdit, 5, 2, 1, 1)
self.wDir_Button = QtWidgets.QToolButton(self.centralwidget)
self.wDir_Button.setCheckable(False)
self.wDir_Button.setObjectName("wDir_Button")
self.gridLayout.addWidget(self.wDir_Button, 1, 3, 1, 1)
self.line_5 = QtWidgets.QFrame(self.centralwidget)
self.line_5.setFrameShape(QtWidgets.QFrame.HLine)
self.line_5.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line_5.setObjectName("line_5")
self.gridLayout.addWidget(self.line_5, 8, 3, 1, 1)
self.line_4 = QtWidgets.QFrame(self.centralwidget)
self.line_4.setFrameShape(QtWidgets.QFrame.HLine)
self.line_4.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line_4.setObjectName("line_4")
self.gridLayout.addWidget(self.line_4, 4, 2, 1, 1)
self.gridLayout.addWidget(self.line_4, 4, 3, 1, 1)
self.Release_Button = QtWidgets.QToolButton(self.centralwidget)
self.Release_Button.setObjectName("Release_Button")
self.gridLayout.addWidget(self.Release_Button, 3, 3, 1, 1)
self.gridLayout.addWidget(self.Release_Button, 3, 4, 1, 1)
self.calc_Button = QtWidgets.QPushButton(self.centralwidget)
self.calc_Button.setObjectName("calc_Button")
self.gridLayout.addWidget(self.calc_Button, 12, 2, 1, 1)
self.release_label = QtWidgets.QLabel(self.centralwidget)
self.release_label.setObjectName("release_label")
self.gridLayout.addWidget(self.release_label, 3, 1, 1, 1)
self.wDir_label = QtWidgets.QLabel(self.centralwidget)
self.wDir_label.setObjectName("wDir_label")
self.gridLayout.addWidget(self.wDir_label, 1, 1, 1, 1)
self.gridLayout.addWidget(self.calc_Button, 13, 3, 1, 1)
self.infra_Button = QtWidgets.QToolButton(self.centralwidget)
self.infra_Button.setObjectName("infra_Button")
self.gridLayout.addWidget(self.infra_Button, 5, 3, 1, 1)
self.gridLayout.addWidget(self.infra_Button, 5, 4, 1, 1)
self.line_6 = QtWidgets.QFrame(self.centralwidget)
self.line_6.setFrameShape(QtWidgets.QFrame.HLine)
self.line_6.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line_6.setObjectName("line_6")
self.gridLayout.addWidget(self.line_6, 10, 2, 1, 1)
self.gridLayout.addWidget(self.line_6, 11, 3, 1, 1)
self.infra_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.infra_lineEdit.setObjectName("infra_lineEdit")
self.gridLayout.addWidget(self.infra_lineEdit, 5, 3, 1, 1)
self.wDir_Button = QtWidgets.QToolButton(self.centralwidget)
self.wDir_Button.setCheckable(False)
self.wDir_Button.setObjectName("wDir_Button")
self.gridLayout.addWidget(self.wDir_Button, 1, 4, 1, 1)
self.release_label = QtWidgets.QLabel(self.centralwidget)
self.release_label.setObjectName("release_label")
self.gridLayout.addWidget(self.release_label, 3, 1, 1, 1)
self.wDir_label = QtWidgets.QLabel(self.centralwidget)
self.wDir_label.setObjectName("wDir_label")
self.gridLayout.addWidget(self.wDir_label, 1, 1, 1, 1)
self.DEM_Button = QtWidgets.QToolButton(self.centralwidget)
self.DEM_Button.setObjectName("DEM_Button")
self.gridLayout.addWidget(self.DEM_Button, 2, 3, 1, 1)
self.line_5 = QtWidgets.QFrame(self.centralwidget)
self.line_5.setFrameShape(QtWidgets.QFrame.HLine)
self.line_5.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line_5.setObjectName("line_5")
self.gridLayout.addWidget(self.line_5, 7, 2, 1, 1)
self.gridLayout.addWidget(self.DEM_Button, 2, 4, 1, 1)
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout")
self.label_7 = QtWidgets.QLabel(self.centralwidget)
Expand All @@ -92,45 +98,32 @@ def setupUi(self, MainWindow):
self.horizontalLayout.addWidget(self.exp_Edit)
spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout.addItem(spacerItem1)
self.gridLayout.addLayout(self.horizontalLayout, 8, 2, 1, 1)
self.gridLayout.addLayout(self.horizontalLayout, 9, 3, 1, 1)
self.DEM_label = QtWidgets.QLabel(self.centralwidget)
self.DEM_label.setObjectName("DEM_label")
self.gridLayout.addWidget(self.DEM_label, 2, 1, 1, 1)
self.DEM_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.DEM_lineEdit.setObjectName("DEM_lineEdit")
self.gridLayout.addWidget(self.DEM_lineEdit, 2, 3, 1, 1)
self.infra_label = QtWidgets.QLabel(self.centralwidget)
self.infra_label.setObjectName("infra_label")
self.gridLayout.addWidget(self.infra_label, 5, 1, 1, 1)
self.wDir_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.wDir_lineEdit.setObjectName("wDir_lineEdit")
self.gridLayout.addWidget(self.wDir_lineEdit, 1, 3, 1, 1)
self.line_3 = QtWidgets.QFrame(self.centralwidget)
self.line_3.setFrameShape(QtWidgets.QFrame.HLine)
self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line_3.setObjectName("line_3")
self.gridLayout.addWidget(self.line_3, 11, 1, 1, 1)
self.label_2 = QtWidgets.QLabel(self.centralwidget)
self.label_2.setObjectName("label_2")
self.gridLayout.addWidget(self.label_2, 8, 1, 1, 1)
self.gridLayout.addWidget(self.label_2, 9, 1, 1, 1)
self.line_2 = QtWidgets.QFrame(self.centralwidget)
self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line_2.setObjectName("line_2")
self.gridLayout.addWidget(self.line_2, 7, 1, 1, 1)
self.release_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.release_lineEdit.setObjectName("release_lineEdit")
self.gridLayout.addWidget(self.release_lineEdit, 3, 2, 1, 1)
self.line_3 = QtWidgets.QFrame(self.centralwidget)
self.line_3.setFrameShape(QtWidgets.QFrame.HLine)
self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line_3.setObjectName("line_3")
self.gridLayout.addWidget(self.line_3, 10, 1, 1, 1)
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
self.outputBox = QtWidgets.QComboBox(self.centralwidget)
self.outputBox.setObjectName("outputBox")
self.outputBox.addItem("")
self.outputBox.addItem("")
self.horizontalLayout_2.addWidget(self.outputBox)
spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem2)
self.gridLayout.addLayout(self.horizontalLayout_2, 11, 2, 1, 1)
self.infra_label = QtWidgets.QLabel(self.centralwidget)
self.infra_label.setObjectName("infra_label")
self.gridLayout.addWidget(self.infra_label, 5, 1, 1, 1)
self.wDir_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.wDir_lineEdit.setObjectName("wDir_lineEdit")
self.gridLayout.addWidget(self.wDir_lineEdit, 1, 2, 1, 1)
self.DEM_label = QtWidgets.QLabel(self.centralwidget)
self.DEM_label.setObjectName("DEM_label")
self.gridLayout.addWidget(self.DEM_label, 2, 1, 1, 1)
self.DEM_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.DEM_lineEdit.setObjectName("DEM_lineEdit")
self.gridLayout.addWidget(self.DEM_lineEdit, 2, 2, 1, 1)
self.gridLayout.addWidget(self.line_2, 8, 1, 1, 1)
self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
self.label_4 = QtWidgets.QLabel(self.centralwidget)
Expand All @@ -139,20 +132,39 @@ def setupUi(self, MainWindow):
self.flux_Edit = QtWidgets.QLineEdit(self.centralwidget)
self.flux_Edit.setObjectName("flux_Edit")
self.horizontalLayout_3.addWidget(self.flux_Edit)
spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem3)
spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem2)
self.label_3 = QtWidgets.QLabel(self.centralwidget)
self.label_3.setObjectName("label_3")
self.horizontalLayout_3.addWidget(self.label_3)
self.z_Edit = QtWidgets.QLineEdit(self.centralwidget)
self.z_Edit.setObjectName("z_Edit")
self.horizontalLayout_3.addWidget(self.z_Edit)
spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem3)
self.gridLayout.addLayout(self.horizontalLayout_3, 10, 3, 1, 1)
self.release_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.release_lineEdit.setObjectName("release_lineEdit")
self.gridLayout.addWidget(self.release_lineEdit, 3, 3, 1, 1)
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
self.outputBox = QtWidgets.QComboBox(self.centralwidget)
self.outputBox.setObjectName("outputBox")
self.outputBox.addItem("")
self.outputBox.addItem("")
self.horizontalLayout_2.addWidget(self.outputBox)
spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem4)
self.gridLayout.addLayout(self.horizontalLayout_3, 9, 2, 1, 1)
self.horizontalLayout_2.addItem(spacerItem4)
self.gridLayout.addLayout(self.horizontalLayout_2, 12, 3, 1, 1)
self.forest_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.forest_lineEdit.setObjectName("forest_lineEdit")
self.gridLayout.addWidget(self.forest_lineEdit, 6, 3, 1, 1)
self.forest_Button = QtWidgets.QToolButton(self.centralwidget)
self.forest_Button.setObjectName("forest_Button")
self.gridLayout.addWidget(self.forest_Button, 6, 4, 1, 1)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 546, 26))
self.menubar.setGeometry(QtCore.QRect(0, 0, 546, 21))
self.menubar.setDefaultUp(False)
self.menubar.setObjectName("menubar")
self.menuFile = QtWidgets.QMenu(self.menubar)
Expand Down Expand Up @@ -181,23 +193,25 @@ def setupUi(self, MainWindow):
def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "Flow-Py"))
self.forest_Label.setText(_translate("MainWindow", "Forest"))
self.label.setText(_translate("MainWindow", "Output Format"))
self.wDir_Button.setText(_translate("MainWindow", "..."))
self.Release_Button.setText(_translate("MainWindow", "..."))
self.calc_Button.setText(_translate("MainWindow", "Calculate"))
self.infra_Button.setText(_translate("MainWindow", "..."))
self.wDir_Button.setText(_translate("MainWindow", "..."))
self.release_label.setText(_translate("MainWindow", "Release Layer"))
self.wDir_label.setText(_translate("MainWindow", "Working Directory"))
self.infra_Button.setText(_translate("MainWindow", "..."))
self.DEM_Button.setText(_translate("MainWindow", "..."))
self.label_7.setText(_translate("MainWindow", "alpha"))
self.label_6.setText(_translate("MainWindow", "exp "))
self.label_2.setText(_translate("MainWindow", "Parameters"))
self.outputBox.setItemText(0, _translate("MainWindow", ".tif"))
self.outputBox.setItemText(1, _translate("MainWindow", ".asc"))
self.infra_label.setText(_translate("MainWindow", "Infrastructure"))
self.DEM_label.setText(_translate("MainWindow", "DEM Layer"))
self.infra_label.setText(_translate("MainWindow", "Infrastructure"))
self.label_2.setText(_translate("MainWindow", "Parameters"))
self.label_4.setText(_translate("MainWindow", "flux "))
self.label_3.setText(_translate("MainWindow", "max_z"))
self.outputBox.setItemText(0, _translate("MainWindow", ".tif"))
self.outputBox.setItemText(1, _translate("MainWindow", ".asc"))
self.forest_Button.setText(_translate("MainWindow", "..."))
self.menuFile.setTitle(_translate("MainWindow", "File"))
self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar"))
self.actionSave.setText(_translate("MainWindow", "Save"))
Expand All @@ -213,4 +227,3 @@ def retranslateUi(self, MainWindow):
ui.setupUi(MainWindow)
MainWindow.show()
sys.exit(app.exec_())

Loading