Commit 2ae0b0fe authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#723 FSI: move model and main into an Aitken directory (a Newton will be created shortly).

parent 80577e47
This diff is collapsed.
......@@ -6,8 +6,8 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_HPP_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_HPP_
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_HPP_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_HPP_
# include <memory>
# include <vector>
......@@ -291,7 +291,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "ModelInstances/FSI_EI/Model.hxx"
# include "ModelInstances/FSI_EI/Aitken/Model.hxx"
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_HPP_
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_HPP_
......@@ -6,8 +6,8 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_HXX_
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_HXX_
namespace HappyHeart
......@@ -405,8 +405,8 @@ namespace HappyHeart
} // namespace HappyHeart
# include "ModelInstances/FSI_EI/ModelAccessors.hxx"
# include "ModelInstances/FSI_EI/ModelForward.hxx"
# include "ModelInstances/FSI_EI/Aitken/ModelAccessors.hxx"
# include "ModelInstances/FSI_EI/Aitken/ModelForward.hxx"
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_HXX_
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_HXX_
......@@ -6,8 +6,8 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_ACCESSORS_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_ACCESSORS_HXX_
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_ACCESSORS_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_ACCESSORS_HXX_
namespace HappyHeart
......@@ -150,4 +150,4 @@ namespace HappyHeart
} // namespace HappyHeart
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_ACCESSORS_HXX_
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_ACCESSORS_HXX_
......@@ -6,8 +6,8 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_FORWARD_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_FORWARD_HXX_
#ifndef HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_FORWARD_HXX_
# define HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_FORWARD_HXX_
namespace HappyHeart
......@@ -538,7 +538,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "ModelInstances/FSI_EI/ModelAccessors.hxx"
# include "ModelInstances/FSI_EI/Aitken/ModelAccessors.hxx"
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_MODEL_FORWARD_HXX_
#endif // HAPPY_HEART_x_MODEL_INSTANCES_x_F_S_I_x_E_I_x_AITKEN_x_MODEL_FORWARD_HXX_
......@@ -13,7 +13,7 @@
#include "Operators/LocalVariationalOperatorInstances/NonlinearForm/Hyperelasticity/HyperelasticLaws/CiarletGeymonat.hpp"
#include "Operators/LocalVariationalOperatorInstances/NonlinearForm/Hyperelasticity/HyperelasticLaws/StVenantKirchhoff.hpp"
#include "ModelInstances/FSI_EI/Model.hpp"
#include "ModelInstances/FSI_EI/Aitken/Model.hpp"
#include "ModelInstances/FSI_EI/InputParameterList.hpp"
#include "ModelInstances/FSI_EI/SolidVariationalFormulationPolicy/Hyperelasticity/Policy.hpp"
#include "ModelInstances/FSI_EI/SolidVariationalFormulationPolicy/Elasticity/Policy.hpp"
......@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
FSI_EINS::Policy::Hyperelasticity
<
HyperelasticityNS::LawNS::CiarletGeymonat,
HyperelasticityNS::TimeScheme::half_sum
HyperelasticityNS::TimeScheme::midpoint
>;
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment