Merge pull request #484 from dragos-ana/fix-post-setup-structure-timint

Fix post_setup calls for new structural time integration

Author: c-p-schmidt

src/adapter/4C_adapter_str_structure.hpp

@@ -147,6 +147,11 @@ namespace Adapter
 
     //@}
 
+    /*!
+     * @brief Perform all necessary tasks after setting up the object.
+     */
+    virtual void post_setup() = 0;
+
     //! @name Vector access
     //@{
 

src/adapter/4C_adapter_str_wrapper.hpp

@@ -54,6 +54,13 @@ namespace Adapter
 
     //@}
 
+    /*!
+     * @brief Perform all necessary tasks after setting up structure
+     * wrapper. Currently, the method only calls the post setup routine of the
+     * underlying structural time integration.
+     */
+    void post_setup() override { structure_->post_setup(); }
+
     //! @name Vector access
     //@{
 

src/contact/4C_contact_nitsche_integrator_ssi.cpp

@@ -206,46 +206,20 @@ void CONTACT::IntegratorNitscheSsi::so_ele_cauchy_struct(Mortar::Element& mortar
   linearizations.solid.d_cauchyndir_ddir = &d_sigma_nt_dt;
   linearizations.solid.d_cauchyndir_dxi = &d_sigma_nt_dxi;
 
-  if (mortar_ele.mo_data().parent_scalar().empty())
-  {
-    // Note: This branch is only needed since the structure is evaluating itself during setup before
-    // the ssi problem is setup. Once this is fixed, this can be deleted.
-    sigma_nt = std::invoke(
-        [&]()
-        {
-          auto* solid_scatra_ele =
-              dynamic_cast<Discret::Elements::SolidScatra*>(mortar_ele.parent_element());
-
-          FOUR_C_ASSERT_ALWAYS(solid_scatra_ele,
-              "Nitsche contact is not implemented for this element (expecting SOLIDSCATRA "
-              "element)!");
-
-          // SSI is not yet setup, so don't set the scalar.
-          // Note: Once it is fixed in the structure time integration framework, the
-          // scalars-parameter can be made non-optional
-          return solid_scatra_ele->get_normal_cauchy_stress_at_xi(
-              mortar_ele.mo_data().parent_disp(), std::nullopt, parent_xi, gp_normal, test_dir,
-              linearizations);
-        });
-  }
-  else
-  {
-    linearizations.d_cauchyndir_ds = d_sigma_nt_ds;
-    sigma_nt = std::invoke(
-        [&]()
-        {
-          auto* solid_scatra_ele =
-              dynamic_cast<Discret::Elements::SolidScatra*>(mortar_ele.parent_element());
-
-          FOUR_C_ASSERT_ALWAYS(solid_scatra_ele,
-              "Nitsche contact is not implemented for this element (expecting SOLIDSCATRA "
-              "element)!");
-
-          return solid_scatra_ele->get_normal_cauchy_stress_at_xi(
-              mortar_ele.mo_data().parent_disp(), mortar_ele.mo_data().parent_scalar(), parent_xi,
-              gp_normal, test_dir, linearizations);
-        });
-  }
+  linearizations.d_cauchyndir_ds = d_sigma_nt_ds;
+  sigma_nt = std::invoke(
+      [&]()
+      {
+        auto* solid_scatra_ele =
+            dynamic_cast<Discret::Elements::SolidScatra*>(mortar_ele.parent_element());
+
+        FOUR_C_ASSERT_ALWAYS(solid_scatra_ele,
+            "Nitsche contact is not implemented for this element (expecting SOLIDSCATRA "
+            "element)!");
+
+        return solid_scatra_ele->get_normal_cauchy_stress_at_xi(mortar_ele.mo_data().parent_disp(),
+            mortar_ele.mo_data().parent_scalar(), parent_xi, gp_normal, test_dir, linearizations);
+      });
 
   cauchy_nt_wgt += nitsche_wgt * sigma_nt;
 

src/ehl/4C_ehl_base.hpp

@@ -12,6 +12,7 @@
 #include "4C_config.hpp"
 
 #include "4C_adapter_algorithmbase.hpp"
+#include "4C_adapter_str_structure.hpp"
 #include "4C_coupling_adapter.hpp"
 #include "4C_ehl_input.hpp"
 #include "4C_linalg_utils_sparse_algebra_math.hpp"
@@ -45,6 +46,13 @@ namespace EHL
     /// setup
     virtual void setup_system() = 0;
 
+    /*!
+     * @brief Perform all necessary tasks after setting up the object.
+     * Currently, this only calls the post setup routine of the
+     * structure field.
+     */
+    void post_setup() { structure_->post_setup(); }
+
     /// timeloop of coupled problem
     virtual void timeloop() = 0;
 

src/ehl/4C_ehl_dyn.cpp

@@ -115,7 +115,15 @@ void ehl_dyn()
 
   // 3.2- Read restart if needed. (discretization called inside)
   const int restart = problem->restart();
-  if (restart) ehl->read_restart(restart);
+  if (restart)
+  {
+    ehl->read_restart(restart);
+  }
+  else
+  {
+    // run post_setup
+    ehl->post_setup();
+  }
 
   // 4.- Run of the actual problem.
 

src/fsi/src/4C_fsi_algorithm.cpp

@@ -120,6 +120,15 @@ void FSI::Algorithm::setup()
   coupsf_ = std::make_shared<Coupling::Adapter::Coupling>();
 }
 
