Commit dac72fb3 authored by GILLES Sebastien's avatar GILLES Sebastien

#356 Make a quite empty demo code compile and run (but it does pretty much nothing...).

parent 1f66ae2b
......@@ -16,8 +16,6 @@
BE26B3D91A5C1C0B00FEF241 /* libOps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2393141A23977700E24C84 /* libOps.a */; };
BE26B3DA1A5C1C0B00FEF241 /* libSeldon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2393191A23978400E24C84 /* libSeldon.a */; };
BE26B3DB1A5C1C0B00FEF241 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC37E0617DDC0210021BFB7 /* Accelerate.framework */; };
BE26B3DD1A5C1E5800FEF241 /* ElasticityModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE63B4921A31C20E003A6523 /* ElasticityModel.cpp */; };
BE26B3DE1A5C1E5800FEF241 /* VariationalFormulationElasticity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE63B4981A31C20E003A6523 /* VariationalFormulationElasticity.cpp */; };
BE2B66351A2778C700E80864 /* BasicRefFElt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2B65FE1A2778C700E80864 /* BasicRefFElt.cpp */; };
BE2B66361A2778C700E80864 /* BasicRefFElt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2B65FF1A2778C700E80864 /* BasicRefFElt.hpp */; };
BE2B66371A2778C700E80864 /* BasicRefFElt.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE2B66001A2778C700E80864 /* BasicRefFElt.hxx */; };
......@@ -97,8 +95,8 @@
BE4238361A431E8400666812 /* libOps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2393141A23977700E24C84 /* libOps.a */; };
BE42A43B1A5D650E00B3FF6B /* InitTimeKeepLog.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE42A4381A5D650E00B3FF6B /* InitTimeKeepLog.hpp */; };
BE42A43C1A5D650E00B3FF6B /* InitTimeKeepLog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE42A4391A5D650E00B3FF6B /* InitTimeKeepLog.hxx */; };
BE42A44E1A5D6F7A00B3FF6B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE42A44D1A5D6F7A00B3FF6B /* main.cpp */; };
BE42A4561A5D6FC300B3FF6B /* Model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE42A4531A5D6FC300B3FF6B /* Model.cpp */; };
BE42A4711A5D734000B3FF6B /* Model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE42A46E1A5D734000B3FF6B /* Model.cpp */; };
BE42A4731A5D738B00B3FF6B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE42A4721A5D738B00B3FF6B /* main.cpp */; };
BE438D881A3EE658004AC229 /* WorkMatrices.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE438D851A3EE658004AC229 /* WorkMatrices.hpp */; };
BE438D891A3EE658004AC229 /* WorkMatrices.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE438D861A3EE658004AC229 /* WorkMatrices.hxx */; };
BE438D8C1A3EF493004AC229 /* WorkVectors.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE438D8A1A3EF493004AC229 /* WorkVectors.hpp */; };
......@@ -1093,10 +1091,11 @@
BE4225F219E41C6F008F6FA5 /* EnumInterface.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = EnumInterface.hxx; sourceTree = "<group>"; };
BE42A4381A5D650E00B3FF6B /* InitTimeKeepLog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = InitTimeKeepLog.hpp; path = src/Core/InitTimeKeepLog.hpp; sourceTree = "<group>"; };
BE42A4391A5D650E00B3FF6B /* InitTimeKeepLog.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = InitTimeKeepLog.hxx; path = src/Core/InitTimeKeepLog.hxx; sourceTree = "<group>"; };
BE42A44D1A5D6F7A00B3FF6B /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = Demo/main.cpp; sourceTree = "<group>"; };
BE42A4531A5D6FC300B3FF6B /* Model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Model.cpp; path = Demo/Model.cpp; sourceTree = "<group>"; };
BE42A4541A5D6FC300B3FF6B /* Model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Model.hpp; path = Demo/Model.hpp; sourceTree = "<group>"; };
BE42A4551A5D6FC300B3FF6B /* Model.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Model.hxx; path = Demo/Model.hxx; sourceTree = "<group>"; };
BE42A4591A5D70C300B3FF6B /* InputParameterList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = InputParameterList.hpp; path = Demo/InputParameterList.hpp; sourceTree = "<group>"; };
BE42A46E1A5D734000B3FF6B /* Model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Model.cpp; path = Demo/Model.cpp; sourceTree = "<group>"; };
BE42A46F1A5D734000B3FF6B /* Model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Model.hpp; path = Demo/Model.hpp; sourceTree = "<group>"; };
BE42A4701A5D734000B3FF6B /* Model.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Model.hxx; path = Demo/Model.hxx; sourceTree = "<group>"; };
BE42A4721A5D738B00B3FF6B /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = Demo/main.cpp; sourceTree = "<group>"; };
BE438D851A3EE658004AC229 /* WorkMatrices.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = WorkMatrices.hpp; sourceTree = "<group>"; };
BE438D861A3EE658004AC229 /* WorkMatrices.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = WorkMatrices.hxx; sourceTree = "<group>"; };
BE438D8A1A3EF493004AC229 /* WorkVectors.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = WorkVectors.hpp; sourceTree = "<group>"; };
......@@ -2541,10 +2540,11 @@
BE7C1C641A5BF4D100AD8884 /* Demo */ = {
isa = PBXGroup;
children = (
BE42A44D1A5D6F7A00B3FF6B /* main.cpp */,
BE42A4531A5D6FC300B3FF6B /* Model.cpp */,
BE42A4541A5D6FC300B3FF6B /* Model.hpp */,
BE42A4551A5D6FC300B3FF6B /* Model.hxx */,
BE42A4591A5D70C300B3FF6B /* InputParameterList.hpp */,
BE42A46E1A5D734000B3FF6B /* Model.cpp */,
BE42A46F1A5D734000B3FF6B /* Model.hpp */,
BE42A4701A5D734000B3FF6B /* Model.hxx */,
BE42A4721A5D738B00B3FF6B /* main.cpp */,
);
name = Demo;
sourceTree = "<group>";
......@@ -4727,10 +4727,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BE26B3DD1A5C1E5800FEF241 /* ElasticityModel.cpp in Sources */,
BE26B3DE1A5C1E5800FEF241 /* VariationalFormulationElasticity.cpp in Sources */,
BE42A44E1A5D6F7A00B3FF6B /* main.cpp in Sources */,
BE42A4561A5D6FC300B3FF6B /* Model.cpp in Sources */,
BE42A4731A5D738B00B3FF6B /* main.cpp in Sources */,
BE42A4711A5D734000B3FF6B /* Model.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
......@@ -14,7 +14,7 @@
#include "Core/InitTimeKeepLog.hpp"
#include "Problems/___VARIABLE_groupName:identifier___/InputParameterList.hpp"
#include "Problems/___VARIABLE_groupName:identifier___/___VARIABLE_problemName:identifier___Model.hpp"
#include "Problems/___VARIABLE_groupName:identifier___/Model.hpp"
using namespace HappyHeart;
......@@ -56,5 +56,5 @@ int main(int argc, char ** argv)
exit(-1);
}
return 0;x
return 0;
}
......@@ -14,7 +14,6 @@
# include "Model/Model.hpp"
# include "Problems/___VARIABLE_groupName:identifier___/VariationalFormulation.hpp"
# include "Problems/___VARIABLE_groupName:identifier___/InputParameterList.hpp"
......
//
// InputParameterList.hpp
// HappyHeart
//
// Created by Sebastien Gilles on 07/01/15.
// Copyright (c) 2015 Inria. All rights reserved.
//
#ifndef __HappyHeart__InputParameterList__HPP
# define __HappyHeart__InputParameterList__HPP
# include "Core/InputParameterList.hpp"
namespace HappyHeart
{
namespace DemoElasticityNS
{
typedef std::tuple
<
InputParameter::Transient::TimeStep,
InputParameter::Transient::Time,
InputParameter::Transient::TimeMax,
InputParameter::Variable::Variable,
InputParameter::Variable::Nature,
InputParameter::Variable::DegreeOfExactness,
InputParameter::Variable::TypeOfFiniteElement,
InputParameter::BoundaryCondition::EssentialBoundaryConditionsMethod,
InputParameter::BoundaryCondition::Component,
InputParameter::BoundaryCondition::Variable,
InputParameter::BoundaryCondition::BCValue,
InputParameter::BoundaryCondition::BoundaryConditionTypeValue,
InputParameter::BoundaryCondition::NumLabel,
InputParameter::BoundaryCondition::Label,
InputParameter::Miscellaneous::Verbose,
InputParameter::Mesh::InputMesh,
InputParameter::Mesh::MeshDir,
InputParameter::Petsc::AbsoluteTolerance,
InputParameter::Petsc::GmresRestart,
InputParameter::Petsc::MaxIteration,
InputParameter::Petsc::Preconditioner,
InputParameter::Petsc::RelativeTolerance,
InputParameter::Petsc::SetPreconditionerOption,
InputParameter::Petsc::Solver,
InputParameter::Result::OutputDirectory,
InputParameter::Solid::PlaneStressStrain,
InputParameter::Solid::VolumicOrSurfacicForce,
InputParameter::Solid::Poisson,
InputParameter::Solid::Young,
InputParameter::Solid::VolumicMass,
InputParameter::Force::Value,
InputParameter::Force::LabelList,
InputParameter::Result::MeditWriteSolution,
InputParameter::Result::EnsightWriteSolution
> InputParameterTuple;
typedef InputParameterList<InputParameterTuple> InputParameterList;
} // namespace DemoElasticityNS
} // namespace HappyHeart
#endif /* defined(__HappyHeart__InputParameterList__HPP) */
......@@ -31,7 +31,7 @@ namespace HappyHeart
// - Definitions of the GodOfDof (definition is foreseen withinDerivedInitializeGodOfDofList()).
}
GodOfDof::vector_unique_ptr Model
::DerivedInitializeGodOfDofList(const InputParameterList& input_parameter_data)
{
......@@ -44,6 +44,10 @@ namespace HappyHeart
// (in that case you should inline the function).
// If you consider more subtile cases, look at the structure of this default case to build your own.
// Currently GodOfDof is built systematically for every mesh; this is obviously a temporary behaviour.
return this->DefaultDerivedInitializeGodOfDofList(input_parameter_data,
DoComputeLocal2GlobalProcessorWise::yes);
}
......
......@@ -14,7 +14,6 @@
# include "Model/Model.hpp"
# include "Problems/Demo/VariationalFormulation.hpp"
# include "Problems/Demo/InputParameterList.hpp"
......
......@@ -14,7 +14,7 @@
#include "Core/InitTimeKeepLog.hpp"
#include "Problems/Demo/InputParameterList.hpp"
#include "Problems/Demo/DemoElasticityModel.hpp"
#include "Problems/Demo/Model.hpp"
using namespace HappyHeart;
......@@ -56,5 +56,5 @@ int main(int argc, char ** argv)
exit(-1);
}
return 0;x
return 0;
}
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