Merge pull request #13432 from KratosMultiphysics/FixUpdateOrderInAnalysisStage

[Core][Analysis stage] Attempting to solve #13350

finally merging!!

Author: RiccardoRossi

.github/workflows/ci_apps_linux.json

@@ -23,7 +23,6 @@
     "MPMApplication",
     "ChimeraApplication",
     "StatisticsApplication",
-    "SwimmingDEMApplication",
     "ConstitutiveLawsApplication",
     "RomApplication",
     "ShallowWaterApplication",

.github/workflows/ci_apps_windows.json

@@ -16,7 +16,6 @@
     "MappingApplication",
     "CoSimulationApplication",
     "StatisticsApplication",
-    "SwimmingDEMApplication",
     "ShapeOptimizationApplication",
     "ConstitutiveLawsApplication",
     "RANSApplication",

.github/workflows/configure.cmd

@@ -26,7 +26,7 @@ set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\MPMApplication;
 set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\MappingApplication;
 set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\CoSimulationApplication;
 set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\StatisticsApplication;
-set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\SwimmingDEMApplication;
+@REM set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\SwimmingDEMApplication;
 set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\ShapeOptimizationApplication;
 set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\ConstitutiveLawsApplication;
 set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\RANSApplication;

.github/workflows/configure_research_applications.sh

@@ -39,7 +39,7 @@ add_app ${KRATOS_APP_DIR}/PoromechanicsApplication;
 add_app ${KRATOS_APP_DIR}/RANSApplication;
 add_app ${KRATOS_APP_DIR}/ShallowWaterApplication;
 add_app ${KRATOS_APP_DIR}/ShapeOptimizationApplication;
-add_app ${KRATOS_APP_DIR}/SwimmingDEMApplication;
+# add_app ${KRATOS_APP_DIR}/SwimmingDEMApplication;
 add_app ${KRATOS_APP_DIR}/SystemIdentificationApplication;
 
 # Clean

applications/CoSimulationApplication/python_scripts/base_classes/co_simulation_coupled_solver.py

@@ -177,6 +177,10 @@ def Predict(self):
             solver.Predict()
 
     def InitializeSolutionStep(self):
+        # First we call the Predict the analysis_stage InitializeSolutionStep definition
+        self.Predict()
+
+        # Now we execute the corresponding InitializeSolutionStep functions of the solvers, predictors and coupling operations
         for solver in self.solver_wrappers.values():
             solver.InitializeSolutionStep()
 

applications/CoSimulationApplication/tests/fsi_mok/fsi_mok_cfd_results_disp_ref_aitken.dat

@@ -17,10 +17,10 @@ class TestMokFSI(co_simulation_test_case.CoSimulationTestCase):
 
     def setUp(self):
         self.err_tol = "1e-6"
+        self.relative_err_tol = "1e-9"
         if not have_fsi_dependencies:
             self.skipTest("FSI dependencies are not available!")
 
-
     def test_mok_fsi_mvqn(self):
         self.accelerator_type = "mvqn"
 
@@ -54,7 +54,6 @@ def test_mok_fsi_block_mvqn(self):
             self.__DumpUpdatedCFDSettings()
             self._runTest()
 
-
     def test_mok_fsi_block_ibqnls(self):
         self.accelerator_type = "block_ibqnls"
         self.err_tol = "6e-5"
@@ -112,7 +111,6 @@ def test_mok_fsi_mvqn_external_structure_mpi(self):
             num_procs = KM.Testing.GetDefaultDataCommunicator().Size()
             self._runTestWithExternal(["mpiexec", "-np", str(num_procs), GetPython3Command(), "testing_structural_mechanics_analysis_with_co_sim_io.py", "--using-mpi", ext_parameter_file_name])
 
-
     def __ManipulateCFDSettings(self):
         self.cosim_parameters["solver_settings"]["convergence_accelerators"][0]["type"].SetString(self.accelerator_type)
         self.cosim_parameters["solver_settings"]["solvers"]["fluid"]["solver_wrapper_settings"]["input_file"].SetString(self.cfd_tes_file_name)
@@ -161,14 +159,15 @@ def __AddTestingToCFD(self):
                     "MESH_VELOCITY_Y"]
                 }
             },{
-            "python_module"   : "compare_two_files_check_process",
-            "kratos_module"   : "KratosMultiphysics",
-            "process_name"    : "CompareTwoFilesCheckProcess",
-            "Parameters" :{
-                "output_file_name"    : "fsi_mok/fsi_mok_cfd_results_disp.dat",
-                "reference_file_name" : \""""+disp_ref_file_name.replace("\\", "\\\\")+"""\",
-                "comparison_type"     : "dat_file_variables_time_history",
-                "tolerance"      : """+self.err_tol+"""
+                "python_module"   : "compare_two_files_check_process",
+                "kratos_module"   : "KratosMultiphysics",
+                "process_name"    : "CompareTwoFilesCheckProcess",
+                "Parameters" :{
+                    "output_file_name"    : "fsi_mok/fsi_mok_cfd_results_disp.dat",
+                    "reference_file_name" : \""""+disp_ref_file_name.replace("\\", "\\\\")+"""\",
+                    "comparison_type"     : "dat_file_variables_time_history",
+                    "relative_tolerance"  : """+self.relative_err_tol+""",
+                    "tolerance"           : """+self.err_tol+"""
                 }
             },{
             "kratos_module"   : "KratosMultiphysics",
@@ -191,16 +190,17 @@ def __AddTestingToCFD(self):
                     "MESH_VELOCITY_Y"]
                 }
             },{
-            "python_module"   : "compare_two_files_check_process",
-            "kratos_module"   : "KratosMultiphysics",
-            "process_name"    : "CompareTwoFilesCheckProcess",
-            "Parameters" :{
-                "output_file_name"    : "fsi_mok/fsi_mok_cfd_results_fluid.dat",
-                "reference_file_name" : \""""+fluid_ref_file_name.replace("\\", "\\\\")+"""\",
-                "comparison_type"     : "dat_file_variables_time_history",
-                "tolerance"      : """+self.err_tol+"""
+                "python_module"   : "compare_two_files_check_process",
+                "kratos_module"   : "KratosMultiphysics",
+                "process_name"    : "CompareTwoFilesCheckProcess",
+                "Parameters" :{
+                    "output_file_name"    : "fsi_mok/fsi_mok_cfd_results_fluid.dat",
+                    "reference_file_name" : \""""+fluid_ref_file_name.replace("\\", "\\\\")+"""\",
+                    "comparison_type"     : "dat_file_variables_time_history",
+                    "tolerance"           : """+self.err_tol+"""
                 }
-            }]"""))
+            }
+            ]"""))
 
     def __DumpUpdatedCFDSettings(self):
         with open(self.cfd_tes_file_name, 'w') as parameter_output_file:
@@ -216,6 +216,6 @@ def tearDownClass(cls):
         super(TestMokFSI,cls).tearDownClass()
         kratos_utils.DeleteFileIfExisting(GetFilePath(cls.cfd_tes_file_name))
 
-
 if __name__ == '__main__':
+    KM.Logger.GetDefaultOutput().SetSeverity(KM.Logger.Severity.WARNING)
     KratosUnittest.main()