From 9e6800c484d9e0a58a625fef26bbae6f71150035 Mon Sep 17 00:00:00 2001 From: Saveliy Date: Wed, 1 Nov 2023 19:20:13 +0300 Subject: [PATCH] fix CMake --- .gitignore | 1 - CMakeLists.txt | 7 +- PlotScript/src/Release/sample.exe | Bin 0 -> 37376 bytes gtest/CMakeLists.txt | 10 +- samples/CMakeLists.txt | 9 +- samples/sample.cpp | 4 +- sln/FDTD.sln | 96 +++++++ sln/FDTD/FDTD.sln | 61 ----- sln/FDTD/FDTD.vcxproj | 282 +++++++++++++++++++++ sln/FDTD/FDTD.vcxproj.filters | 24 ++ sln/FDTD/FDTD/FDTD.vcxproj | 158 ------------ sln/FDTD/FDTD/FDTD.vcxproj.filters | 27 -- sln/FDTD/gtest/gtest.vcxproj | 154 ------------ sln/FDTD/gtest/gtest.vcxproj.filters | 27 -- sln/FDTD/sample/sample.vcxproj | 176 ------------- sln/FDTD/sample/sample.vcxproj.filters | 22 -- sln/FDTD/tests/tests.vcxproj | 163 ------------ sln/FDTD/tests/tests.vcxproj.filters | 22 -- sln/gtest/gtest.vcxproj | 281 +++++++++++++++++++++ sln/gtest/gtest.vcxproj.filters | 16 ++ sln/samples/sample.vcxproj | 331 ++++++++++++++++++++++++ sln/samples/sample.vcxproj.filters | 27 ++ sln/tests/FDTD_test.vcxproj | 334 +++++++++++++++++++++++++ sln/tests/FDTD_test.vcxproj.filters | 19 ++ src/FDTD.cpp | 17 +- test/CMakeLists.txt | 6 + 26 files changed, 1455 insertions(+), 819 deletions(-) create mode 100644 PlotScript/src/Release/sample.exe create mode 100644 sln/FDTD.sln delete mode 100644 sln/FDTD/FDTD.sln create mode 100644 sln/FDTD/FDTD.vcxproj create mode 100644 sln/FDTD/FDTD.vcxproj.filters delete mode 100644 sln/FDTD/FDTD/FDTD.vcxproj delete mode 100644 sln/FDTD/FDTD/FDTD.vcxproj.filters delete mode 100644 sln/FDTD/gtest/gtest.vcxproj delete mode 100644 sln/FDTD/gtest/gtest.vcxproj.filters delete mode 100644 sln/FDTD/sample/sample.vcxproj delete mode 100644 sln/FDTD/sample/sample.vcxproj.filters delete mode 100644 sln/FDTD/tests/tests.vcxproj delete mode 100644 sln/FDTD/tests/tests.vcxproj.filters create mode 100644 sln/gtest/gtest.vcxproj create mode 100644 sln/gtest/gtest.vcxproj.filters create mode 100644 sln/samples/sample.vcxproj create mode 100644 sln/samples/sample.vcxproj.filters create mode 100644 sln/tests/FDTD_test.vcxproj create mode 100644 sln/tests/FDTD_test.vcxproj.filters diff --git a/.gitignore b/.gitignore index dfcfd56..60e6720 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ mono_crash.* # Build results [Dd]ebug/ [Dd]ebugPublic/ -[Rr]elease/ [Rr]eleases/ x64/ x86/ diff --git a/CMakeLists.txt b/CMakeLists.txt index b2cd53c..816230e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,4 +8,9 @@ include_directories(include gtest) add_subdirectory(include) add_subdirectory(samples) add_subdirectory(test) -add_subdirectory(gtest) \ No newline at end of file +add_subdirectory(gtest) + +set_target_properties(FDTD PROPERTIES + FOLDER "sln") + +configure_file(${CMAKE_SOURCE_DIR}/FDTD.sln ${CMAKE_BINARY_DIR}/sln/FDTD.sln COPYONLY) \ No newline at end of file diff --git a/PlotScript/src/Release/sample.exe b/PlotScript/src/Release/sample.exe new file mode 100644 index 0000000000000000000000000000000000000000..a068aa4bf9b0f2dc1476012d8af579c859aba5cf GIT binary patch literal 37376 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 z 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 literal 0 HcmV?d00001 diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt index 36997aa..e6793e1 100644 --- a/gtest/CMakeLists.txt +++ b/gtest/CMakeLists.txt @@ -8,4 +8,12 @@ if((${CMAKE_CXX_COMPILER_ID} MATCHES "GNU" OR set(pthread "-pthread") endif() -target_link_libraries(${target} ${pthread}) \ No newline at end of file +add_compile_options(/wd4996) + +target_link_libraries(${target} ${pthread}) + +set_target_properties(${target} PROPERTIES + FOLDER "sln") + +configure_file(${CMAKE_SOURCE_DIR}/gtest/gtest.vcxproj ${CMAKE_BINARY_DIR}/sln/gtest/gtest.vcxproj COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/gtest/gtest.vcxproj.filters ${CMAKE_BINARY_DIR}/sln/gtest/gtest.vcxproj.filters COPYONLY) \ No newline at end of file diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 77f5bcc..d394f47 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -1,4 +1,11 @@ file(GLOB hdrs "*.h*" "../include/*.h") file(GLOB srcs "*.cpp" "../src/*.cpp") -add_executable(FDTD ${srcs} ${hdrs}) +add_executable(sample ${srcs} ${hdrs}) +set_target_properties(sample PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/PlotScript/src") + +set_target_properties(sample PROPERTIES + FOLDER "sln") + +configure_file(${CMAKE_SOURCE_DIR}/samples/sample.vcxproj ${CMAKE_BINARY_DIR}/sln/samples/sample.vcxproj COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/samples/sample.vcxproj.filters ${CMAKE_BINARY_DIR}/sln/samples/sample.vcxproj.filters COPYONLY) \ No newline at end of file diff --git a/samples/sample.cpp b/samples/sample.cpp index c655f53..43fd8fa 100644 --- a/samples/sample.cpp +++ b/samples/sample.cpp @@ -106,7 +106,7 @@ double max_abs_error_x(Field& this_field, int size_N[2], double size_x[2], doubl int j = 0; for (int i = 0; i < this_field.get_Ni(); ++i, x += size_d[0]) { - double this_n = fabs(this_field(i, j) - sign * sin(2.0 * M_PI * (x - size_x[0] - FDTD_Const::C * t) / (size_x[1] - size_x[0]))); + double this_n = fabs(sign * this_field(i, j) - sin(2.0 * M_PI * (x - size_x[0] - FDTD_Const::C * t) / (size_x[1] - size_x[0]))); if (this_n > extr_n) extr_n = this_n; } @@ -119,7 +119,7 @@ double max_abs_error_y(Field& this_field, int size_N[2], double size_y[2], doubl int i = 0; for (int j = 0; j < this_field.get_Nj(); ++j, y += size_d[1]) { - double this_n = fabs(this_field(i, j) - sign * sin(2.0 * M_PI * (y - size_y[0] - FDTD_Const::C * t) / (size_y[1] - size_y[0]))); + double this_n = fabs(sign * this_field(i, j) - sin(2.0 * M_PI * (y - size_y[0] - FDTD_Const::C * t) / (size_y[1] - size_y[0]))); if (this_n > extr_n) extr_n = this_n; } diff --git a/sln/FDTD.sln b/sln/FDTD.sln new file mode 100644 index 0000000..3afa521 --- /dev/null +++ b/sln/FDTD.sln @@ -0,0 +1,96 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{59D02B1D-55B8-3DB8-9515-97EB63E56A31}" + ProjectSection(ProjectDependencies) = postProject + {F08A1823-B3B2-357E-988D-41023F3918E4} = {F08A1823-B3B2-357E-988D-41023F3918E4} + {39E4FCC4-A034-3B5C-8B3F-356919E55680} = {39E4FCC4-A034-3B5C-8B3F-356919E55680} + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} = {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7} = {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7} + {0AF53429-B9B1-3C84-9836-4D808277580E} = {0AF53429-B9B1-3C84-9836-4D808277580E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FDTD", "include\FDTD.vcxproj", "{F08A1823-B3B2-357E-988D-41023F3918E4}" + ProjectSection(ProjectDependencies) = postProject + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} = {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FDTD_test", "test\FDTD_test.vcxproj", "{39E4FCC4-A034-3B5C-8B3F-356919E55680}" + ProjectSection(ProjectDependencies) = postProject + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} = {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7} = {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "ZERO_CHECK.vcxproj", "{F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest\gtest.vcxproj", "{F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}" + ProjectSection(ProjectDependencies) = postProject + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} = {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample", "samples\sample.vcxproj", "{0AF53429-B9B1-3C84-9836-4D808277580E}" + ProjectSection(ProjectDependencies) = postProject + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} = {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + MinSizeRel|x64 = MinSizeRel|x64 + RelWithDebInfo|x64 = RelWithDebInfo|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {59D02B1D-55B8-3DB8-9515-97EB63E56A31}.Debug|x64.ActiveCfg = Debug|x64 + {59D02B1D-55B8-3DB8-9515-97EB63E56A31}.Release|x64.ActiveCfg = Release|x64 + {59D02B1D-55B8-3DB8-9515-97EB63E56A31}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {59D02B1D-55B8-3DB8-9515-97EB63E56A31}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {F08A1823-B3B2-357E-988D-41023F3918E4}.Debug|x64.ActiveCfg = Debug|x64 + {F08A1823-B3B2-357E-988D-41023F3918E4}.Debug|x64.Build.0 = Debug|x64 + {F08A1823-B3B2-357E-988D-41023F3918E4}.Release|x64.ActiveCfg = Release|x64 + {F08A1823-B3B2-357E-988D-41023F3918E4}.Release|x64.Build.0 = Release|x64 + {F08A1823-B3B2-357E-988D-41023F3918E4}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {F08A1823-B3B2-357E-988D-41023F3918E4}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {F08A1823-B3B2-357E-988D-41023F3918E4}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {F08A1823-B3B2-357E-988D-41023F3918E4}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {39E4FCC4-A034-3B5C-8B3F-356919E55680}.Debug|x64.ActiveCfg = Debug|x64 + {39E4FCC4-A034-3B5C-8B3F-356919E55680}.Debug|x64.Build.0 = Debug|x64 + {39E4FCC4-A034-3B5C-8B3F-356919E55680}.Release|x64.ActiveCfg = Release|x64 + {39E4FCC4-A034-3B5C-8B3F-356919E55680}.Release|x64.Build.0 = Release|x64 + {39E4FCC4-A034-3B5C-8B3F-356919E55680}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {39E4FCC4-A034-3B5C-8B3F-356919E55680}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {39E4FCC4-A034-3B5C-8B3F-356919E55680}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {39E4FCC4-A034-3B5C-8B3F-356919E55680}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}.Debug|x64.ActiveCfg = Debug|x64 + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}.Debug|x64.Build.0 = Debug|x64 + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}.Release|x64.ActiveCfg = Release|x64 + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}.Release|x64.Build.0 = Release|x64 + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}.Debug|x64.ActiveCfg = Debug|x64 + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}.Debug|x64.Build.0 = Debug|x64 + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}.Release|x64.ActiveCfg = Release|x64 + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}.Release|x64.Build.0 = Release|x64 + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {0AF53429-B9B1-3C84-9836-4D808277580E}.Debug|x64.ActiveCfg = Debug|x64 + {0AF53429-B9B1-3C84-9836-4D808277580E}.Debug|x64.Build.0 = Debug|x64 + {0AF53429-B9B1-3C84-9836-4D808277580E}.Release|x64.ActiveCfg = Release|x64 + {0AF53429-B9B1-3C84-9836-4D808277580E}.Release|x64.Build.0 = Release|x64 + {0AF53429-B9B1-3C84-9836-4D808277580E}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {0AF53429-B9B1-3C84-9836-4D808277580E}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {0AF53429-B9B1-3C84-9836-4D808277580E}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {0AF53429-B9B1-3C84-9836-4D808277580E}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {15C4505B-94F7-33A9-AAA1-BCCD44AA457F} + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/sln/FDTD/FDTD.sln b/sln/FDTD/FDTD.sln deleted file mode 100644 index cdb51ac..0000000 --- a/sln/FDTD/FDTD.sln +++ /dev/null @@ -1,61 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.33529.622 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FDTD", "FDTD\FDTD.vcxproj", "{82176A15-3784-4024-A6A0-2E5BFEA97A2A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample", "sample\sample.vcxproj", "{FAE6E121-E249-4856-9F83-119491DBA42E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest\gtest.vcxproj", "{CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\tests.vcxproj", "{E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {82176A15-3784-4024-A6A0-2E5BFEA97A2A}.Debug|x64.ActiveCfg = Debug|x64 - {82176A15-3784-4024-A6A0-2E5BFEA97A2A}.Debug|x64.Build.0 = Debug|x64 - {82176A15-3784-4024-A6A0-2E5BFEA97A2A}.Debug|x86.ActiveCfg = Debug|Win32 - {82176A15-3784-4024-A6A0-2E5BFEA97A2A}.Debug|x86.Build.0 = Debug|Win32 - {82176A15-3784-4024-A6A0-2E5BFEA97A2A}.Release|x64.ActiveCfg = Release|x64 - {82176A15-3784-4024-A6A0-2E5BFEA97A2A}.Release|x64.Build.0 = Release|x64 - {82176A15-3784-4024-A6A0-2E5BFEA97A2A}.Release|x86.ActiveCfg = Release|Win32 - {82176A15-3784-4024-A6A0-2E5BFEA97A2A}.Release|x86.Build.0 = Release|Win32 - {FAE6E121-E249-4856-9F83-119491DBA42E}.Debug|x64.ActiveCfg = Debug|x64 - {FAE6E121-E249-4856-9F83-119491DBA42E}.Debug|x64.Build.0 = Debug|x64 - {FAE6E121-E249-4856-9F83-119491DBA42E}.Debug|x86.ActiveCfg = Debug|Win32 - {FAE6E121-E249-4856-9F83-119491DBA42E}.Debug|x86.Build.0 = Debug|Win32 - {FAE6E121-E249-4856-9F83-119491DBA42E}.Release|x64.ActiveCfg = Release|x64 - {FAE6E121-E249-4856-9F83-119491DBA42E}.Release|x64.Build.0 = Release|x64 - {FAE6E121-E249-4856-9F83-119491DBA42E}.Release|x86.ActiveCfg = Release|Win32 - {FAE6E121-E249-4856-9F83-119491DBA42E}.Release|x86.Build.0 = Release|Win32 - {CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}.Debug|x64.ActiveCfg = Debug|x64 - {CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}.Debug|x64.Build.0 = Debug|x64 - {CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}.Debug|x86.ActiveCfg = Debug|Win32 - {CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}.Debug|x86.Build.0 = Debug|Win32 - {CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}.Release|x64.ActiveCfg = Release|x64 - {CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}.Release|x64.Build.0 = Release|x64 - {CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}.Release|x86.ActiveCfg = Release|Win32 - {CD55AC1F-1ACF-40C4-8FB0-49A9F368257D}.Release|x86.Build.0 = Release|Win32 - {E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}.Debug|x64.ActiveCfg = Debug|x64 - {E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}.Debug|x64.Build.0 = Debug|x64 - {E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}.Debug|x86.ActiveCfg = Debug|Win32 - {E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}.Debug|x86.Build.0 = Debug|Win32 - {E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}.Release|x64.ActiveCfg = Release|x64 - {E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}.Release|x64.Build.0 = Release|x64 - {E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}.Release|x86.ActiveCfg = Release|Win32 - {E4B28467-3A4B-4BB5-BE2A-B79D57B9A8D7}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {8E50F9FD-B048-4FB3-80B8-380CCC12DB7A} - EndGlobalSection -EndGlobal diff --git a/sln/FDTD/FDTD.vcxproj b/sln/FDTD/FDTD.vcxproj new file mode 100644 index 0000000..3c22349 --- /dev/null +++ b/sln/FDTD/FDTD.vcxproj @@ -0,0 +1,282 @@ + + + + x64 + + + + Debug + x64 + + + Release + x64 + + + MinSizeRel + x64 + + + RelWithDebInfo + x64 + + + + {F08A1823-B3B2-357E-988D-41023F3918E4} + Win32Proj + 10.0.19041.0 + x64 + FDTD + NoUpgrade + + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\Debug\ + FDTD.dir\Debug\ + FDTD + .lib + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\Release\ + FDTD.dir\Release\ + FDTD + .lib + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\MinSizeRel\ + FDTD.dir\MinSizeRel\ + FDTD + .lib + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\RelWithDebInfo\ + FDTD.dir\RelWithDebInfo\ + FDTD + .lib + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + EnableFastChecks + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;CMAKE_INTDIR="Debug" + $(IntDir) + + + %(PreprocessorDefinitions);WIN32;_DEBUG;_WINDOWS;CMAKE_INTDIR=\"Debug\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) /machine:x64 + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release" + $(IntDir) + + + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) /machine:x64 + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + Sync + OnlyExplicitInline + MinSpace + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="MinSizeRel" + $(IntDir) + + + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"MinSizeRel\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) /machine:x64 + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + ProgramDatabase + Sync + OnlyExplicitInline + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="RelWithDebInfo" + $(IntDir) + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"RelWithDebInfo\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) /machine:x64 + + + + + Always + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/include/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/include/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\FDTD.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\FDTD.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/include/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/include/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\FDTD.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\FDTD.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/include/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/include/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\FDTD.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\FDTD.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/include/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/include/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\FDTD.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\FDTD.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include\CMakeFiles\generate.stamp + false + + + + + + + + + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + ZERO_CHECK + false + Never + + + + + + \ No newline at end of file diff --git a/sln/FDTD/FDTD.vcxproj.filters b/sln/FDTD/FDTD.vcxproj.filters new file mode 100644 index 0000000..e3e832a --- /dev/null +++ b/sln/FDTD/FDTD.vcxproj.filters @@ -0,0 +1,24 @@ + + + + + Source Files + + + + + Header Files + + + + + + + + {FCA59871-09E6-3115-8901-45BAB8889C47} + + + {71875311-627E-3DE7-802E-DE21AE181D3D} + + + diff --git a/sln/FDTD/FDTD/FDTD.vcxproj b/sln/FDTD/FDTD/FDTD.vcxproj deleted file mode 100644 index 64ab218..0000000 --- a/sln/FDTD/FDTD/FDTD.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {82176a15-3784-4024-a6a0-2e5bfea97a2a} - FDTD - 10.0 - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - ../../../include;%(AdditionalIncludeDirectories) - ..\..\..\PlotScript\src - - - false - ../../../include;%(AdditionalIncludeDirectories) - ..\..\..\PlotScript\src - - - true - ../../../include;%(AdditionalIncludeDirectories) - ..\..\..\PlotScript\src - - - false - ../../../include;%(AdditionalIncludeDirectories) - ..\..\..\PlotScript\src - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - - \ No newline at end of file diff --git a/sln/FDTD/FDTD/FDTD.vcxproj.filters b/sln/FDTD/FDTD/FDTD.vcxproj.filters deleted file mode 100644 index be785fe..0000000 --- a/sln/FDTD/FDTD/FDTD.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Файлы заголовков - - - - - Исходные файлы - - - \ No newline at end of file diff --git a/sln/FDTD/gtest/gtest.vcxproj b/sln/FDTD/gtest/gtest.vcxproj deleted file mode 100644 index c6fbecd..0000000 --- a/sln/FDTD/gtest/gtest.vcxproj +++ /dev/null @@ -1,154 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {cd55ac1f-1acf-40c4-8fb0-49a9f368257d} - gtest - 10.0 - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - 4002;4996 - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - 4002;4996 - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - 4002;4996 - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - 4002;4996 - - - Console - true - true - true - - - - - - - - - - - - \ No newline at end of file diff --git a/sln/FDTD/gtest/gtest.vcxproj.filters b/sln/FDTD/gtest/gtest.vcxproj.filters deleted file mode 100644 index a8d9b9b..0000000 --- a/sln/FDTD/gtest/gtest.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Файлы заголовков - - - - - Исходные файлы - - - \ No newline at end of file diff --git a/sln/FDTD/sample/sample.vcxproj b/sln/FDTD/sample/sample.vcxproj deleted file mode 100644 index b656542..0000000 --- a/sln/FDTD/sample/sample.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - - {82176a15-3784-4024-a6a0-2e5bfea97a2a} - - - - 16.0 - Win32Proj - {fae6e121-e249-4856-9f83-119491dba42e} - sample - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - ../../../include;%(AdditionalIncludeDirectories) - ..\..\..\PlotScript\src - - - false - ../../../include;%(AdditionalIncludeDirectories) - ..\..\..\PlotScript\src - - - true - ../../../include;%(AdditionalIncludeDirectories) - ..\..\..\PlotScript\src - - - false - ../../../include;%(AdditionalIncludeDirectories) - ..\..\..\PlotScript\src - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - \ No newline at end of file diff --git a/sln/FDTD/sample/sample.vcxproj.filters b/sln/FDTD/sample/sample.vcxproj.filters deleted file mode 100644 index 4eee03c..0000000 --- a/sln/FDTD/sample/sample.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Исходные файлы - - - \ No newline at end of file diff --git a/sln/FDTD/tests/tests.vcxproj b/sln/FDTD/tests/tests.vcxproj deleted file mode 100644 index 21ae2a5..0000000 --- a/sln/FDTD/tests/tests.vcxproj +++ /dev/null @@ -1,163 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {e4b28467-3a4b-4bb5-be2a-b79d57b9a8d7} - tests - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - ../../../gtest;../../../include;%(AdditionalIncludeDirectories) - - - false - ../../../gtest;../../../include;%(AdditionalIncludeDirectories) - - - true - ../../../gtest;../../../include;%(AdditionalIncludeDirectories) - - - false - ../../../gtest;../../../include;%(AdditionalIncludeDirectories) - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - 4002;4996 - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - 4002;4996 - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - 4002;4996 - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - 4002;4996 - - - Console - true - true - true - - - - - {82176a15-3784-4024-a6a0-2e5bfea97a2a} - - - {cd55ac1f-1acf-40c4-8fb0-49a9f368257d} - - - - - - - - - \ No newline at end of file diff --git a/sln/FDTD/tests/tests.vcxproj.filters b/sln/FDTD/tests/tests.vcxproj.filters deleted file mode 100644 index 5d42728..0000000 --- a/sln/FDTD/tests/tests.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Исходные файлы - - - \ No newline at end of file diff --git a/sln/gtest/gtest.vcxproj b/sln/gtest/gtest.vcxproj new file mode 100644 index 0000000..d153dff --- /dev/null +++ b/sln/gtest/gtest.vcxproj @@ -0,0 +1,281 @@ + + + + x64 + + + + Debug + x64 + + + Release + x64 + + + MinSizeRel + x64 + + + RelWithDebInfo + x64 + + + + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7} + Win32Proj + 10.0.19041.0 + x64 + gtest + NoUpgrade + + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\Debug\ + gtest.dir\Debug\ + gtest + .lib + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\Release\ + gtest.dir\Release\ + gtest + .lib + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\MinSizeRel\ + gtest.dir\MinSizeRel\ + gtest + .lib + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\RelWithDebInfo\ + gtest.dir\RelWithDebInfo\ + gtest + .lib + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + EnableFastChecks + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;CMAKE_INTDIR="Debug" + $(IntDir) + + + %(PreprocessorDefinitions);WIN32;_DEBUG;_WINDOWS;CMAKE_INTDIR=\"Debug\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) /machine:x64 + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release" + $(IntDir) + + + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) /machine:x64 + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + Sync + OnlyExplicitInline + MinSpace + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="MinSizeRel" + $(IntDir) + + + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"MinSizeRel\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) /machine:x64 + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + ProgramDatabase + Sync + OnlyExplicitInline + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="RelWithDebInfo" + $(IntDir) + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"RelWithDebInfo\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) /machine:x64 + + + + + Always + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/gtest/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/gtest/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\gtest.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\gtest.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/gtest/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/gtest/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\gtest.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\gtest.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/gtest/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/gtest/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\gtest.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\gtest.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/gtest/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/gtest/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\gtest.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\gtest.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest\CMakeFiles\generate.stamp + false + + + + + + + + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + ZERO_CHECK + false + Never + + + + + + \ No newline at end of file diff --git a/sln/gtest/gtest.vcxproj.filters b/sln/gtest/gtest.vcxproj.filters new file mode 100644 index 0000000..53977cb --- /dev/null +++ b/sln/gtest/gtest.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + Source Files + + + + + + + + {71875311-627E-3DE7-802E-DE21AE181D3D} + + + diff --git a/sln/samples/sample.vcxproj b/sln/samples/sample.vcxproj new file mode 100644 index 0000000..2dce6fb --- /dev/null +++ b/sln/samples/sample.vcxproj @@ -0,0 +1,331 @@ + + + + x64 + + + + Debug + x64 + + + Release + x64 + + + MinSizeRel + x64 + + + RelWithDebInfo + x64 + + + + {0AF53429-B9B1-3C84-9836-4D808277580E} + Win32Proj + 10.0.19041.0 + x64 + sample + NoUpgrade + + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + C:\Users\Савелий\Desktop\tmp\FDTD_Method\PlotScript\src\Debug\ + sample.dir\Debug\ + sample + .exe + true + true + C:\Users\Савелий\Desktop\tmp\FDTD_Method\PlotScript\src\Release\ + sample.dir\Release\ + sample + .exe + false + true + C:\Users\Савелий\Desktop\tmp\FDTD_Method\PlotScript\src\MinSizeRel\ + sample.dir\MinSizeRel\ + sample + .exe + false + true + C:\Users\Савелий\Desktop\tmp\FDTD_Method\PlotScript\src\RelWithDebInfo\ + sample.dir\RelWithDebInfo\ + sample + .exe + true + true + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + EnableFastChecks + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;CMAKE_INTDIR="Debug" + $(IntDir) + + + %(PreprocessorDefinitions);WIN32;_DEBUG;_WINDOWS;CMAKE_INTDIR=\"Debug\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + %(AdditionalOptions) /machine:x64 + true + %(IgnoreSpecificDefaultLibraries) + C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/Debug/sample.lib + C:/Users/Савелий/Desktop/tmp/FDTD_Method/PlotScript/src/Debug/sample.pdb + Console + + + false + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release" + $(IntDir) + + + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + %(AdditionalOptions) /machine:x64 + false + %(IgnoreSpecificDefaultLibraries) + C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/Release/sample.lib + C:/Users/Савелий/Desktop/tmp/FDTD_Method/PlotScript/src/Release/sample.pdb + Console + + + false + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + Sync + OnlyExplicitInline + MinSpace + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="MinSizeRel" + $(IntDir) + + + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"MinSizeRel\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + %(AdditionalOptions) /machine:x64 + false + %(IgnoreSpecificDefaultLibraries) + C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/MinSizeRel/sample.lib + C:/Users/Савелий/Desktop/tmp/FDTD_Method/PlotScript/src/MinSizeRel/sample.pdb + Console + + + false + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + ProgramDatabase + Sync + OnlyExplicitInline + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="RelWithDebInfo" + $(IntDir) + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"RelWithDebInfo\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + %(AdditionalOptions) /machine:x64 + true + %(IgnoreSpecificDefaultLibraries) + C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/RelWithDebInfo/sample.lib + C:/Users/Савелий/Desktop/tmp/FDTD_Method/PlotScript/src/RelWithDebInfo/sample.pdb + Console + + + false + + + + + Always + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\sample.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\sample.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\sample.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\sample.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\sample.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\sample.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/samples/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\sample.vcxproj;C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\sample.vcxproj.filters;%(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\samples\CMakeFiles\generate.stamp + false + + + + + + + + + + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + ZERO_CHECK + false + Never + + + + + + \ No newline at end of file diff --git a/sln/samples/sample.vcxproj.filters b/sln/samples/sample.vcxproj.filters new file mode 100644 index 0000000..1b6e54b --- /dev/null +++ b/sln/samples/sample.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + Source Files + + + Source Files + + + + + Header Files + + + + + + + + {FCA59871-09E6-3115-8901-45BAB8889C47} + + + {71875311-627E-3DE7-802E-DE21AE181D3D} + + + diff --git a/sln/tests/FDTD_test.vcxproj b/sln/tests/FDTD_test.vcxproj new file mode 100644 index 0000000..e71ba4d --- /dev/null +++ b/sln/tests/FDTD_test.vcxproj @@ -0,0 +1,334 @@ + + + + x64 + + + + Debug + x64 + + + Release + x64 + + + MinSizeRel + x64 + + + RelWithDebInfo + x64 + + + + {39E4FCC4-A034-3B5C-8B3F-356919E55680} + Win32Proj + 10.0.19041.0 + x64 + FDTD_test + NoUpgrade + + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + C:\Users\Савелий\Desktop\tmp\FDTD_Method\test\Debug\ + FDTD_test.dir\Debug\ + FDTD_test + .exe + true + true + C:\Users\Савелий\Desktop\tmp\FDTD_Method\test\Release\ + FDTD_test.dir\Release\ + FDTD_test + .exe + false + true + C:\Users\Савелий\Desktop\tmp\FDTD_Method\test\MinSizeRel\ + FDTD_test.dir\MinSizeRel\ + FDTD_test + .exe + false + true + C:\Users\Савелий\Desktop\tmp\FDTD_Method\test\RelWithDebInfo\ + FDTD_test.dir\RelWithDebInfo\ + FDTD_test + .exe + true + true + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + EnableFastChecks + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;CMAKE_INTDIR="Debug" + $(IntDir) + + + %(PreprocessorDefinitions);WIN32;_DEBUG;_WINDOWS;CMAKE_INTDIR=\"Debug\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + ..\gtest\Debug\gtest.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + %(AdditionalOptions) /machine:x64 + true + %(IgnoreSpecificDefaultLibraries) + C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/Debug/FDTD_test.lib + C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/Debug/FDTD_test.pdb + Console + + + false + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release" + $(IntDir) + + + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + ..\gtest\Release\gtest.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + %(AdditionalOptions) /machine:x64 + false + %(IgnoreSpecificDefaultLibraries) + C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/Release/FDTD_test.lib + C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/Release/FDTD_test.pdb + Console + + + false + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + Sync + OnlyExplicitInline + MinSpace + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="MinSizeRel" + $(IntDir) + + + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"MinSizeRel\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + ..\gtest\MinSizeRel\gtest.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + %(AdditionalOptions) /machine:x64 + false + %(IgnoreSpecificDefaultLibraries) + C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/MinSizeRel/FDTD_test.lib + C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/MinSizeRel/FDTD_test.pdb + Console + + + false + + + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(IntDir) + ProgramDatabase + Sync + OnlyExplicitInline + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="RelWithDebInfo" + $(IntDir) + + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"RelWithDebInfo\" + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + + + C:\Users\Савелий\Desktop\tmp\FDTD_Method\include;C:\Users\Савелий\Desktop\tmp\FDTD_Method\gtest;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + ..\gtest\RelWithDebInfo\gtest.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + %(AdditionalOptions) /machine:x64 + true + %(IgnoreSpecificDefaultLibraries) + C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/RelWithDebInfo/FDTD_test.lib + C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/RelWithDebInfo/FDTD_test.pdb + Console + + + false + + + + + Always + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + %(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\test\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + %(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\test\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + %(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\test\CMakeFiles\generate.stamp + false + Building Custom Rule C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/CMakeLists.txt + setlocal +"C:\Program Files\CMake\bin\cmake.exe" -SC:/Users/Савелий/Desktop/tmp/FDTD_Method -BC:/Users/Савелий/Desktop/tmp/FDTD_Method --check-stamp-file C:/Users/Савелий/Desktop/tmp/FDTD_Method/test/CMakeFiles/generate.stamp +if %errorlevel% neq 0 goto :cmEnd +:cmEnd +endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone +:cmErrorLevel +exit /b %1 +:cmDone +if %errorlevel% neq 0 goto :VCEnd + %(AdditionalInputs) + C:\Users\Савелий\Desktop\tmp\FDTD_Method\test\CMakeFiles\generate.stamp + false + + + + + + + + + {F7EDEBF2-518F-3519-A641-E2EB02DBF9B7} + ZERO_CHECK + false + Never + + + {F922B38C-8C9E-3927-9F70-7DD13CB3E3B7} + gtest + + + + + + \ No newline at end of file diff --git a/sln/tests/FDTD_test.vcxproj.filters b/sln/tests/FDTD_test.vcxproj.filters new file mode 100644 index 0000000..739112e --- /dev/null +++ b/sln/tests/FDTD_test.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + Source Files + + + Source Files + + + + + + + + {71875311-627E-3DE7-802E-DE21AE181D3D} + + + diff --git a/src/FDTD.cpp b/src/FDTD.cpp index f1b4db0..327133c 100644 --- a/src/FDTD.cpp +++ b/src/FDTD.cpp @@ -131,6 +131,17 @@ void FDTD::shifted_update_field(const double& time) { for (double t = 0; t < time; t += dt) { + for (Cell_number j(Nj); j < Nj; ++j) + { + for (Cell_number i(Ni); i < Ni; ++i) + { + Bx(*i, *j) -= FDTD_Const::C * dt/2 * (Ez(*i, j + 1) - Ez(*i, *j)) / dy; + + By(*i, *j) += FDTD_Const::C * dt/2 * (Ez(i + 1, *j) - Ez(*i, *j)) / dx; + + Bz(*i, *j) -= FDTD_Const::C * dt/2 * ((Ey(i + 1, *j) - Ey(*i, *j)) / dx - (Ex(*i, j + 1) - Ex(*i, *j)) / dy); + } + } for (Cell_number j(Nj); j < Nj; ++j) { for (Cell_number i(Ni); i < Ni; ++i) @@ -146,11 +157,11 @@ void FDTD::shifted_update_field(const double& time) { for (Cell_number i(Ni); i < Ni; ++i) { - Bx(*i, *j) -= FDTD_Const::C * dt * (Ez(*i, j + 1) - Ez(*i, *j)) / dy; + Bx(*i, *j) -= FDTD_Const::C * dt/2 * (Ez(*i, j + 1) - Ez(*i, *j)) / dy; - By(*i, *j) += FDTD_Const::C * dt * (Ez(i + 1, *j) - Ez(*i, *j)) / dx; + By(*i, *j) += FDTD_Const::C * dt/2 * (Ez(i + 1, *j) - Ez(*i, *j)) / dx; - Bz(*i, *j) -= FDTD_Const::C * dt * ((Ey(i + 1, *j) - Ey(*i, *j)) / dx - (Ex(*i, j + 1) - Ex(*i, *j)) / dy); + Bz(*i, *j) -= FDTD_Const::C * dt/2 * ((Ey(i + 1, *j) - Ey(*i, *j)) / dx - (Ex(*i, j + 1) - Ex(*i, *j)) / dy); } } } diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fffbc35..d14563c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,3 +6,9 @@ file(GLOB srcs "*.cpp" "../src/*.cpp") add_executable(${target} ${srcs} ${hdrs}) target_link_libraries(${target} gtest) + +set_target_properties(${target} PROPERTIES + FOLDER "sln") + +configure_file(${CMAKE_SOURCE_DIR}/test/FDTD_test.vcxproj ${CMAKE_BINARY_DIR}/sln/tests/FDTD_test.vcxproj COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/test/FDTD_test.vcxproj.filters ${CMAKE_BINARY_DIR}/sln/tests/FDTD_test.vcxproj.filters COPYONLY) \ No newline at end of file