Commit 53586a0b authored by GILLES Sebastien's avatar GILLES Sebastien

#1062 Revert include convention change introduced in #1039.

parent 3f595f27

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -535,6 +535,7 @@
BE2058CE1D882CDF00C35F28 /* DetermineExtendedUnknownList.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE2058CB1D882CDF00C35F28 /* DetermineExtendedUnknownList.hxx */; };
BE2058D31D88325600C35F28 /* Helper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2058D01D88325600C35F28 /* Helper.hpp */; };
BE2058D41D88325600C35F28 /* Helper.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE2058D11D88325600C35F28 /* Helper.hxx */; };
BE2195191DF813290014FE44 /* Libmesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE9FE80918CE0A6900177F79 /* Libmesh.cpp */; };
BE2433A91CD0E701008175D1 /* EnumTopology.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2433A81CD0E701008175D1 /* EnumTopology.cpp */; };
BE2457A11E005AED00677AEF /* libCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE05B52916D238FE000E248D /* libCore.a */; };
BE2457A21E005AED00677AEF /* libUtilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEA8A379177AD4FE009436C9 /* libUtilities.a */; };
......@@ -1642,7 +1643,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 */; };
BE90E1981A24929A00CCAFDE /* Libmesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE9FE80918CE0A6900177F79 /* Libmesh.cpp */; };
BE90E1991A24929A00CCAFDE /* Libmesh.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE9FE80A18CE0A6900177F79 /* Libmesh.hpp */; };
BE90E19E1A24929A00CCAFDE /* Op.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE7DE82619CC537000D24C7D /* Op.cpp */; };
BE90E19F1A24929A00CCAFDE /* Op.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE7DE82719CC537000D24C7D /* Op.hpp */; };
......@@ -6502,8 +6502,8 @@
BE9EA61A1C89F50900836E0E /* ParameterAtDof.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ParameterAtDof.hpp; sourceTree = "<group>"; };
BE9EBD0B1AADDBAD001B8FC8 /* demo_input_hyperelasticity_3d.lua */ = {isa = PBXFileReference; lastKnownFileType = text; name = demo_input_hyperelasticity_3d.lua; path = Data/Lua/demo_input_hyperelasticity_3d.lua; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
BE9EBD0D1AADE038001B8FC8 /* demo_input_heat_1d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = demo_input_heat_1d.lua; path = Data/Lua/demo_input_heat_1d.lua; sourceTree = SOURCE_ROOT; };
BE9FE80918CE0A6900177F79 /* Libmesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Libmesh.cpp; path = ../Libmesh/Libmesh.cpp; sourceTree = "<group>"; };
BE9FE80A18CE0A6900177F79 /* Libmesh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Libmesh.hpp; path = ../Libmesh/Libmesh.hpp; sourceTree = "<group>"; };
BE9FE80918CE0A6900177F79 /* Libmesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Libmesh.cpp; sourceTree = "<group>"; };
BE9FE80A18CE0A6900177F79 /* Libmesh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Libmesh.hpp; sourceTree = "<group>"; };
BE9FE81218CE0A6900177F79 /* Mpi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mpi.cpp; sourceTree = "<group>"; };
BE9FE81318CE0A6900177F79 /* Mpi.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Mpi.hpp; sourceTree = "<group>"; };
BE9FE81418CE0A6900177F79 /* Mpi.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Mpi.hxx; sourceTree = "<group>"; };
......@@ -11467,8 +11467,7 @@
BE9FE80918CE0A6900177F79 /* Libmesh.cpp */,
BE9FE80A18CE0A6900177F79 /* Libmesh.hpp */,
);
name = Libmesh;
path = Lm5;
path = Libmesh;
sourceTree = "<group>";
};
BE9FE80D18CE0A6900177F79 /* Mpi */ = {
......@@ -16560,6 +16559,7 @@
BE90E1631A24926E00CCAFDE /* Factory.cpp in Sources */,
BE90E19E1A24929A00CCAFDE /* Op.cpp in Sources */,
BE1E87621B8DFB710002EE64 /* PrepareDefaultEntry.cpp in Sources */,
BE2195191DF813290014FE44 /* Libmesh.cpp in Sources */,
BE4ED31C1A2CBAC400DE374E /* MatrixOperations.cpp in Sources */,
BE90E1BD1A24929A00CCAFDE /* Viewer.cpp in Sources */,
BE90E1821A24929A00CCAFDE /* InputParameterList.cpp in Sources */,
......@@ -16579,7 +16579,6 @@
BE6E4EE11B2ABE8B0049BB2D /* AccessGhostContent.cpp in Sources */,
BEDEB9251C3C073100B1C71B /* Mumps.cpp in Sources */,
BE90E1B21A24929A00CCAFDE /* AccessVectorContent.cpp in Sources */,
BE90E1981A24929A00CCAFDE /* Libmesh.cpp in Sources */,
BE41A8D11A24AA7F004E4312 /* Petsc.cpp in Sources */,
BE90E1AF1A24929A00CCAFDE /* Vector.cpp in Sources */,
BE90E1711A24926E00CCAFDE /* String.cpp in Sources */,
......@@ -20218,7 +20217,7 @@
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = all;
USER_HEADER_SEARCH_PATHS = ../HappyHeart;
USER_HEADER_SEARCH_PATHS = Sources;
VALIDATE_PRODUCT = NO;
WARNING_CFLAGS = (
"-Weverything",
......@@ -20334,7 +20333,7 @@
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = macosx;
STRIP_STYLE = all;
USER_HEADER_SEARCH_PATHS = ../HappyHeart;
USER_HEADER_SEARCH_PATHS = Sources;
VALIDATE_PRODUCT = NO;
WARNING_CFLAGS = (
"-Weverything",
......@@ -315,7 +315,7 @@ def DefineEnvironment(vars):
# List of include directories.
include_dirs = [
env['HAPPY_HEART_ROOT'],
os.path.join(env['HAPPY_HEART_ROOT'], 'Sources'),
os.path.join(env['HAPPY_HEART_ROOT'], 'Sources', 'ThirdParty', 'Source'),
env['OPEN_MPI_INCL_DIR'],
env['PETSC_GENERAL_INCL_DIR'],
......
......@@ -104,7 +104,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "HappyHeart/Core/Crtp/NumberingSubsetForMatrix.hxx"
# include "Core/Crtp/NumberingSubsetForMatrix.hxx"
#endif // HAPPY_HEART_x_CORE_x_CRTP_x_NUMBERING_SUBSET_FOR_MATRIX_HPP_
......@@ -12,18 +12,18 @@
# define HAPPY_HEART_x_CORE_x_INIT_HAPPY_HEART_HPP_
# include "HappyHeart/ThirdParty/Wrappers/Mpi/Mpi.hpp"
# include "HappyHeart/ThirdParty/Wrappers/Petsc/Petsc.hpp"
# include "HappyHeart/ThirdParty/Wrappers/Petsc/Print.hpp"
# include "ThirdParty/Wrappers/Mpi/Mpi.hpp"
# include "ThirdParty/Wrappers/Petsc/Petsc.hpp"
# include "ThirdParty/Wrappers/Petsc/Print.hpp"
# include "HappyHeart/Utilities/CommandLineOptions/CommandLineOptions.hpp"
# include "HappyHeart/Utilities/Filesystem/File.hpp"
# include "HappyHeart/Utilities/InputParameterList/Base.hpp"
# include "HappyHeart/Utilities/TimeKeep/TimeKeep.hpp"
# include "HappyHeart/Utilities/Environment/EnvironmentVariable.hpp"
# include "Utilities/CommandLineOptions/CommandLineOptions.hpp"
# include "Utilities/Filesystem/File.hpp"
# include "Utilities/InputParameterList/Base.hpp"
# include "Utilities/TimeKeep/TimeKeep.hpp"
# include "Utilities/Environment/EnvironmentVariable.hpp"
# include "HappyHeart/Core/InputParameter/Result.hpp"
# include "HappyHeart/Core/InitTimeKeepLog.hpp"
# include "Core/InputParameter/Result.hpp"
# include "Core/InitTimeKeepLog.hpp"
namespace HappyHeart
......@@ -102,7 +102,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "HappyHeart/Core/InitHappyHeart.hxx"
# include "Core/InitHappyHeart.hxx"
#endif // HAPPY_HEART_x_CORE_x_INIT_HAPPY_HEART_HPP_
......@@ -11,13 +11,13 @@
#ifndef HAPPY_HEART_x_CORE_x_INIT_TIME_KEEP_LOG_HPP_
# define HAPPY_HEART_x_CORE_x_INIT_TIME_KEEP_LOG_HPP_
# include "HappyHeart/ThirdParty/Wrappers/Mpi/Mpi.hpp"
# include "ThirdParty/Wrappers/Mpi/Mpi.hpp"
# include "HappyHeart/Utilities/TimeKeep/TimeKeep.hpp"
# include "HappyHeart/Utilities/Filesystem/File.hpp"
# include "Utilities/TimeKeep/TimeKeep.hpp"
# include "Utilities/Filesystem/File.hpp"
# include "HappyHeart/Core/InputParameterData/InputParameterList.hpp"
# include "HappyHeart/Core/InputParameter/Result.hpp"
# include "Core/InputParameterData/InputParameterList.hpp"
# include "Core/InputParameter/Result.hpp"
namespace HappyHeart
......@@ -48,7 +48,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "HappyHeart/Core/InitTimeKeepLog.hxx"
# include "Core/InitTimeKeepLog.hxx"
#endif // HAPPY_HEART_x_CORE_x_INIT_TIME_KEEP_LOG_HPP_
......@@ -8,7 +8,7 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
#include "Core/InputParameter/Crtp/Section.hpp"
namespace HappyHeart
......
......@@ -13,8 +13,8 @@
# include <string>
# include "HappyHeart/Utilities/InputParameterList/Crtp/Section.hpp"
# include "HappyHeart/Utilities/InputParameterList/Crtp/InputParameter.hpp"
# include "Utilities/InputParameterList/Crtp/Section.hpp"
# include "Utilities/InputParameterList/Crtp/InputParameter.hpp"
......@@ -68,7 +68,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "HappyHeart/Core/InputParameter/Crtp/Section.hxx"
# include "Core/InputParameter/Crtp/Section.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_CRTP_x_SECTION_HPP_
......@@ -11,10 +11,10 @@
#ifndef HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_DIRICHLET_BOUNDARY_CONDITION_x_DIRICHLET_BOUNDARY_CONDITION_HPP_
# define HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_DIRICHLET_BOUNDARY_CONDITION_x_DIRICHLET_BOUNDARY_CONDITION_HPP_