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.

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

Master to SubsurfaceGUI #1

Open
wants to merge 39 commits into
base: subsurfaceGUI-clbc
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
8914c2a
Disabling some hydrodynamic parameters -- customer request
jorbs Jan 24, 2016
b4b8fd3
Merge branch 'develop' into release-0.1
jorbs Jan 24, 2016
83ee84f
Merge branch 'develop' into release-0.1
jorbs Jan 24, 2016
f43ecbc
Disabling unstructured grid generation
jorbs Jan 24, 2016
a62301f
Merge branch 'develop' into release-0.1
jorbs Jan 24, 2016
e626235
Merge branch 'develop' into release-0.1
jorbs Jan 26, 2016
4105281
Merge branch 'develop' into release-0.1
jorbs Jan 26, 2016
8c024c5
Merge branch 'develop' into release-0.1
jorbs Jan 27, 2016
da80f1a
Merge branch 'develop' into release-0.1
jorbs Jan 27, 2016
17202fb
Merge branch 'develop' into release-0.1
jorbs Jan 28, 2016
c347600
Merge branch 'develop' into release-0.1
jorbs Jan 29, 2016
e06bf67
Merge branch 'develop' into release-0.1
jorbs Jan 29, 2016
51a90b5
Merge branch 'develop' into release-0.1
jorbs Jan 29, 2016
8418801
Merge branch 'develop' into release-0.1
jorbs Feb 1, 2016
504937c
Merge branch 'develop' into release-0.1
jorbs Feb 2, 2016
c5b8e23
Merge branch 'develop' into release-0.1
jorbs Feb 3, 2016
3f01ffe
Merge branch 'develop' into release-0.1
jorbs Feb 9, 2016
ce7e4a2
Merge branch 'develop' into release-0.1
jorbs Feb 11, 2016
acab757
Merge branch 'develop' into release-0.1
jorbs Feb 17, 2016
c345571
Merge branch 'develop' into release-0.1
jorbs Feb 17, 2016
de87812
Merge branch 'develop' into release-0.1
Feb 18, 2016
1acab39
Merge branch 'develop' into release-0.1
Feb 19, 2016
bcbd206
Merge branch 'develop' into release-0.1
Feb 21, 2016
f48e0b2
Merge branch 'develop' into release-0.1
Feb 25, 2016
09a036a
Merge branch 'develop' into release-0.1
Mar 2, 2016
a98fa0e
Merge branch 'develop' into release-0.1
Apr 8, 2016
46fe4e1
Merge branch 'release-0.1'
Apr 14, 2016
c85738c
Merge branch 'develop' into release-0.2
May 3, 2016
d3c7b36
Refactoring nullptr usages in boolean expressions
May 3, 2016
9ff6e00
Populating vertical header properly in time series table
May 3, 2016
88a44d2
Merge branch 'develop' into release-0.2
May 3, 2016
a6eff43
Merge branch 'develop' into release-0.2
May 9, 2016
f062165
Merge branch 'develop' into release-0.2
May 11, 2016
a3a3298
Merge branch 'develop' into release-0.2
jorbs May 13, 2016
3510626
Merge branch 'develop' into release-0.2
jorbs Jul 2, 2016
88387d1
Bumping version 0.2
jorbs Jul 5, 2016
4d594a9
Merge branch 'release-0.2'
jorbs Jul 5, 2016
d271469
Create README.md
jorbs Nov 20, 2018
a55dd22
Updating README
Nov 20, 2018
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
30 changes: 30 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Description

IPH-ECO is a water quality simulation model. It's core algorithm was built in Fortran and its UI uses Qt/C++ and VTK library. The application has three main phases described below.

## Input

- Structured and unstructured mesh generation
- Hydrodynamic data
- Mesh specific data
- Water quality data
- Meteorological data

## Processing

The application uses a simulation manager UI where the user can start/resume/stop model simulations. Internally, each simulation corresponds to a thread.