+/*----------------------------------------------------------------------*/
+/*----------------------------------------------------------------------*/
+void FSI::Algorithm::post_setup()
+{
+  // call post_setup routine of the structural field
+  structure_->post_setup();
+}
+
+
 
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/

src/fsi/src/4C_fsi_algorithm.hpp

@@ -58,6 +58,13 @@ namespace FSI
     /// setup this object
     virtual void setup();
 
+    /*!
+     * @brief Perform all necessary tasks after setting up the FSI
+     * algorithm. Currently, this only calls the post_setup routine of the
+     * structure field.
+     */
+    void post_setup();
+
     /// access to structure field
     const std::shared_ptr<Adapter::FSIStructureWrapper>& structure_field() { return structure_; }
 

src/fsi/src/4C_fsi_dyn.cpp

@@ -342,6 +342,10 @@ void fsi_immersed_drt()
     // read the restart information, set vectors and variables
     fsi->read_restart(restart);
   }
+  else
+  {
+    fsi->post_setup();
+  }
 
   fsi->timeloop(Teuchos::rcpFromRef(*fsi));
 
@@ -548,6 +552,10 @@ void fsi_ale_drt()
       {
         fsi->read_restart(restart);
       }
+      else
+      {
+        fsi->post_setup();
+      }
 
       // now do the coupling setup and create the combined dofmap
       fsi->setup_system();
@@ -595,6 +603,10 @@ void fsi_ale_drt()
       {
         fsi->read_restart(restart);
       }
+      else
+      {
+        fsi->post_setup();
+      }
 
       // now do the coupling setup and create the combined dofmap
       fsi->setup_system();
@@ -646,6 +658,11 @@ void fsi_ale_drt()
         // read the restart information, set vectors and variables
         fsi->read_restart(restart);
       }
+      else
+      {
+        // call post setup tasks
+        fsi->post_setup();
+      }
 
       fsi->timeloop(Teuchos::rcpFromRef(*fsi));
 
@@ -799,6 +816,11 @@ void xfsi_drt()
         // read the restart information, set vectors and variables
         fsi->read_restart(restart);
       }
+      else
+      {
+        // call post setup tasks
+        fsi->post_setup();
+      }
 
       fsi->timeloop(Teuchos::rcpFromRef(*fsi));
 

src/fsi/src/monolithic/4C_fsi_monolithic.cpp

@@ -365,6 +365,15 @@ FSI::Monolithic::Monolithic(MPI_Comm comm, const Teuchos::ParameterList& timepar
   }
 }
 
+/*----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------*/
+void FSI::MonolithicBase::post_setup()
+{
+  // call post_setup of the structure field
+  structure_->post_setup();
+}
+
+
 /*----------------------------------------------------------------------------*/
 /*----------------------------------------------------------------------------*/
 void FSI::Monolithic::setup_system()

src/fsi/src/monolithic/4C_fsi_monolithic.hpp

@@ -105,6 +105,13 @@ namespace FSI
     explicit MonolithicBase(MPI_Comm comm, const Teuchos::ParameterList& timeparams);
 
 
+    /*!
+     * @brief Perform all necessary tasks after setting up the object.
+     * Currently, this only calls the post_setup method of the structure
+     * field.
+     */
+    void post_setup();
+
     /// read restart data
     void read_restart(int step) override;