Skip to content

Commit

Permalink
Review comments by Anne taken into account.
Browse files Browse the repository at this point in the history
  • Loading branch information
@WPK4FEM
WPK4FEM committed Oct 4, 2023
1 parent 9870064 commit 0fcb137
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 35 deletions.
6 changes: 3 additions & 3 deletions applications/GeoMechanicsApplication/custom_workflows/strategy_wrapper.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ namespace Kratos
public:
virtual ~StrategyWrapper() = default;

[[nodiscard]] virtual TimeStepEndState::ConvergenceState GetConvergenceState(const TimeStepEndState& rEndState) = 0;
[[nodiscard]] virtual std::size_t GetNumberOfIterations() const = 0;
[[nodiscard]] virtual double GetEndTime() const = 0;
[[nodiscard]] virtual TimeStepEndState::ConvergenceState GetConvergenceState() = 0;
[[nodiscard]] virtual std::size_t GetNumberOfIterations() const = 0;
[[nodiscard]] virtual double GetEndTime() const = 0;
virtual void Initialize() = 0;
virtual void InitializeSolutionStep() = 0;
virtual void Predict() = 0;
Expand Down
2 changes: 1 addition & 1 deletion applications/GeoMechanicsApplication/custom_workflows/time_step_executor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ TimeStepEndState TimeStepExecutor::Run(double Time)

