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

#836 Libmesh6: experimenting using it in pace of libmesh5. Currently it seems...

#836 Libmesh6: experimenting using it in pace of libmesh5. Currently it seems to work; however libmesh5 is still there to replace libmesh6 should an issue be found
parent 259c81d6
......@@ -243,6 +243,8 @@
BE2B66621A2778C700E80864 /* RefFEltSpace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2B66321A2778C700E80864 /* RefFEltSpace.cpp */; };
BE2B66631A2778C700E80864 /* RefFEltSpace.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2B66331A2778C700E80864 /* RefFEltSpace.hpp */; };
BE2B66641A2778C700E80864 /* RefFEltSpace.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE2B66341A2778C700E80864 /* RefFEltSpace.hxx */; };
BE2DCB521C7477430070090E /* libmesh6.c in Sources */ = {isa = PBXBuildFile; fileRef = BE2DCB431C7477420070090E /* libmesh6.c */; settings = {COMPILER_FLAGS = "-w"; }; };
BE2DCB531C7477430070090E /* libmesh6.h in Headers */ = {isa = PBXBuildFile; fileRef = BE2DCB441C7477420070090E /* libmesh6.h */; };
BE2E0CC81ABAFBA800B543E8 /* Domain.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2E0CC21ABAFBA800B543E8 /* Domain.hpp */; };
BE2E0CC91ABAFBA800B543E8 /* Domain.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE2E0CC31ABAFBA800B543E8 /* Domain.hxx */; };
BE2E0CCB1ABAFBA800B543E8 /* Mesh.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2E0CC51ABAFBA800B543E8 /* Mesh.hpp */; };
......@@ -989,8 +991,6 @@
BE90E1931A24929A00CCAFDE /* UniqueId.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE589C291A160ABD00D23130 /* UniqueId.hxx */; };
BE90E1941A24929A00CCAFDE /* TimeKeep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2D51D219A736CC00F6D10B /* TimeKeep.cpp */; };
BE90E1951A24929A00CCAFDE /* TimeKeep.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2D51D319A736CC00F6D10B /* TimeKeep.hpp */; };
BE90E1961A24929A00CCAFDE /* libmesh5.c in Sources */ = {isa = PBXBuildFile; fileRef = BEB9663D1A1E132A00674EB7 /* libmesh5.c */; settings = {COMPILER_FLAGS = "-w"; }; };
BE90E1971A24929A00CCAFDE /* libmesh5.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1D37D51A1E1C93004FB6E1 /* libmesh5.h */; };
BE90E1981A24929A00CCAFDE /* Lm5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE9FE80918CE0A6900177F79 /* Lm5.cpp */; };
BE90E1991A24929A00CCAFDE /* Lm5.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE9FE80A18CE0A6900177F79 /* Lm5.hpp */; };
BE90E19E1A24929A00CCAFDE /* Op.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE7DE82619CC537000D24C7D /* Op.cpp */; };
......@@ -3697,7 +3697,6 @@
BE1CBECE1B610E0C007BA865 /* BoundaryConditionDofStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoundaryConditionDofStorage.cpp; sourceTree = "<group>"; };
BE1CBECF1B610E0C007BA865 /* BoundaryConditionDofStorage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = BoundaryConditionDofStorage.hpp; sourceTree = "<group>"; };
BE1CBED01B610E0C007BA865 /* BoundaryConditionDofStorage.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = BoundaryConditionDofStorage.hxx; sourceTree = "<group>"; };
BE1D37D51A1E1C93004FB6E1 /* libmesh5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libmesh5.h; sourceTree = "<group>"; };
BE1E873C1B8DBF460002EE64 /* Definitions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Definitions.hpp; sourceTree = "<group>"; };
BE1E873E1B8DBF670002EE64 /* Definitions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Definitions.cpp; sourceTree = "<group>"; };
BE1E87441B8DC7CE0002EE64 /* VolumicMass.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = VolumicMass.hpp; path = Parameter/MaterialProperty/VolumicMass.hpp; sourceTree = "<group>"; };
......@@ -3767,6 +3766,9 @@
BE2D0C7118E08622005E8E51 /* Interface.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Interface.hpp; sourceTree = "<group>"; };
BE2D51D219A736CC00F6D10B /* TimeKeep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeKeep.cpp; sourceTree = "<group>"; };
BE2D51D319A736CC00F6D10B /* TimeKeep.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TimeKeep.hpp; sourceTree = "<group>"; };
BE2DCB431C7477420070090E /* libmesh6.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libmesh6.c; sourceTree = "<group>"; };
BE2DCB441C7477420070090E /* libmesh6.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libmesh6.h; sourceTree = "<group>"; };
BE2DCB5B1C74777A0070090E /* libmesh6.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = libmesh6.c; path = Sources/ThirdParty/Source/Lm6/libmesh6.c; sourceTree = "<group>"; };
BE2E0CC21ABAFBA800B543E8 /* Domain.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Domain.hpp; sourceTree = "<group>"; };
BE2E0CC31ABAFBA800B543E8 /* Domain.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Domain.hxx; sourceTree = "<group>"; };
BE2E0CC51ABAFBA800B543E8 /* Mesh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Mesh.hpp; sourceTree = "<group>"; };
......@@ -4435,7 +4437,6 @@
BEB917091AD3D37A0096A3D9 /* ExtendedUnknown.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtendedUnknown.cpp; sourceTree = "<group>"; };
BEB9170A1AD3D37A0096A3D9 /* ExtendedUnknown.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ExtendedUnknown.hpp; sourceTree = "<group>"; };
BEB9170B1AD3D37A0096A3D9 /* ExtendedUnknown.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ExtendedUnknown.hxx; sourceTree = "<group>"; };
BEB9663D1A1E132A00674EB7 /* libmesh5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libmesh5.c; sourceTree = "<group>"; };
BEB991A018F41AC2009ACA4C /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
BEB991A118F41AC2009ACA4C /* File.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = File.hpp; sourceTree = "<group>"; };
BEB991A218F41AC2009ACA4C /* Folder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Folder.cpp; sourceTree = "<group>"; };
......@@ -5831,6 +5832,15 @@
path = TimeKeep;
sourceTree = "<group>";
};
BE2DCB401C7477420070090E /* Lm6 */ = {
isa = PBXGroup;
children = (
BE2DCB431C7477420070090E /* libmesh6.c */,
BE2DCB441C7477420070090E /* libmesh6.h */,
);
path = Lm6;
sourceTree = "<group>";
};
BE2E0CC01ABAFB8700B543E8 /* Geometry */ = {
isa = PBXGroup;
children = (
......@@ -6191,6 +6201,7 @@
BE5BC26F16C008CF00232749 = {
isa = PBXGroup;
children = (
BE2DCB5B1C74777A0070090E /* libmesh6.c */,
BEB5009B18DC5BA900C7EFB6 /* TAGS */,
BE5BE43019336D45006BE2BF /* SConstruct */,
BEC37E0617DDC0210021BFB7 /* Accelerate.framework */,
......@@ -7512,20 +7523,11 @@
BEB9663B1A1E131000674EB7 /* Source */ = {
isa = PBXGroup;
children = (
BEB9663C1A1E131700674EB7 /* Lm5 */,
BE2DCB401C7477420070090E /* Lm6 */,
);
path = Source;
sourceTree = "<group>";
};
BEB9663C1A1E131700674EB7 /* Lm5 */ = {
isa = PBXGroup;
children = (
BEB9663D1A1E132A00674EB7 /* libmesh5.c */,
BE1D37D51A1E1C93004FB6E1 /* libmesh5.h */,
);
path = Lm5;
sourceTree = "<group>";
};
BEB9919218F41A6B009ACA4C /* Filesystem */ = {
isa = PBXGroup;
children = (
......@@ -9164,6 +9166,7 @@
BE90E1931A24929A00CCAFDE /* UniqueId.hxx in Headers */,
BE90E1C41A2492AA00CCAFDE /* SubVector.hxx in Headers */,
BE41A8C61A24AA30004E4312 /* Parmetis.hpp in Headers */,
BE2DCB531C7477430070090E /* libmesh6.h in Headers */,
BEA9649A1C47DA7F00ADDD5C /* CauchyGreenTensor.hxx in Headers */,
BE90E17B1A24926E00CCAFDE /* Singleton.hpp in Headers */,
BE90E1CD1A2492AA00CCAFDE /* PetscMat.hpp in Headers */,
......@@ -9198,7 +9201,6 @@
BE90E1B01A24929A00CCAFDE /* Vector.hpp in Headers */,
BEDEB9301C3C073100B1C71B /* Snes.hxx in Headers */,
BE90E1D01A2492AA00CCAFDE /* PetscVec.hpp in Headers */,
BE90E1971A24929A00CCAFDE /* libmesh5.h in Headers */,
BEDEB92D1C3C073100B1C71B /* Solver.hxx in Headers */,
BE768E9F1B8331AE009B24CB /* Traits.hxx in Headers */,
BEA964921C47DA7F00ADDD5C /* StVenantKirchhoff.hpp in Headers */,
......@@ -11075,7 +11077,7 @@
BE90E1711A24926E00CCAFDE /* String.cpp in Sources */,
BEEABA631A49CB5A00A875C6 /* CommandLineOptions.cpp in Sources */,
BEDEB9281C3C073100B1C71B /* Umfpack.cpp in Sources */,
BE90E1961A24929A00CCAFDE /* libmesh5.c in Sources */,
BE2DCB521C7477430070090E /* libmesh6.c in Sources */,
BE90E1941A24929A00CCAFDE /* TimeKeep.cpp in Sources */,
BE90E1611A24926E00CCAFDE /* Exception.cpp in Sources */,
BE41A8C71A24AA35004E4312 /* Parmetis.cpp in Sources */,
......@@ -12922,7 +12924,7 @@
BE0B0BDF1C6A192B0038A9B9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
......@@ -12944,7 +12946,7 @@
BE0B0BE01C6A192B0038A9B9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
......
......@@ -32,8 +32,11 @@ Wrappers/Seldon/MatrixOperations.cpp
Wrappers/Seldon/SeldonFunctions.cpp
''')
-- Previously Source/Lm5/libmesh5.c
third_party_src_filter_out_warnings = Split('''
Source/Lm5/libmesh5.c
Source/Lm6/libmesh6.c
''')
third_party_src_and_objects = []
......
......@@ -18,6 +18,10 @@
/* Defines */
/*----------------------------------------------------------*/
// Libmesh 5 hasn't been modified except this include guard added.
#ifndef HAPPY_HEART_THIRD_PARTY_SOURCE_LIBMESH6_H_
# define HAPPY_HEART_THIRD_PARTY_SOURCE_LIBMESH6_H_
#define GmfStrSiz 1024
#define GmfMaxTyp 1000
#define GmfMaxKwd GmfLastKeyword - 1
......@@ -146,3 +150,5 @@ extern char *GmfKwdFmt[ GmfMaxKwd + 1 ][4];
extern int GmfCpyLin(int, int, int);
#endif
#endif // HAPPY_HEART_THIRD_PARTY_SOURCE_LIBMESH6_H_
......@@ -19,7 +19,7 @@
// The reason is that library libmesh5.h header is not protected by an include guard.
extern "C"
{
#include "ThirdParty/Source/Lm5/libmesh5.h"
#include "ThirdParty/Source/Lm6/libmesh6.h"
}
......
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