regression test problem #469

PythonScriptStore/RegressionTest/regression_test_base_tool.py

@@ -57,6 +57,13 @@ def read_dat_file(self):
         file.close()
         return ifconverged
 
+    def clean_input_folder(folder_path, keep_file="regression_test_tool.py"):
+        for filename in os.listdir(folder_path):
+            file_path = os.path.join(folder_path, filename)
+            if filename != keep_file and os.path.isfile(file_path):
+                os.remove(file_path)
+                print(f"Deleted: {file_path}")
+
 
 class SphinxsysRegressionTest:
 
@@ -117,6 +124,13 @@ def run_case_with_reload(self) -> None:
         os.system(command)
         print('Simulating case is finished...')
 
+    def clean_input_folder(folder_path, keep_file="regression_test_tool.py"):
+        for filename in os.listdir(folder_path):
+            file_path = os.path.join(folder_path, filename)
+            if filename != keep_file and os.path.isfile(file_path):
+                os.remove(file_path)
+                print(f"Deleted: {file_path}")
+
     def read_dat_file(self):
         file = open(self.condition_file_path)
         ifconverged = file.readline(4)

src/shared/regression_test/dynamic_time_warping_method.h

@@ -24,7 +24,7 @@
  * @file 	dynamic_time_warping_method.h
  * @brief 	Classes for the comparison between validated and tested results
                         with dynamic time warping method.
- * @author	Bo Zhang , Chi Zhang and Xiangyu Hu
+ * @author	Bo Zhang, Chi Zhang and Xiangyu Hu
  */
 
 #ifndef DYNAMIC_TIME_WARPING_H
@@ -103,7 +103,7 @@ class RegressionTestDynamicTimeWarping : public RegressionTestTimeAverage<Observ
             }
             this->writeResultToXml(this->number_of_run_ - 1);
             writeDTWDistanceToXml();
-            compareDTWDistance(threshold_value);
+            compareDTWDistance(threshold_value);  //wether the distance is convergence.
         }
         else
             std::cout << "The results have been converged." << std::endl;

src/shared/regression_test/regression_test_base.h

@@ -23,7 +23,7 @@
 /**
  * @file regression_test_base.h
  * @brief Base classes for comparisons between validated and tested results.
- * @author	Bo Zhang , Chi Zhang and Xiangyu Hu
+ * @author	Bo Zhang, Chi Zhang and Xiangyu Hu
  */
 
 #ifndef REGRESSION_TEST_BASE_H
@@ -56,8 +56,8 @@ class RegressionTestBase : public ObserveMethodType
     std::string converged;               /*< the tag for result converged, default false. */
 
     XmlMemoryIO xmlmemory_io_; /*< xml memory in_output operator, which has defined several
-                                                                              methods to read and write data from and into xml memory,
-                                                                                  including one by one, or all result in the same time. */
+                                   methods to read and write data from and into xml memory,
+                                   including one by one, or all result in the same time. */
 
     XmlEngine observe_xml_engine_;    /*< xml engine for current result io_environment. */
     XmlEngine result_xml_engine_in_;  /*< xml engine for input result. */
@@ -67,15 +67,15 @@ class RegressionTestBase : public ObserveMethodType
     StdVec<std::string> element_tag_;             /*< the container of the tag of current result. */
     BiVector<VariableType> current_result_;       /*< the container of current run result stored as snapshot * observation. */
     BiVector<VariableType> current_result_trans_; /*< the container of current run result with snapshot & observations transposed,
-                                                                                               because this data structure is required in TA and DTW method. */
+                                                  because this data structure is required in TA and DTW method. */
     BiVector<VariableType> result_in_;            /*< the temporary container of each result when reading from .xml memory, and
-                                                                                                  it may be snapshot * observations (reading all result for averaged methods),
-                                                                                                      or observations * snapshot (reading specified result for TA and DTW method.) */
+                                                  it may be snapshot * observations (reading all result for averaged methods),
+                                                  or observations * snapshot (reading specified result for TA and DTW method.) */
     TriVector<VariableType> result_;              /*< the container of results in all runs (run * snapshot * observation) */
 
     int snapshot_, observation_; /*< the size of each layer of current result vector. */
     int difference_;             /*< the length difference of snapshot between old and new result,
-                                                                                which is used to trim each new run result to be a unified length. */
+                                 which is used to trim each new run result to be a unified length. */
     int number_of_run_;          /*< the times of run. */
     int label_for_repeat_;       /*< the label used stable convergence (several convergence). */
     int number_of_snapshot_old_; /*< the snapshot size of last trimmed result. */

