Skip to content

Commit

Permalink
var name change
Browse files Browse the repository at this point in the history
  • Loading branch information
sunethwarna committed Mar 17, 2024
1 parent a044103 commit 09c2e33
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ PYBIND11_MODULE(KratosOptimizationApplication, m)
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, HELMHOLTZ_SCALAR );
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, HELMHOLTZ_SCALAR_SOURCE );
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, HELMHOLTZ_RADIUS );
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, NUMBER_OF_HELMHOLTZ_FILTERS);
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, NUMBER_OF_SOLVERS_USING_NODES);
KRATOS_REGISTER_IN_PYTHON_3D_VARIABLE_WITH_COMPONENTS(m, HELMHOLTZ_VECTOR);
KRATOS_REGISTER_IN_PYTHON_3D_VARIABLE_WITH_COMPONENTS(m, HELMHOLTZ_VECTOR_SOURCE);
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, ELEMENT_STRAIN_ENERGY );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ namespace Kratos
KRATOS_REGISTER_VARIABLE(HELMHOLTZ_RADIUS);
KRATOS_REGISTER_VARIABLE(HELMHOLTZ_SCALAR);
KRATOS_REGISTER_VARIABLE(HELMHOLTZ_SCALAR_SOURCE);
KRATOS_REGISTER_VARIABLE(NUMBER_OF_HELMHOLTZ_FILTERS);
KRATOS_REGISTER_VARIABLE(NUMBER_OF_SOLVERS_USING_NODES);
KRATOS_REGISTER_3D_VARIABLE_WITH_COMPONENTS( HELMHOLTZ_VECTOR);
KRATOS_REGISTER_3D_VARIABLE_WITH_COMPONENTS( HELMHOLTZ_VECTOR_SOURCE);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ namespace Kratos
KRATOS_CREATE_VARIABLE( double, HELMHOLTZ_RADIUS);
KRATOS_CREATE_VARIABLE( double, HELMHOLTZ_SCALAR);
KRATOS_CREATE_VARIABLE( double, HELMHOLTZ_SCALAR_SOURCE);
KRATOS_CREATE_VARIABLE( int, NUMBER_OF_HELMHOLTZ_FILTERS);
KRATOS_CREATE_VARIABLE( int, NUMBER_OF_SOLVERS_USING_NODES);
KRATOS_CREATE_3D_VARIABLE_WITH_COMPONENTS( HELMHOLTZ_VECTOR);
KRATOS_CREATE_3D_VARIABLE_WITH_COMPONENTS( HELMHOLTZ_VECTOR_SOURCE);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ namespace Kratos
KRATOS_DEFINE_APPLICATION_VARIABLE(OPTIMIZATION_APPLICATION, double, HELMHOLTZ_RADIUS);
KRATOS_DEFINE_APPLICATION_VARIABLE(OPTIMIZATION_APPLICATION, double, HELMHOLTZ_SCALAR);
KRATOS_DEFINE_APPLICATION_VARIABLE(OPTIMIZATION_APPLICATION, double, HELMHOLTZ_SCALAR_SOURCE);
KRATOS_DEFINE_APPLICATION_VARIABLE(OPTIMIZATION_APPLICATION, int, NUMBER_OF_HELMHOLTZ_FILTERS);
KRATOS_DEFINE_APPLICATION_VARIABLE(OPTIMIZATION_APPLICATION, int, NUMBER_OF_SOLVERS_USING_NODES);
KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS( OPTIMIZATION_APPLICATION, HELMHOLTZ_VECTOR);
KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS( OPTIMIZATION_APPLICATION, HELMHOLTZ_VECTOR_SOURCE);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def PrepareModelPart(self) -> str:
# the model part needs to be created.
self.__helmholtz_model_part = self.model.CreateModelPart(computing_model_part_name)
KOA.OptimizationUtils.CopySolutionStepVariablesList(self.__helmholtz_model_part, self.GetOriginRootModelPart())
self.GetOriginModelPart()[KOA.NUMBER_OF_HELMHOLTZ_FILTERS] = 1
self.GetOriginModelPart()[KOA.NUMBER_OF_SOLVERS_USING_NODES] = 1

# now fill with the appropriate elements and conditions
self._FillComputingModelPart()
Expand All @@ -259,10 +259,10 @@ def __IncrementModelPartUsageCounter(self) -> None:
# in here, the origin model part and its parents are updated. This is because,
# the computing model part shares nodes with the origin model part.
def increase_counter(model_part: KM.ModelPart) -> None:
if model_part.Has(KOA.NUMBER_OF_HELMHOLTZ_FILTERS):
model_part[KOA.NUMBER_OF_HELMHOLTZ_FILTERS] += 1
if model_part.Has(KOA.NUMBER_OF_SOLVERS_USING_NODES):
model_part[KOA.NUMBER_OF_SOLVERS_USING_NODES] += 1
else:
model_part[KOA.NUMBER_OF_HELMHOLTZ_FILTERS] = 1
model_part[KOA.NUMBER_OF_SOLVERS_USING_NODES] = 1

current_model_part = self.GetOriginModelPart()
increase_counter(current_model_part)
Expand Down

0 comments on commit 09c2e33

Please sign in to comment.