Merge pull request #711 from vovannikov/683-post-setup-for-auxiliary-integrator

Call `post_setup()` for the auxiliary time integrator in `StructureTimeAdaJoint`

Author: maxfirmbach

src/adapter/4C_adapter_str_timeada_joint.cpp

@@ -28,7 +28,7 @@ FOUR_C_NAMESPACE_OPEN
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
 Adapter::StructureTimeAdaJoint::StructureTimeAdaJoint(std::shared_ptr<Structure> structure)
-    : StructureTimeAda(structure), sta_(nullptr), sta_wrapper_(nullptr)
+    : StructureTimeAda(structure), sta_(nullptr)
 {
   if (stm_->is_setup()) setup_auxiliary();
 }
@@ -91,12 +91,11 @@ void Adapter::StructureTimeAdaJoint::setup_auxiliary()
   sta_->init(dataio, datasdyn, dataglobalstate);
   sta_->setup();
 
-  // setup wrapper
-  sta_wrapper_ = std::make_shared<Adapter::StructureTimeLoop>(sta_);
-
   const int restart = Global::Problem::instance()->restart();
   if (restart)
   {
+    sta_->post_setup();
+
     const Solid::TimeInt::Base& sti = *stm_;
     const auto& gstate = sti.data_global_state();
     dataglobalstate->get_dis_n()->update(1.0, *(gstate.get_dis_n()), 0.0);
@@ -240,4 +239,15 @@ void Adapter::StructureTimeAdaJoint::reset_step()
   sta_->reset_step();
 }
 
+/*----------------------------------------------------------------------*/
+/*----------------------------------------------------------------------*/
+void Adapter::StructureTimeAdaJoint::post_setup()
+{
+  // base post setup
+  Adapter::StructureTimeAda::post_setup();
+
+  // post setup the auxiliary time integrator
+  sta_->post_setup();
+}
+
 FOUR_C_NAMESPACE_CLOSE

src/adapter/4C_adapter_str_timeada_joint.hpp

@@ -55,6 +55,9 @@ namespace Adapter
     //! Provide type of algorithm
     enum AdaEnum method_adapt_dis() const override;
 
+    //! Override since we need to setup the auxiliary time integrator
+    void post_setup() override;
+
    protected:
     /// setup of the auxiliary time integrator
     void setup_auxiliary() override;
@@ -66,9 +69,6 @@ namespace Adapter
     //! the auxiliary integrator
     std::shared_ptr<Solid::TimeInt::Base> sta_;
 
-    //! wrapper of the auxiliary integrator
-    std::shared_ptr<Structure> sta_wrapper_;
-
     /*! \brief Make one step with auxiliary scheme
      *
      *  Afterwards, the auxiliary solutions are stored in the local error