Skip to content

Commit 139d6fe

Browse files
authored
[GeoMechanicsApplication] Move all non-template code to .cpp files and make sure any .h file does not contain any implementations (workflows) (#14113)
* moved structures constructors to dgeoflow.cpp * renamed dgeosettlement.h to dgeosettlement.hpp * renamed strategy_wrapper.hpp to strategy_wrapper.h * split time_step_end_state.hpp into header and cpp * reverted simple structures and cleaned a bit dgeoflow * replaced <> to ""
1 parent b55d643 commit 139d6fe

15 files changed

Lines changed: 20 additions & 26 deletions

applications/GeoMechanicsApplication/custom_python/add_custom_utilities_to_python.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "custom_utilities/process_utilities.h"
2121
#include "custom_workflows/custom_workflow_factory.h"
2222
#include "custom_workflows/dgeoflow.h"
23-
#include "custom_workflows/dgeosettlement.h"
23+
#include "custom_workflows/dgeosettlement.hpp"
2424

2525
namespace Kratos::Python
2626
{

applications/GeoMechanicsApplication/custom_workflows/custom_workflow_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "custom_workflow_factory.h"
1414
#include "dgeoflow.h"
15-
#include "dgeosettlement.h"
15+
#include "dgeosettlement.hpp"
1616
#include "time_loop_executor.h"
1717

1818
#include "custom_utilities/file_input_utility.h"

applications/GeoMechanicsApplication/custom_workflows/dgeoflow.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
1111
//
1212

1313
#include "dgeoflow.h"
14+
#include "custom_processes/apply_constant_hydrostatic_pressure_process.hpp"
1415
#include "custom_processes/geo_apply_constant_scalar_value_process.h"
16+
#include "custom_strategies/schemes/backward_euler_quasistatic_Pw_scheme.hpp"
1517
#include "custom_utilities/file_input_utility.h"
1618
#include "geo_output_writer.h"
19+
#include "includes/model_part.h"
1720
#include "includes/model_part_io.h"
1821
#include "input_output/logger.h"
1922
#include "input_output/logger_output.h"

applications/GeoMechanicsApplication/custom_workflows/dgeoflow.h

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,27 @@
1515
// System includes
1616

1717
/* External includes */
18-
18+
#include "geo_mechanics_application.h"
1919
#include "includes/kernel.h"
20-
#include <geo_mechanics_application.h>
2120

2221
/* Utility includes */
23-
#include "includes/model_part.h"
2422
#include "spaces/ublas_space.h"
2523

26-
// Linear solvers
2724
#include "linear_solvers/linear_solver.h"
28-
29-
// The most basic scheme (static)
30-
#include "custom_strategies/schemes/backward_euler_quasistatic_Pw_scheme.hpp"
31-
32-
// The most builder and solver (the block builder and solver)
3325
#include "solving_strategies/builder_and_solvers/residualbased_block_builder_and_solver.h"
3426

3527
// The strategies to test
36-
#include <custom_processes/apply_component_table_process.h>
37-
#include <custom_processes/apply_constant_hydrostatic_pressure_process.hpp>
38-
#include <linear_solvers/skyline_lu_factorization_solver.h>
28+
#include "custom_processes/apply_component_table_process.h"
29+
#include "linear_solvers/skyline_lu_factorization_solver.h"
3930

40-
#include <solving_strategies/convergencecriterias/mixed_generic_criteria.h>
41-
#include <solving_strategies/strategies/implicit_solving_strategy.h>
42-
#include <solving_strategies/strategies/residualbased_newton_raphson_strategy.h>
31+
#include "solving_strategies/convergencecriterias/mixed_generic_criteria.h"
32+
#include "solving_strategies/strategies/residualbased_newton_raphson_strategy.h"
4333

4434
#include "custom_strategies/strategies/geo_mechanics_newton_raphson_erosion_process_strategy.hpp"
4535

4636
namespace Kratos
4737
{
38+
class ModelPart;
4839

4940
class KRATOS_API(GEO_MECHANICS_APPLICATION) KratosExecute
5041
{

applications/GeoMechanicsApplication/custom_workflows/dgeosettlement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "utilities/variable_utils.h"
1414

15-
#include "dgeosettlement.h"
15+
#include "dgeosettlement.hpp"
1616
#include "geo_mechanics_application.h"
1717
#include "input_output/logger.h"
1818
#include "linear_solvers_application.h"

applications/GeoMechanicsApplication/custom_workflows/dgeosettlement.h renamed to applications/GeoMechanicsApplication/custom_workflows/dgeosettlement.hpp

File renamed without changes.

applications/GeoMechanicsApplication/custom_workflows/scoped_output_file_access.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//
1212

1313
#include "scoped_output_file_access.h"
14-
#include "strategy_wrapper.hpp"
14+
#include "strategy_wrapper.h"
1515

1616
namespace Kratos
1717
{

applications/GeoMechanicsApplication/custom_workflows/solving_strategy_wrapper.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#pragma once
1414

15-
#include "strategy_wrapper.hpp"
15+
#include "strategy_wrapper.h"
1616
#include <memory>
1717

1818
#include "custom_processes/calculate_incremental_motion_process.h"

applications/GeoMechanicsApplication/custom_workflows/strategy_wrapper.hpp renamed to applications/GeoMechanicsApplication/custom_workflows/strategy_wrapper.h

File renamed without changes.

applications/GeoMechanicsApplication/custom_workflows/time_loop_executor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "time_loop_executor.h"
1616
#include "processes/process.h"
1717
#include "scoped_output_file_access.h"
18-
#include "strategy_wrapper.hpp"
18+
#include "strategy_wrapper.h"
1919
#include "time_incrementor.h"
2020

2121
namespace Kratos

0 commit comments

Comments
 (0)