Commit fa9196f7 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#860 Few cosmetics, and fix incorrect Lua file in the XCode scheme.

parent 9bf7696d
......@@ -1613,13 +1613,6 @@
remoteGlobalIDString = BEA8A378177AD4FE009436C9;
remoteInfo = Utilities;
};
13557E9C1CAEB3FF0051513D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BECCA6D61C97F8F30061FAD3 /* M3DISIM-HappyHeart.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1300774B1C99628200AFBA8F;
remoteInfo = CardiacMechanicsActive;
};
13A7FD831C3FF95700257E99 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
......@@ -3048,6 +3041,13 @@
remoteGlobalIDString = BEA8A378177AD4FE009436C9;
remoteInfo = Utilities;
};
BE9A01C71CB509C600B637EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BECCA6D61C97F8F30061FAD3 /* M3DISIM-HappyHeart.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = BEF8AFF11C98149A003704A4;
remoteInfo = CardiacMechanics;
};
BE9EA0311B8F15CB00B60AC2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
......@@ -8203,7 +8203,7 @@
BE8262B51C97FD7E00524DEC /* Products */ = {
isa = PBXGroup;
children = (
13557E9D1CAEB3FF0051513D /* CardiacMechanicsActive */,
BE9A01C81CB509C600B637EB /* CardiacMechanics */,
);
name = Products;
sourceTree = "<group>";
......@@ -12043,13 +12043,6 @@
/* End PBXProject section */
 
/* Begin PBXReferenceProxy section */
13557E9D1CAEB3FF0051513D /* CardiacMechanicsActive */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.executable";
path = CardiacMechanicsActive;
remoteRef = 13557E9C1CAEB3FF0051513D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BE43AD351AFB9ADB0082AF43 /* libOps.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
......@@ -12057,6 +12050,13 @@
remoteRef = BE43AD341AFB9ADB0082AF43 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BE9A01C81CB509C600B637EB /* CardiacMechanics */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.executable";
path = CardiacMechanics;
remoteRef = BE9A01C71CB509C600B637EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BEE79A1F1C995B5F00F05519 /* libSeldon.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
......@@ -16292,6 +16292,7 @@
1318EE041CAEC0AF005F2579 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
13A7FD231C3FF71400257E99 /* Build configuration list for PBXNativeTarget "ReactionDiffusion_FHN" */ = {
isa = XCConfigurationList;
......@@ -63,7 +63,7 @@
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "--input_parameters ${HOME}/Codes/HappyHeart/Data/Lua/demo_cardiac_mechanics_prestress.lua"
argument = "--input_parameters ${HOME}/Codes/HappyHeart/Data/Lua/demo_input_cardiac_mechanics_prestress.lua"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
......
......@@ -14,7 +14,7 @@
# include <memory>
# include <vector>
#include "Utilities/TimeKeep/TimeKeep.hpp"
# include "Utilities/TimeKeep/TimeKeep.hpp"
# include "Model/Model.hpp"
......@@ -30,6 +30,9 @@ namespace HappyHeart
{
/*!
* \brief Model for pre-stress cardiac mechanics.
*/
class Model : public HappyHeart::Model<Model, DoConsiderProcessorWiseLocal2Global::yes>
{
......@@ -146,7 +149,7 @@ namespace HappyHeart
};
} // namespace CardiacMechanicsPrestressNS
} // namespace CardiacMechanicsPrestressNS
} // namespace HappyHeart
......
......@@ -8,9 +8,9 @@
// Copyright © 2016 Inria. All rights reserved.
//
# include "Utilities/Exceptions/PrintAndAbort.hpp"
# include "Utilities/Filesystem/Folder.hpp"
# include "Utilities/Filesystem/File.hpp"
#include "Utilities/Exceptions/PrintAndAbort.hpp"
#include "Utilities/Filesystem/Folder.hpp"
#include "Utilities/Filesystem/File.hpp"
#include "Parameters/Compound/Solid/Solid.hpp"
......@@ -861,6 +861,7 @@ namespace HappyHeart
rhs_norm_previous_iter_ = rhs_norm_iter;
}
void VariationalFormulation::WasTangentQuadratic()
{
if (tangent_not_quadratic_)
......
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