Processing review comments AvdG

KratosMultiphysics · Dec 21, 2023 · 482748b · 482748b
1 parent 1937ef0
commit 482748b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/...tegies/builder_and_solvers/residualbased_block_builder_and_solver_with_mass_and_damping.h b/...tegies/builder_and_solvers/residualbased_block_builder_and_solver_with_mass_and_damping.h
@@ -477,22 +477,22 @@ class ResidualBasedBlockBuilderAndSolverWithMassAndDamping
                 GetDerivativesForVariable(DISPLACEMENT_Y, rNode, rFirstDerivativeVector,
                                           rSecondDerivativeVector);
 
-                const std::vector<const Variable<double>*> conditional_variables = {
+                const std::vector<const Variable<double>*> optional_variables = {
                     &ROTATION_X, &ROTATION_Y, &ROTATION_Z, &DISPLACEMENT_Z};
 
-                for (const auto p_variable : conditional_variables)
+                for (const auto p_variable : optional_variables)
                 {
-                    GetDerivativesForConditionalVariable(
-                        *p_variable, rNode, rFirstDerivativeVector, rSecondDerivativeVector);
+                    GetDerivativesForOptionalVariable(*p_variable, rNode, rFirstDerivativeVector,
+                                                      rSecondDerivativeVector);
                 }
             }
         });
     }
 
-    void GetDerivativesForConditionalVariable(const Variable<double>& rVariable,
-                                              const Node& rNode,
-                                              TSystemVectorType& rFirstDerivativeVector,
-                                              TSystemVectorType& rSecondDerivativeVector) const
+    void GetDerivativesForOptionalVariable(const Variable<double>& rVariable,
+                                           const Node& rNode,
+                                           TSystemVectorType& rFirstDerivativeVector,
+                                           TSystemVectorType& rSecondDerivativeVector) const
     {
         if (rNode.HasDofFor(rVariable))
         {

diff --git a/applications/GeoMechanicsApplication/tests/test_rotation_with_moving_load.py b/applications/GeoMechanicsApplication/tests/test_rotation_with_moving_load.py
@@ -15,20 +15,20 @@ def test_rotation_with_moving_load(self):
 
         # run simulation
         test_helper.run_kratos(file_path)
-        res_path = os.path.join(file_path, test_name + result_extension)
 
         reader = test_helper.GiDOutputFileReader()
+        res_path = os.path.join(file_path, test_name + result_extension)
         simulation_output = reader.read_output_from(res_path)
         rotations = simulation_output["results"]["ROTATION"]
 
-        # Validation for Time = 0.02
-        values_time_0_02 = reader.get_values_at_time(1.0, rotations)
-        value_for_node = reader.get_value_at_node(1, values_time_0_02)
+        # Validation for Time = 1.0
+        rotations_time_1 = reader.get_values_at_time(1.0, rotations)
+        rotations_for_node_1 = reader.get_value_at_node(1, rotations_time_1)
 
         # This test is a regression test, if rotation is not added to the
         # newmark upw scheme as a variable that needs to be predicted and
         # updated, the results will be different.
-        self.assertAlmostEqual(-0.000177858, value_for_node[2])
+        self.assertAlmostEqual(-0.000177858, rotations_for_node_1[2])
 
     def test_rotation_with_moving_load_constant_system_matrices(self):
         """
@@ -43,20 +43,19 @@ def test_rotation_with_moving_load_constant_system_matrices(self):
 
         self.assertTrue(isinstance(simulation._GetSolver().builder_and_solver, KratosGeo.ResidualBasedBlockBuilderAndSolverWithMassAndDamping))
 
-        res_path = os.path.join(file_path, test_name + result_extension)
-
         reader = test_helper.GiDOutputFileReader()
+        res_path = os.path.join(file_path, test_name + result_extension)
         simulation_output = reader.read_output_from(res_path)
         rotations = simulation_output["results"]["ROTATION"]
 
-        # Validation for Time = 0.02
-        values_time_0_02 = reader.get_values_at_time(1.0, rotations)
-        value_for_node = reader.get_value_at_node(1, values_time_0_02)
+        # Validation for Time = 1.0
+        rotations_time_1 = reader.get_values_at_time(1.0, rotations)
+        rotations_for_node_1 = reader.get_value_at_node(1, rotations_time_1)
 
         # This test is a regression test, if rotation is not added to the
-        # newmark upw scheme as a variable that needs to be predicted and
-        # updated, the results will be different.
-        self.assertAlmostEqual(-0.000177858, value_for_node[2])
+        # ResidualBasedBlockBuilderAndSolverWithMassAndDamping as a variable that
+        # needs to update the first/second time derivatives, the results will be different.
+        self.assertAlmostEqual(-0.000177858, rotations_for_node_1[2])
 
 if __name__ == '__main__':
     KratosUnittest.main()