## Output

After the processing phase, the user can view the generated data by model in form of:

- Charts
- Graphical report (vectorized or 3d-point)

## Setup

Install CMake and run `cmake .` on the project folder.

## Screenshots

Please check the `screenshots` folder.
8 changes: 4 additions & 4 deletions include/application/version.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#ifndef VERSION_H
#define VERSION_H

#define VER_FILEVERSION 0,1
#define VER_FILEVERSION_STR "0.1\0"
#define VER_FILEVERSION 0,2
#define VER_FILEVERSION_STR "0.2\0"

#define VER_PRODUCTVERSION 0,1
#define VER_PRODUCTVERSION_STR "0.1\0"
#define VER_PRODUCTVERSION 0,2
#define VER_PRODUCTVERSION_STR "0.2\0"

#define VER_COMPANYNAME_STR "IPH/UFRGS"
#define VER_FILEDESCRIPTION_STR "IPH-ECO"
Expand Down
14 changes: 7 additions & 7 deletions resources/data/hydrodynamic_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@
"targetParameter": "windDragConstant"
},
{
"checkable": true,
"checkable": false,
"checked": false,
"label": "Linear function",
"name": "windDragLinearFunction",
Expand Down Expand Up @@ -893,23 +893,23 @@
"targetParameter": "zeroEquationModel"
},
{
"checkable": true,
"checkable": false,
"checked": false,
"label": "Generic Length Scale Model",
"name": "genericLengthScaleModel",
"parentName": "iVTurb",
"targetParameter": "genericLengthScaleModel"
},
{
"checkable": true,
"checkable": false,
"checked": false,
"label": "Mellor and Yamada Turbulence Model",
"name": "mellorAndYamadaTurbulenceModel",
"parentName": "iVTurb",
"targetParameter": "mellorAndYamadaTurbulenceModel"
},
{
"checkable": true,
"checkable": false,
"checked": false,
"label": "ELCOM Mixing Model",
"name": "elcomMixingModel",
Expand Down Expand Up @@ -948,15 +948,15 @@
"targetParameter": "eulerianLagrangianMethod"
},
{
"checkable": true,
"checkable": false,
"checked": false,
"label": "Second Order MUSCL Method",
"name": "secondOrderMusclMethod",
"parentName": "iConv",
"targetParameter": "secondOrderMusclMethod"
},
{
"checkable": true,
"checkable": false,
"checked": false,
"label": "High-order ENO/WENO Method",
"name": "highOrderEnoWenoMethod",
Expand Down Expand Up @@ -987,7 +987,7 @@
"targetParameter": "iBarot"
},
{
"checkable": true,
"checkable": false,
"checked": false,
"label": "Non-hydrostatic pressure",
"name": "iNonHydro",
Expand Down
Binary file added screenshots/chart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/grid-data.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/hydro-configuration-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/hydro-configuration-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/hydro-configuration-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/mesh-generation.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/meteorological.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/simulation-creation.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/simulation-manager.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/simulation-output.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/simulation-result.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/wq-configuration-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/wq-configuration-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/wq-configuration-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/wq-configuration-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/ui/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ MainWindow::MainWindow(QWidget *parent) :
appSettings = new QSettings(QApplication::organizationName(), QApplication::applicationName(), this);
readSettings();
updateRecentFilesActionList();
ui->actionWaterQuality->setEnabled(false);
ui->actionUnstructuredMeshGeneration->setEnabled(false);
}

MainWindow::~MainWindow() {
Expand Down
3 changes: 3 additions & 0 deletions src/ui/new_project_dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@
</item>
<item>
<widget class="QCheckBox" name="cbxWaterQuality">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Water Quality</string>
</property>
Expand Down
3 changes: 3 additions & 0 deletions src/ui/project_properties_dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@
</item>
<item>
<widget class="QCheckBox" name="cbxWaterQuality">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Water Quality</string>
</property>
Expand Down