Merge remote-tracking branch 'origin/optapp/filter/refactor_implicit'…

… into optapp/filters/unify_filters_with_factory
KratosMultiphysics · Mar 18, 2024 · e2541c4 · e2541c4
2 parents 12c542e + 9b3ce6f
commit e2541c4
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/applications/OptimizationApplication/python_scripts/filtering/helmholtz_analysis.py b/applications/OptimizationApplication/python_scripts/filtering/helmholtz_analysis.py
@@ -76,6 +76,14 @@ def UnFilterField(self, filtered_field: ContainerExpressionTypes) -> ContainerEx
         self.RunSolver()
         return self.__AssignNodalSolutionToDataExpression()
 
+    def AssignExpressionDataToNodalSolution(self, data_exp: ContainerExpressionTypes) -> None:
+        mapped_values = KM.Expression.NodalExpression(data_exp.GetModelPart())
+        if isinstance(data_exp, KM.Expression.NodalExpression):
+            mapped_values = data_exp
+        else:
+            KOA.ExpressionUtils.MapContainerVariableToNodalVariable(mapped_values, data_exp, self.__GetNeighbourEntities(data_exp))
+        KM.Expression.VariableExpressionIO.Write(mapped_values, self._GetSolver().GetSolvingVariable(), True)
+
     def __AssignDataExpressionToNodalSource(self, data_exp: ContainerExpressionTypes):
         self.__source_data = data_exp
 
@@ -114,14 +122,6 @@ def __AssignNodalSolutionToDataExpression(self) -> ContainerExpressionTypes:
             KOA.ExpressionUtils.MapNodalVariableToContainerVariable(mapped_entity_solution_field, nodal_solution_field)
             return mapped_entity_solution_field
 
-    def AssignExpressionDataToNodalSolution(self, data_exp: ContainerExpressionTypes) -> None:
-        mapped_values = KM.Expression.NodalExpression(data_exp.GetModelPart())
-        if isinstance(data_exp, KM.Expression.NodalExpression):
-            mapped_values = data_exp
-        else:
-            KOA.ExpressionUtils.MapContainerVariableToNodalVariable(mapped_values, data_exp, self.__GetNeighbourEntities(data_exp))
-        KM.Expression.VariableExpressionIO.Write(mapped_values, self._GetSolver().GetSolvingVariable(), True)
-
     def __GetNeighbourEntities(self, data_exp: ContainerExpressionTypes) -> ContainerExpressionTypes:
         # following makes the number of neighbours computation to be executed once
         # per given contaienr, hence if the mesh element/connectivity changes