src/shared/shared_ck/particle_dynamics/general_dynamics/general_reduce_ck.hpp

@@ -16,7 +16,7 @@ template <typename DataType, typename NormType, class DynamicsIdentifier>
 template <class ExecutionPolicy, class EncloserType>
 VariableNormCK<DataType, NormType, DynamicsIdentifier>::ReduceKernel::
     ReduceKernel(const ExecutionPolicy &ex_policy, EncloserType &encloser)
-    : variable_(encloser.dv_variable_->template DelegatedDataField(ex_policy)) {}
+    : variable_(encloser.dv_variable_->DelegatedDataField(ex_policy)) {}
 //=================================================================================================//
 template <class ExecutionPolicy, class EncloserType>
 TotalKineticEnergyCK::ReduceKernel::

tests/2d_examples/test_1d_shock_tube/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_FVM_double_mach_reflection/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_FVM_flow_around_cylinder/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_T_shaped_pipe/regression_test_tool/regression_test_tool.py

@@ -18,6 +18,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_anisotropic_beam/regression_test_tool/regression_test_tool.py

@@ -17,7 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
-
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_ball_shell_collision/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_collision/regression_test_tool/regression_test_tool.py

@@ -20,6 +20,7 @@
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
 sphinxsys_1 = SphinxsysRegressionTest(case_name, body_name_1, parameter_name_1)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_column_collapse/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_dambreak/regression_test_tool/regression_test_tool.py

@@ -20,6 +20,7 @@
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
 sphinxsys_1 = SphinxsysRegressionTest(case_name, body_name_1, parameter_name_1)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/regression_test_tool.py

@@ -20,6 +20,7 @@
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
 sphinxsys_1 = SphinxsysRegressionTest(case_name, body_name_1, parameter_name_1)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_depolarization/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_diffusion/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_diffusion_NeumannBC/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_diffusion_RobinBC/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_elastic_gate/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_eulerian_supersonic_flow_new_BC/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_eulerian_taylor_green_LG/regression_test_tool/regression_test_tool.py

@@ -20,6 +20,7 @@
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
 sphinxsys_1 = SphinxsysRegressionTest(case_name, body_name_1, parameter_name_1)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_filling_tank/regression_test_tool/regression_test_tool.py

@@ -20,6 +20,7 @@
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
 sphinxsys_1 = SphinxsysRegressionTest(case_name, body_name_1, parameter_name_1)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_flow_around_cylinder/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_free_stream_around_cylinder/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_free_stream_around_cylinder_mr/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_fsi2/regression_test_tool/regression_test_tool.py

@@ -20,6 +20,7 @@
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
 sphinxsys_1 = SphinxsysRegressionTest(case_name, body_name_1, parameter_name_1)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_heat_transfer/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_hydrostatic_fsi/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_impact_patch/regression_test_tool/regression_test_tool.py

@@ -18,6 +18,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_lid_driven_cavity_corrected/regression_test_tool/regression_test_tool.py

@@ -21,6 +21,7 @@
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
 sphinxsys_1 = SphinxsysRegressionTest(case_name, body_name_1, parameter_name_1)
+clean_input_folder(sphinxsys.input_file_path)
 
 while True:
     print("Now start a new run......")

tests/2d_examples/test_2d_nonlinear_wave_fsi/regression_test_tool/regression_test_tool.py

@@ -20,6 +20,7 @@
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
 sphinxsys_1 = SphinxsysRegressionTest(case_name, body_name_1, parameter_name_1)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_oscillating_beam/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_oscillating_beam_UL/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_oscillating_beam_cauchy/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_owsc/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_plate/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/regression_test_tool.py

@@ -18,6 +18,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_rotation_patch/regression_test_tool/regression_test_tool.py

@@ -18,6 +18,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_self_contact/regression_test_tool/regression_test_tool.py

@@ -17,6 +17,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_shell/regression_test_tool/regression_test_tool.py

@@ -18,6 +18,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True:

tests/2d_examples/test_2d_shell_beam_collision/regression_test_tool/regression_test_tool.py

@@ -18,6 +18,7 @@
 number_of_run_times = 0
 converged = 0
 sphinxsys = SphinxsysRegressionTest(case_name, body_name, parameter_name)
+clean_input_folder(sphinxsys.input_file_path)
 
 
 while True: