fix visualization & add report

PlotScript/Reserve.txt

@@ -1,8 +1,8 @@
-4.0
-4.0
+16.0
+16.0
 0.0
 1.0
 0.0
 1.0
-2e-13
-1e-11
+16.0
+5e-13

PlotScript/Source.txt

@@ -1,7 +1,8 @@
-32
-32
+16.0
+16.0
 0.0
 1.0
 0.0
 1.0
-32
+16.0
+5e-13

PlotScript/convergence.py

@@ -40,14 +40,6 @@ def update_sources():
         with open("Source.txt", "w") as file:
             for component in input_list:
                 file.write(input(component + ": ") + "\n")
-    else:
-        with open("Source.txt", "r+") as file:
-            lines = file.readlines()
-            lines[-1] = input("t : ") + "\n"
-            file.seek(0)
-            file.writelines(lines)
-            file.truncate()
-
 
 def save_source_into_reserve():
     with open('Source.txt', 'r') as file1, open('Reserve.txt', 'w') as file2:
@@ -84,9 +76,8 @@ def analyze_convergence(numbers, mult_2, iterations, shifts):
             file.write(str(numbers[4]) + "\n")
             file.write(str(numbers[5]) + "\n")
 
-            tmp_n_6 = numbers[6] / (mult_2 ** n)
+            tmp_n_6 = numbers[6] * (mult_2 ** n)
             file.write(str(tmp_n_6) + "\n")
-
             file.write(str(numbers[7]) + "\n")
 
         convergences.append(float(execute_cpp("Ex", "Bz", "Ex", flag)))
@@ -101,7 +92,7 @@ def analyze_convergence(numbers, mult_2, iterations, shifts):
 if __name__ == '__main__':
     update_sources()
     loaded_numbers = save_source_into_reserve()
-    nums, convergence = analyze_convergence(loaded_numbers, 2, 6, True)
+    nums, convergence = analyze_convergence(loaded_numbers, 4, 4, False)
     reload_source()
 
     print(convergence)

PlotScript/main.py

@@ -64,7 +64,7 @@ def execute_cpp(field_1, field_2, field_to_plot, source_nums):
 
 
 if __name__ == '__main__':
-    input_list = ["Ni", "Nj", "ax", "bx", "ay", "by", "dt", "t"]
+    input_list = ["Ni", "Nj", "ax", "bx", "ay", "by", "Nt", "t"]
 
     print("Update parameters? \n \
                       1 - Yes \n \
@@ -78,13 +78,6 @@ def execute_cpp(field_1, field_2, field_to_plot, source_nums):
         with open("Source.txt", "w") as file:
             for component in input_list:
                 file.write(input(component + ": ") + "\n")
-    else:
-        with open("Source.txt", "r+") as file:
-            lines = file.readlines()
-            lines[-1] = input("t : ") + "\n"
-            file.seek(0)
-            file.writelines(lines)
-            file.truncate()
 
     with open('Source.txt', 'r') as file:
         numbers = [float(line.strip()) for line in file]

samples/sample.cpp

@@ -1,5 +1,5 @@
 #define _USE_MATH_DEFINES
-#define __DEBUG__
+//#define __DEBUG__
 
 #include <iostream>
 #include <iomanip>
@@ -108,9 +108,9 @@ int main()
     double arr_y[2] = { numbers[4], numbers[5] };
     double arr_d[2] = { (arr_x[1] - arr_x[0]) / arr_N[0], (arr_y[1] - arr_y[0]) / arr_N[1] };
 
-    double courant_condtition = 0.25;
-    double dt;
-    double t;
+    double t = numbers[7];
+    int iter_nums = static_cast<int>(numbers[6]);
+    double dt = t / static_cast<double>(iter_nums);
 
     Component flds_selected[2] = { static_cast<Component>(std::atoi(argv[1])), static_cast<Component>(std::atoi(argv[2])) };
     Component fld_tested = static_cast<Component>(std::atoi(argv[3]));
@@ -129,15 +129,15 @@ int main()
         flds_selected[0] == Component::EZ && flds_selected[1] == Component::BY)
     {
         selected_axis = 'x';
-        dt = courant_condtition * arr_d[0] / FDTD_Const::C;
-        t = courant_condtition * (arr_x[1] - arr_x[0]) / FDTD_Const::C;
+        //dt = courant_condtition * arr_d[0] / FDTD_Const::C;
+        //t = courant_condtition * (arr_x[1] - arr_x[0]) / FDTD_Const::C;
     }
     else if (flds_selected[0] == Component::EX && flds_selected[1] == Component::BZ ||
         flds_selected[0] == Component::EZ && flds_selected[1] == Component::BX)
     {
         selected_axis = 'y';
-        dt = courant_condtition * arr_d[1] / FDTD_Const::C;
-        t = courant_condtition * (arr_y[1] - arr_y[0]) / FDTD_Const::C;
+        //dt = courant_condtition * arr_d[1] / FDTD_Const::C;
+        //t = courant_condtition * (arr_y[1] - arr_y[0]) / FDTD_Const::C;
     }
     else
     {
@@ -149,7 +149,7 @@ int main()
     FDTD test_1(arr_N, arr_x, arr_y, dt);
 
 
-    int iter_nums = static_cast<int>(numbers[6]);
+
     Test_FDTD test(test_1, flds_selected, fld_tested, arr_x, arr_y, arr_d, t, iter_nums, initial_func, true_func, shifted_flag);
     std::cout << test.get_max_abs_error() << std::endl;