TimeStepEndState result;
result.time = Time;
result.convergence_state = mStrategyWrapper->GetConvergenceState(result);
result.convergence_state = mStrategyWrapper->GetConvergenceState();
result.num_of_iterations = mStrategyWrapper->GetNumberOfIterations();
return result;
}
Expand Down
61 changes: 30 additions & 31 deletions applications/GeoMechanicsApplication/tests/cpp_tests/test_time_stepping.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace
class ProcessSpy : public Process
{
public:
void ExecuteInitializeSolutionStep() override {mSolutionStepInitializedCalls += 1;}
void ExecuteFinalizeSolutionStep() override {mSolutionStepFinalizedCalls += 1;}
void ExecuteInitializeSolutionStep() override {++mSolutionStepInitializedCalls;}
void ExecuteFinalizeSolutionStep() override {++mSolutionStepFinalizedCalls;}

unsigned int NumberOfExecuteInitializeSolutionStepCalls() const {return mSolutionStepInitializedCalls;}
unsigned int NumberOfExecuteFinalizeSolutionStepCalls() const {return mSolutionStepFinalizedCalls;}
Expand All @@ -39,17 +39,17 @@ class ProcessSpy : public Process
class DummyStrategyWrapper : public StrategyWrapper
{
public:
explicit DummyStrategyWrapper::DummyStrategyWrapper(bool convergence_needed) :
mConvergenceNeeded ( convergence_needed ? TimeStepEndState::ConvergenceState::converged : TimeStepEndState::ConvergenceState::non_converged) {}
[[nodiscard]] TimeStepEndState::ConvergenceState GetConvergenceState(const TimeStepEndState& rEndState) override { return mConvergenceNeeded;};
[[nodiscard]] std::size_t GetNumberOfIterations() const override { return 4;};
[[nodiscard]] double GetEndTime() const override { return 10.;};
void Initialize() override {mSolverStrategyInitializeCalls += 1;}
void InitializeSolutionStep() override {mSolverStrategyInitializeSolutionStepCalls += 1;}
void Predict() override {mSolverStrategyPredictCalls += 1;}
bool SolveSolutionStep() override {mSolverStrategySolveSolutionsStepCalls += 1;
explicit DummyStrategyWrapper::DummyStrategyWrapper(TimeStepEndState::ConvergenceState convergence_needed) :
mConvergenceNeeded( convergence_needed ) {}
[[nodiscard]] TimeStepEndState::ConvergenceState GetConvergenceState() override { return mConvergenceNeeded;};
[[nodiscard]] std::size_t GetNumberOfIterations() const override { return 4;};
[[nodiscard]] double GetEndTime() const override { return 10.;};
void Initialize() override {++mSolverStrategyInitializeCalls;}
void InitializeSolutionStep() override {++mSolverStrategyInitializeSolutionStepCalls;}
void Predict() override {++mSolverStrategyPredictCalls;}
bool SolveSolutionStep() override {++mSolverStrategySolveSolutionsStepCalls;
return true;}
void FinalizeSolutionStep() override {mSolverStrategyFinalizeSolutionStepCalls += 1;}
void FinalizeSolutionStep() override {++mSolverStrategyFinalizeSolutionStepCalls;}
unsigned int NumberOfSolverStrategyInitializeCalls() const {return mSolverStrategyInitializeCalls;}
unsigned int NumberOfSolverStrategyInitializeSolutionStepCalls() const {return mSolverStrategyInitializeSolutionStepCalls;}
unsigned int NumberOfSolverStrategyPredictCalls() const {return mSolverStrategyPredictCalls;}
Expand All @@ -73,25 +73,25 @@ namespace Kratos::Testing
KRATOS_TEST_CASE_IN_SUITE(RunReturnsNonConvergedWhenStrategyDoesNotConverge, KratosGeoMechanicsFastSuite)
{
TimeStepExecutor executor;
auto nonconverging_strategy = std::make_shared<DummyStrategyWrapper>(false);
auto nonconverging_strategy = std::make_shared<DummyStrategyWrapper>(TimeStepEndState::ConvergenceState::non_converged);
executor.SetSolverStrategy(nonconverging_strategy);
const auto time = 0.0;
KRATOS_EXPECT_EQ(TimeStepEndState::ConvergenceState::non_converged, executor.Run(time).convergence_state);
KRATOS_EXPECT_TRUE(executor.Run(time).NonConverged())
}

KRATOS_TEST_CASE_IN_SUITE(RunReturnsConvergedWhenStrategyConverged, KratosGeoMechanicsFastSuite)
{
TimeStepExecutor executor;
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(true);
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(TimeStepEndState::ConvergenceState::converged);
executor.SetSolverStrategy(converging_strategy);
const auto time = 0.0;
KRATOS_EXPECT_EQ(TimeStepEndState::ConvergenceState::converged, executor.Run(time).convergence_state);
KRATOS_EXPECT_TRUE(executor.Run(time).Converged())
}

KRATOS_TEST_CASE_IN_SUITE(ProcessMemberFunctionsAllCalledOnce, KratosGeoMechanicsFastSuite)
{
TimeStepExecutor executor;
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(true);
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(TimeStepEndState::ConvergenceState::converged);
executor.SetSolverStrategy(converging_strategy);
ProcessSpy spy;
TimeStepExecutor::ProcessRefVec process_refs{spy};
Expand All @@ -100,43 +100,42 @@ KRATOS_TEST_CASE_IN_SUITE(ProcessMemberFunctionsAllCalledOnce, KratosGeoMechanic

executor.Run(time);

KRATOS_EXPECT_EQ(1,spy.NumberOfExecuteInitializeSolutionStepCalls());
KRATOS_EXPECT_EQ(1,spy.NumberOfExecuteFinalizeSolutionStepCalls());
KRATOS_EXPECT_EQ(1, spy.NumberOfExecuteInitializeSolutionStepCalls());
KRATOS_EXPECT_EQ(1, spy.NumberOfExecuteFinalizeSolutionStepCalls());
}

KRATOS_TEST_CASE_IN_SUITE(SolverStrategyMemberFunctionsAllCalledOnce, KratosGeoMechanicsFastSuite)
{
TimeStepExecutor executor;
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(true);
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(TimeStepEndState::ConvergenceState::converged);
executor.SetSolverStrategy(converging_strategy);
ProcessSpy spy;
TimeStepExecutor::ProcessRefVec process_refs{spy};
TimeStepExecutor::ProcessRefVec process_refs;
executor.SetProcessReferences(process_refs);
const auto time = 0.0;

executor.Run(time);

KRATOS_EXPECT_EQ(1,converging_strategy->NumberOfSolverStrategyInitializeCalls());
KRATOS_EXPECT_EQ(1,converging_strategy->NumberOfSolverStrategyInitializeSolutionStepCalls());
KRATOS_EXPECT_EQ(1,converging_strategy->NumberOfSolverStrategyPredictCalls());
KRATOS_EXPECT_EQ(1,converging_strategy->NumberOfSolverStrategySolveSolutionStepCalls());
KRATOS_EXPECT_EQ(1,converging_strategy->NumberOfSolverStrategyFinalizeSolutionStepCalls());
KRATOS_EXPECT_EQ(1, converging_strategy->NumberOfSolverStrategyInitializeCalls());
KRATOS_EXPECT_EQ(1, converging_strategy->NumberOfSolverStrategyInitializeSolutionStepCalls());
KRATOS_EXPECT_EQ(1, converging_strategy->NumberOfSolverStrategyPredictCalls());
KRATOS_EXPECT_EQ(1, converging_strategy->NumberOfSolverStrategySolveSolutionStepCalls());
KRATOS_EXPECT_EQ(1, converging_strategy->NumberOfSolverStrategyFinalizeSolutionStepCalls());
}

KRATOS_TEST_CASE_IN_SUITE(ConvergingTimeStepExecutionReturnsGivenTime, KratosGeoMechanicsFastSuite)
{
TimeStepExecutor executor;
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(true);
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(TimeStepEndState::ConvergenceState::converged);
executor.SetSolverStrategy(converging_strategy);
const auto time = 2.0;
executor.Run(time);
//executor.Run(time);
KRATOS_EXPECT_DOUBLE_EQ(time, executor.Run(time).time);
}

KRATOS_TEST_CASE_IN_SUITE(NonConvergingTimeStepExecutionReturnsGivenTime, KratosGeoMechanicsFastSuite)
{
TimeStepExecutor executor;
auto non_converging_strategy = std::make_shared<DummyStrategyWrapper>(false);
auto non_converging_strategy = std::make_shared<DummyStrategyWrapper>(TimeStepEndState::ConvergenceState::non_converged);
executor.SetSolverStrategy(non_converging_strategy);
const auto time = 2.0;
KRATOS_EXPECT_DOUBLE_EQ(time, executor.Run(time).time);
Expand All @@ -145,7 +144,7 @@ KRATOS_TEST_CASE_IN_SUITE(NonConvergingTimeStepExecutionReturnsGivenTime, Kratos
KRATOS_TEST_CASE_IN_SUITE(TimeStepExecutionReturnsNumberOfIterations, KratosGeoMechanicsFastSuite)
{
TimeStepExecutor executor;
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(true);
auto converging_strategy = std::make_shared<DummyStrategyWrapper>(TimeStepEndState::ConvergenceState::converged);
executor.SetSolverStrategy(converging_strategy);
const auto time = 2.0;
KRATOS_EXPECT_EQ(4, executor.Run(time).num_of_iterations);
Expand Down

0 comments on commit 0fcb137

Please sign in to comment.