Merge branch 'master' of github.com:TUM-I5/SWE

src/examples/swe_opengl.cpp

@@ -34,6 +34,8 @@
 #define SCREEN_WIDTH 800
 #define SCREEN_HEIGHT 600
 #define WINDOW_TITLE "Shallow Water Equations v1.3"
+#define GRID_XSIZE 401
+#define GRID_YSIZE 401
 
 /**
 	Main routine.

src/opengl/controller.cpp

@@ -286,7 +286,7 @@ bool Controller::handleKeyPress( SDL_keysym *keysym) {
 					simulationArea[2] = -2750000;
 					simulationArea[3] = 8840000;
 					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",
 				            (float) 28800., simulationArea);
 				}
@@ -308,7 +308,7 @@ bool Controller::handleKeyPress( SDL_keysym *keysym) {
 					simulationArea[2] = -2265000;
 					simulationArea[3] = 1870000;
 					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",
 				            (float) 28800., simulationArea);
 				}

src/opengl/shader.cpp

@@ -18,6 +18,8 @@
 // along with SWE_CUDA.  If not, see <http://www.gnu.org/licenses/>.
 // =====================================================================
 
+#include <unistd.h>
+
 #include "shader.h"
 
 #include "tools/Logger.hh"

src/opengl/text.h

@@ -20,6 +20,8 @@
 #ifndef TEXT_H
 #define TEXT_H
 
+#include <unistd.h>
+
 #include <cmath>
 #include <string>
 #include <vector>

swe_solvers @ 47999975

-Subproject commit 9f7fe2f2ebc31a9c9e68583232748fb5de7dba18
+Subproject commit 479999755e660f1969c294fe6cb68615d140ea19