From fd19124693bb32835ad97802ba1950cd5202dbd2 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Tue, 9 Apr 2024 22:31:21 -0400 Subject: fix off by one bug --- cmake-build-debug/.ninja_deps | Bin 354420 -> 432876 bytes cmake-build-debug/.ninja_log | 40 ++++++++++++++++ .../CMakeFiles/ocean_autogen.dir/ParseCache.txt | 52 +++++++++++---------- cmake-build-debug/Testing/Temporary/LastTest.log | 4 +- cmake-build-debug/ocean | Bin 3651736 -> 3653576 bytes src/ocean/ocean.cpp | 6 +-- src/ocean/ocean.h | 2 +- 7 files changed, 73 insertions(+), 31 deletions(-) diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps index 54d72aa..11a6261 100644 Binary files a/cmake-build-debug/.ninja_deps and b/cmake-build-debug/.ninja_deps differ diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index ca7c9b3..2ff6c7d 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -58,3 +58,43 @@ 11 47 1712646787554952904 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 51 854 1712646788356522456 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba 854 1004 1712646788509088056 ocean eca130e609b98269 +88 1422 1712715797424290000 ocean_autogen/timestamp 43dd0284b7c480b9 +88 1422 1712715797424290000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +88 1422 1712715797424290000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +88 1422 1712715797424290000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1423 2210 1712715798215433332 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +1422 2998 1712715798999456279 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +1423 3021 1712715799024343360 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +1423 3024 1712715799027713252 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +1423 3028 1712715799031918356 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +1423 3402 1712715799403561603 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +3402 3503 1712715799513316853 ocean eca130e609b98269 +15 1312 1712715838625175000 ocean_autogen/timestamp 43dd0284b7c480b9 +15 1312 1712715838625175000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +15 1312 1712715838625175000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +15 1312 1712715838625175000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1314 2164 1712715839481630360 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +1313 2954 1712715840266979730 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +1313 2960 1712715840275123812 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +1313 2975 1712715840290086219 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +1313 2976 1712715840289858843 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +1313 3382 1712715840696699765 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +3382 3474 1712715840794772582 ocean eca130e609b98269 +30 63 1712716160129419789 ocean_autogen/timestamp 43dd0284b7c480b9 +30 63 1712716160129419789 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +30 63 1712716160129419789 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +30 63 1712716160129419789 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +68 871 1712716160932842498 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +871 972 1712716161034325998 ocean eca130e609b98269 +12 45 1712716207484590175 ocean_autogen/timestamp 43dd0284b7c480b9 +12 45 1712716207484590175 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 45 1712716207484590175 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 45 1712716207484590175 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +49 781 1712716208216694199 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +781 876 1712716208312748172 ocean eca130e609b98269 +12 46 1712716249892702226 ocean_autogen/timestamp 43dd0284b7c480b9 +12 46 1712716249892702226 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 46 1712716249892702226 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 46 1712716249892702226 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +50 779 1712716250622023611 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +779 875 1712716250719167173 ocean eca130e609b98269 diff --git a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt index 2525b05..a95578a 100644 --- a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt +++ b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt @@ -1,12 +1,14 @@ # Generated by CMake. Changes will be overwritten. -/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/util/tiny_obj_loader.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h +/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/graphicsdebug.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/graphicsdebug.h +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.h +/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h + mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/moc_predefs.h mdp:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/Availability.h mdp:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/AvailabilityInternal.h @@ -1067,9 +1069,11 @@ mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/Eigen/src/plugins/ReshapedMethods.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/glew/include/GL/glew.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.h + mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h + mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/util/unsupportedeigenthing/OpenGLSupport mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/Headers/QtConcurrent mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/Headers/QtConcurrentDepends @@ -1379,21 +1383,25 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h /Users/sotech117/Documents/final/adv/ocean-simulation/src/main.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h +/Users/sotech117/Documents/final/adv/ocean-simulation/util/tiny_obj_loader.h +/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h + mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/moc_predefs.h mdp:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/Availability.h mdp:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/AvailabilityInternal.h @@ -2454,10 +2462,10 @@ mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/Eigen/src/plugins/ReshapedMethods.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/glew/include/GL/glew.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.h - mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h + mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/util/unsupportedeigenthing/OpenGLSupport mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/Headers/QtConcurrent mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/Headers/QtConcurrentDepends @@ -2767,19 +2775,13 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/graphicsdebug.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/graphicsdebug.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.cpp +/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h +/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.h diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 493a17b..edae230 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Apr 09 03:13 EDT +Start testing: Apr 09 22:30 EDT ---------------------------------------------------------- -End testing: Apr 09 03:13 EDT +End testing: Apr 09 22:30 EDT diff --git a/cmake-build-debug/ocean b/cmake-build-debug/ocean index 3d40e48..4d90e47 100755 Binary files a/cmake-build-debug/ocean and b/cmake-build-debug/ocean differ diff --git a/src/ocean/ocean.cpp b/src/ocean/ocean.cpp index 1b0e23c..eabaa8e 100644 --- a/src/ocean/ocean.cpp +++ b/src/ocean/ocean.cpp @@ -140,8 +140,8 @@ int ocean::k_index_to_negative_k_index int x = k_index % length; int z = k_index / length; - int x_neg = length - x; - int z_neg = width - z; + int x_neg = length - x - 1; + int z_neg = width - z - 1; return z_neg * length + x_neg; } @@ -234,7 +234,7 @@ std::vector ocean::get_vertices() //if (i < length) double amplitude = current_h[i].first; - if (i < length) amplitude = initial_h[i].first; + // if (i < length) amplitude = initial_h[i].first; //if (i==2) std::cout << amplitude << std::endl; diff --git a/src/ocean/ocean.h b/src/ocean/ocean.h index faa0fb2..a576c44 100644 --- a/src/ocean/ocean.h +++ b/src/ocean/ocean.h @@ -27,7 +27,7 @@ private: const int width = 32; // width of grid const int N = length * width; // total number of grid points - const double A = 100; // numeric constant for the Phillips spectrum + const double A = 10; // numeric constant for the Phillips spectrum const double V = 5.0; // wind speed const std::pair omega_wind = std::make_pair(1.0, 0.0); // wind direction -- cgit v1.2.3-70-g09d2