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

#743 Merge branch '723_fsi_newton' into 743_tag_v15.47

# Conflicts:
#	HappyHeart.xcodeproj/project.pbxproj
#	Sources/ModelInstances/FSI_EI/Newton/ModelForward.hxx
#	Sources/ThirdParty/Wrappers/Petsc/Solver/Snes.cpp
#	Sources/ThirdParty/Wrappers/Petsc/Solver/Snes.hpp
parents 0fb96b28 d8073d07
......@@ -21,7 +21,7 @@ transient = {
-- Maximum time, if set to zero run a case.
-- Expected format: VALUE
-- Constraint: v >= 0.
timeMax = 3.1e-4
timeMax = 6.e-4
} -- transient
......
......@@ -337,6 +337,7 @@
BE4754E91A84C26D0055DD5B /* HappyHeartPetscVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4754E81A84C26D0055DD5B /* HappyHeartPetscVector.cpp */; };
BE48C0AF1AD3BE6300D2B076 /* DofComputations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE48C0AE1AD3BE6300D2B076 /* DofComputations.cpp */; };
BE4B17D51AA5B20D0073516A /* Print.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B17D21AA5B20D0073516A /* Print.cpp */; };
BE4B8B911BEA53290060BBC4 /* ShellMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B8B901BEA53290060BBC4 /* ShellMatrix.cpp */; };
BE4CAB021BB00A62005D3362 /* SourceOrTargetData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4CAAFF1BB00A62005D3362 /* SourceOrTargetData.cpp */; };
BE4CAB031BB00A62005D3362 /* SourceOrTargetData.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE4CAB001BB00A62005D3362 /* SourceOrTargetData.hpp */; };
BE4CAB041BB00A62005D3362 /* SourceOrTargetData.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE4CAB011BB00A62005D3362 /* SourceOrTargetData.hxx */; };
......@@ -359,7 +360,6 @@
BE56978E1BE383AD00B2EC67 /* MatrixOperations.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE56978B1BE383AD00B2EC67 /* MatrixOperations.hpp */; };
BE56978F1BE383AD00B2EC67 /* MatrixOperations.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE56978C1BE383AD00B2EC67 /* MatrixOperations.hxx */; };
BE5697A81BE3878700B2EC67 /* BaseMatrix.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE5697A51BE3878700B2EC67 /* BaseMatrix.hpp */; };
BE5697AF1BE396E100B2EC67 /* ShellMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5697AC1BE396E100B2EC67 /* ShellMatrix.cpp */; };
BE5697B01BE396E100B2EC67 /* ShellMatrix.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE5697AD1BE396E100B2EC67 /* ShellMatrix.hpp */; };
BE5697B11BE396E100B2EC67 /* ShellMatrix.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE5697AE1BE396E100B2EC67 /* ShellMatrix.hxx */; };
BE58EB751B9087B1006899EA /* InitializeHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE58EB741B9087B1006899EA /* InitializeHelper.cpp */; };
......@@ -3763,6 +3763,7 @@
BE4AB01A1A236A13002B554E /* MeshLevelInterfaceList.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MeshLevelInterfaceList.hxx; sourceTree = "<group>"; };
BE4B17CF1AA5AB0E0073516A /* Print.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Print.hxx; sourceTree = "<group>"; };
BE4B17D21AA5B20D0073516A /* Print.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Print.cpp; sourceTree = "<group>"; };
BE4B8B901BEA53290060BBC4 /* ShellMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShellMatrix.cpp; sourceTree = "<group>"; };
BE4C4E4318E96468005EF46C /* Volume.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Volume.cpp; sourceTree = "<group>"; };
BE4C4E4418E96468005EF46C /* Volume.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Volume.hpp; sourceTree = "<group>"; };
BE4C4E4518E96468005EF46C /* Volume.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Volume.hxx; sourceTree = "<group>"; };
......@@ -3791,7 +3792,6 @@
BE56978B1BE383AD00B2EC67 /* MatrixOperations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MatrixOperations.hpp; sourceTree = "<group>"; };
BE56978C1BE383AD00B2EC67 /* MatrixOperations.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MatrixOperations.hxx; sourceTree = "<group>"; };
BE5697A51BE3878700B2EC67 /* BaseMatrix.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = BaseMatrix.hpp; path = Private/BaseMatrix.hpp; sourceTree = "<group>"; };
BE5697AC1BE396E100B2EC67 /* ShellMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShellMatrix.cpp; sourceTree = "<group>"; };
BE5697AD1BE396E100B2EC67 /* ShellMatrix.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ShellMatrix.hpp; sourceTree = "<group>"; };
BE5697AE1BE396E100B2EC67 /* ShellMatrix.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ShellMatrix.hxx; sourceTree = "<group>"; };
BE589C281A160ABD00D23130 /* UniqueId.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = UniqueId.hpp; path = Sources/Utilities/UniqueId/UniqueId.hpp; sourceTree = "<group>"; };
......@@ -8040,7 +8040,7 @@
BEEFEF72196ECCC000C80FF1 /* Matrix.cpp */,
BEEFEF73196ECCC000C80FF1 /* Matrix.hpp */,
BEEFEF74196ECCC000C80FF1 /* Matrix.hxx */,
BE5697AC1BE396E100B2EC67 /* ShellMatrix.cpp */,
BE4B8B901BEA53290060BBC4 /* ShellMatrix.cpp */,
BE5697AD1BE396E100B2EC67 /* ShellMatrix.hpp */,
BE5697AE1BE396E100B2EC67 /* ShellMatrix.hxx */,
BEEFEF75196ECCC000C80FF1 /* MatrixPattern.cpp */,
......@@ -10395,7 +10395,6 @@
BE90E1901A24929A00CCAFDE /* Folder.cpp in Sources */,
BE90E1AC1A24929A00CCAFDE /* MatrixPattern.cpp in Sources */,
BE4B17D51AA5B20D0073516A /* Print.cpp in Sources */,
BE5697AF1BE396E100B2EC67 /* ShellMatrix.cpp in Sources */,
BE4F2DA31BE7FFDE00FFF373 /* Umfpack.cpp in Sources */,
BE90E16D1A24926E00CCAFDE /* BoolArray.cpp in Sources */,
BE41E96D1AC3F92A0072C8E6 /* EmptyString.cpp in Sources */,
......@@ -10423,6 +10422,7 @@
BE6E4EE11B2ABE8B0049BB2D /* AccessGhostContent.cpp in Sources */,
BE90E1B21A24929A00CCAFDE /* AccessVectorContent.cpp in Sources */,
BE90E1981A24929A00CCAFDE /* Lm5.cpp in Sources */,
BE4B8B911BEA53290060BBC4 /* ShellMatrix.cpp in Sources */,
BE41A8D11A24AA7F004E4312 /* Petsc.cpp in Sources */,
BE90E1AF1A24929A00CCAFDE /* Vector.cpp in Sources */,
BE90E1711A24926E00CCAFDE /* String.cpp in Sources */,
......
......@@ -43,7 +43,6 @@ namespace HappyHeart
snes_jacobian_(snes_jacobian),
snes_viewer_(snes_viewer)
{
// \todo #730 Improve this ugly switch (by a factory).
// It is there as it is easier at the moment to deal this way with the different possible constructor
// arguments; factory could be introduced when InitSolver() that calls current constructor is more
......
......@@ -69,6 +69,7 @@ namespace HappyHeart
friend Instantiations::Gmres;
friend Instantiations::Umfpack;
public:
......
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