Skip to content

S
SWE
Commit b4de84cf authored by Sebastian Rettenberger's avatar Sebastian Rettenberger
Browse files
Options

Use smaller grid for visualization

parent 29bafe20
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
src/examples/swe_opengl.cpp
View file @ b4de84cf
...@@ -33,7 +33,14 @@ ...@@ -33,7 +33,14 @@
// Display settings // Display settings
#define SCREEN_WIDTH 800 #define SCREEN_WIDTH 800
#define SCREEN_HEIGHT 600 #define SCREEN_HEIGHT 600
<<<<<<< Updated upstream
#define WINDOW_TITLE "Shallow Water Equations v1.3" #define WINDOW_TITLE "Shallow Water Equations v1.3"
=======
// Number of nodes (not cells) of grid
#define GRID_XSIZE 401
#define GRID_YSIZE 401
#define WINDOW_TITLE "Shallow Water Equations v1.2"
>>>>>>> Stashed changes
/** /**
Main routine. Main routine.
......
src/opengl/controller.cpp
View file @ b4de84cf
...@@ -286,7 +286,7 @@ bool Controller::handleKeyPress( SDL_keysym *keysym) { ...@@ -286,7 +286,7 @@ bool Controller::handleKeyPress( SDL_keysym *keysym) {
simulationArea[2] = -2750000; simulationArea[2] = -2750000;
simulationArea[3] = 8840000; simulationArea[3] = 8840000;
scenarios[5] = new SWE_AsagiScenario( scenarios[5] = new SWE_AsagiScenario(
ASAGI_INPUT_DIR "chile_gebco_usgs_500m_bath.nc", ASAGI_INPUT_DIR "chile_gebco_usgs_2000m_bath.nc",
ASAGI_INPUT_DIR "chile_gebco_usgs_500m_displ.nc", ASAGI_INPUT_DIR "chile_gebco_usgs_500m_displ.nc",
(float) 28800., simulationArea); (float) 28800., simulationArea);
} }
...@@ -308,7 +308,7 @@ bool Controller::handleKeyPress( SDL_keysym *keysym) { ...@@ -308,7 +308,7 @@ bool Controller::handleKeyPress( SDL_keysym *keysym) {
simulationArea[2] = -2265000; simulationArea[2] = -2265000;
simulationArea[3] = 1870000; simulationArea[3] = 1870000;
scenarios[6] = new SWE_AsagiScenario( scenarios[6] = new SWE_AsagiScenario(
ASAGI_INPUT_DIR "chile_gebco_usgs_500m_bath.nc", ASAGI_INPUT_DIR "chile_gebco_usgs_2000m_bath.nc",
ASAGI_INPUT_DIR "chile_gebco_usgs_500m_displ.nc", ASAGI_INPUT_DIR "chile_gebco_usgs_500m_displ.nc",
(float) 28800., simulationArea); (float) 28800., simulationArea);
} }
......
swe_solvers @ 47999975
Subproject commit 9f7fe2f2ebc31a9c9e68583232748fb5de7dba18 Subproject commit 479999755e660f1969c294fe6cb68615d140ea19
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment