Merge pull request #1468 from lkoeglmeier/Adapt-restart-and-output-in-structure_new-to-new-output

Remove write_vector call of old output mechanism in Solid::ModelEvaluator::Structure::output_step_state

Author: lkoeglmeier

src/structure_new/src/4C_structure_new_timint_base.cpp

@@ -501,6 +501,8 @@ void Solid::TimeInt::Base::output_step(bool forced_writerestart)
     if (dataio_->should_write_restart_for_step(dataglobalstate_->get_step_n()) or
         dataglobalstate_->get_step_n() == Global::Problem::instance()->restart())
       return;
+    // TODO: This if statement can be removed once Solid::ModelEvaluator::Contact::output_step_state
+    // is removed
     // if state already exists, add restart information
     if (dataio_->write_results_for_this_step(dataglobalstate_->get_step_n()))
     {
@@ -524,6 +526,8 @@ void Solid::TimeInt::Base::output_step(bool forced_writerestart)
   }
 
   // output results (not necessary if restart in same step)
+  // TODO: This if statement can be removed once Solid::ModelEvaluator::Contact::output_step_state
+  // is removed
   if (dataio_->is_write_state() and
       dataio_->write_results_for_this_step(dataglobalstate_->get_step_n()) and (not datawritten))
   {
@@ -655,7 +659,8 @@ void Solid::TimeInt::Base::output_restart(bool& datawritten)
   output_ptr->write_node_data(dataio_->is_first_output_of_run());
   dataio_->set_first_output_of_run(false);
 
-  // add velocity and acceleration if necessary
+  // add displacement, velocity and acceleration
+  output_ptr->write_vector("displacement", dataglobalstate_->get_dis_n());
   output_ptr->write_vector("velocity", dataglobalstate_->get_vel_n());
   output_ptr->write_vector("acceleration", dataglobalstate_->get_acc_n());
 
@@ -679,6 +684,7 @@ void Solid::TimeInt::Base::add_restart_to_output_state()
   std::shared_ptr<Core::IO::DiscretizationWriter> output_ptr = dataio_->get_output_ptr();
 
   // output of velocity and acceleration
+  output_ptr->write_vector("displacement", dataglobalstate_->get_dis_n());
   output_ptr->write_vector("velocity", dataglobalstate_->get_vel_n());
   output_ptr->write_vector("acceleration", dataglobalstate_->get_acc_n());
 

src/structure_new/src/model_evaluator/4C_structure_new_model_evaluator_structure.cpp

@@ -1378,10 +1378,6 @@ void Solid::ModelEvaluator::Structure::write_restart(
   // write forces
   iowriter.write_vector("fstructure_old", global_state().get_fstructure_old());
   iowriter.write_vector("fint", global_state().get_fint_n());
-
-  if (forced_writerestart) return;
-
-  iowriter.write_vector("displacement", global_state().get_dis_n());
 }
 
 /*----------------------------------------------------------------------------*
@@ -1705,16 +1701,6 @@ void Solid::ModelEvaluator::Structure::determine_energy(const Core::LinAlg::Vect
   }
 }
 
-/*----------------------------------------------------------------------------*
- *----------------------------------------------------------------------------*/
-void Solid::ModelEvaluator::Structure::output_step_state(
-    Core::IO::DiscretizationWriter& iowriter) const
-{
-  check_init_setup();
-
-  iowriter.write_vector("displacement", global_state().get_dis_n());
-}
-
 /*----------------------------------------------------------------------------*
  *----------------------------------------------------------------------------*/
 void Solid::ModelEvaluator::Structure::runtime_pre_output_step_state()

src/structure_new/src/model_evaluator/4C_structure_new_model_evaluator_structure.hpp

@@ -148,7 +148,7 @@ namespace Solid
       void reset_step_state() override;
 
       //! derived
-      void output_step_state(Core::IO::DiscretizationWriter& iowriter) const override;
+      void output_step_state(Core::IO::DiscretizationWriter& iowriter) const override {};
 
       //! derived
       void runtime_pre_output_step_state() override;