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

#325 - #320 Update SCons compilation and fix some problems it showed.

parent 56878dbe
......@@ -645,9 +645,9 @@
BEA2155517FD82320014AC13 /* libCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE05B52916D238FE000E248D /* libCore.a */; };
BEA2155817FD82320014AC13 /* libGeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE05B4DD16D23573000E248D /* libGeometry.a */; };
BEA2155917FD82320014AC13 /* libUtilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEA8A379177AD4FE009436C9 /* libUtilities.a */; };
BEA2639D1A28CEE5001802B6 /* GeometricElement_free_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA2639A1A28CEE5001802B6 /* GeometricElement_free_functions.cpp */; };
BEA2639E1A28CEE5001802B6 /* GeometricElement_free_functions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEA2639B1A28CEE5001802B6 /* GeometricElement_free_functions.hpp */; };
BEA2639F1A28CEE5001802B6 /* GeometricElement_free_functions.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEA2639C1A28CEE5001802B6 /* GeometricElement_free_functions.hxx */; };
BEA2639D1A28CEE5001802B6 /* GeometricElt_free_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA2639A1A28CEE5001802B6 /* GeometricElt_free_functions.cpp */; };
BEA2639E1A28CEE5001802B6 /* GeometricElt_free_functions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEA2639B1A28CEE5001802B6 /* GeometricElt_free_functions.hpp */; };
BEA2639F1A28CEE5001802B6 /* GeometricElt_free_functions.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEA2639C1A28CEE5001802B6 /* GeometricElt_free_functions.hxx */; };
BEA263A21A28D00D001802B6 /* libOps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2393141A23977700E24C84 /* libOps.a */; };
BEA263A31A28D00D001802B6 /* libSeldon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2393191A23978400E24C84 /* libSeldon.a */; };
BEA263B21A28D0C6001802B6 /* main_test_jacobian.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA263AF1A28D0C6001802B6 /* main_test_jacobian.cpp */; };
......@@ -1136,9 +1136,9 @@
BEA0757718605FBD00E83E71 /* input_elasticity.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = input_elasticity.lua; path = ../../../data/input_elasticity.lua; sourceTree = "<group>"; };
BEA2158817FDAB950014AC13 /* Mpi.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Mpi.hpp; path = src/Core/Mpi.hpp; sourceTree = "<group>"; };
BEA2158A17FDACB70014AC13 /* Mpi.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = Mpi.hxx; path = src/Core/Mpi.hxx; sourceTree = "<group>"; };
BEA2639A1A28CEE5001802B6 /* GeometricElement_free_functions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeometricElement_free_functions.cpp; sourceTree = "<group>"; };
BEA2639B1A28CEE5001802B6 /* GeometricElement_free_functions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GeometricElement_free_functions.hpp; sourceTree = "<group>"; };
BEA2639C1A28CEE5001802B6 /* GeometricElement_free_functions.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GeometricElement_free_functions.hxx; sourceTree = "<group>"; };
BEA2639A1A28CEE5001802B6 /* GeometricElt_free_functions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeometricElt_free_functions.cpp; sourceTree = "<group>"; };
BEA2639B1A28CEE5001802B6 /* GeometricElt_free_functions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GeometricElt_free_functions.hpp; sourceTree = "<group>"; };
BEA2639C1A28CEE5001802B6 /* GeometricElt_free_functions.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GeometricElt_free_functions.hxx; sourceTree = "<group>"; };
BEA263A81A28D092001802B6 /* TestJacobian */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestJacobian; sourceTree = BUILT_PRODUCTS_DIR; };
BEA263AF1A28D0C6001802B6 /* main_test_jacobian.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main_test_jacobian.cpp; sourceTree = "<group>"; };
BEA3248617A7E5BA00ADEB73 /* Exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Exception.cpp; sourceTree = "<group>"; };
......@@ -2086,9 +2086,9 @@
BE13455A19CC1174003ED11A /* GeometricElt.cpp */,
BE13455B19CC1174003ED11A /* GeometricElt.hpp */,
BE13455C19CC1174003ED11A /* GeometricElt.hxx */,
BEA2639A1A28CEE5001802B6 /* GeometricElement_free_functions.cpp */,
BEA2639B1A28CEE5001802B6 /* GeometricElement_free_functions.hpp */,
BEA2639C1A28CEE5001802B6 /* GeometricElement_free_functions.hxx */,
BEA2639A1A28CEE5001802B6 /* GeometricElt_free_functions.cpp */,
BEA2639B1A28CEE5001802B6 /* GeometricElt_free_functions.hpp */,
BEA2639C1A28CEE5001802B6 /* GeometricElt_free_functions.hxx */,
BE13455D19CC1174003ED11A /* RefGeomElt.cpp */,
BE13455E19CC1174003ED11A /* RefGeomElt.hpp */,
BE0BD92019D187E4001B3EB6 /* RefGeomElt.hxx */,
......@@ -3447,11 +3447,11 @@
BE90DFD91A24915500CCAFDE /* BuildInterfaceListHelper.hpp in Headers */,
BE90E0141A24915500CCAFDE /* LocalData.hpp in Headers */,
BE90DFDC1A24915500CCAFDE /* ComputeOrientation.hxx in Headers */,
BEA2639E1A28CEE5001802B6 /* GeometricElement_free_functions.hpp in Headers */,
BEA2639E1A28CEE5001802B6 /* GeometricElt_free_functions.hpp in Headers */,
BE90E05B1A24915500CCAFDE /* MeshLevelInterfaceList.hpp in Headers */,
BE90E0451A24915500CCAFDE /* Format.hpp in Headers */,
BE90DFC31A24915500CCAFDE /* Vertex.hpp in Headers */,
BEA2639F1A28CEE5001802B6 /* GeometricElement_free_functions.hxx in Headers */,
BEA2639F1A28CEE5001802B6 /* GeometricElt_free_functions.hxx in Headers */,
BE90E0431A24915500CCAFDE /* Format_fwd.hpp in Headers */,
BE90E00F1A24915500CCAFDE /* Hexahedron20.hpp in Headers */,
BE90DFE01A24915500CCAFDE /* Segment2.hpp in Headers */,
......@@ -4253,7 +4253,7 @@
BE90E05A1A24915500CCAFDE /* MeshLevelInterfaceList.cpp in Sources */,
BE90DFAD1A24915500CCAFDE /* GeometricElt.cpp in Sources */,
BE90E04E1A24915500CCAFDE /* GeometricEltList.cpp in Sources */,
BEA2639D1A28CEE5001802B6 /* GeometricElement_free_functions.cpp in Sources */,
BEA2639D1A28CEE5001802B6 /* GeometricElt_free_functions.cpp in Sources */,
BE90DFCC1A24915500CCAFDE /* Face.cpp in Sources */,
BE90E02D1A24915500CCAFDE /* Triangle6.cpp in Sources */,
BE90DFB31A24915500CCAFDE /* Coords.cpp in Sources */,
......
......@@ -173,7 +173,7 @@ namespace HappyHeart
for (unsigned int i = 0; i < Nnode; ++i)
{
assert(internal_index < geom_ref_shape_function_values_.size());
spatial_point[icoor] += GetPoint(i, icoor) * geom_ref_shape_function_values_[internal_index++];
spatial_point.GetNonCstValue(icoor) += GetPoint(i, icoor) * geom_ref_shape_function_values_[internal_index++];
}
}
......
//
// GeometricElement_free_functions.cpp
// GeometricElt_free_functions.cpp
// HappyHeart
//
// Created by Sebastien Gilles on 28/11/14.
......@@ -13,7 +13,7 @@
#include "Geometry/GeometricElt.hpp"
#include "Geometry/RefGeomElt.hpp"
#include "Geometry/GeometricElement_free_functions.hpp"
#include "Geometry/GeometricElt_free_functions.hpp"
#include "Geometry/LocalCoords.hpp"
#include "Geometry/Coords.hpp"
#include "Geometry/Private/GeometricEltFactory.hpp"
......
//
// GeometricElement_free_functions.hpp
// GeometricElt_free_functions.hpp
// HappyHeart
//
// Created by Sebastien Gilles on 28/11/14.
......@@ -52,7 +52,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Geometry/GeometricElement_free_functions.hxx"
# include "Geometry/GeometricElt_free_functions.hxx"
#endif // _HAPPY_HEART__GEOMETRY__GEOMETRIC_ELEMENT_FREE_FUNCTIONS_HPP_
//
// GeometricElement_free_functions.hxx
// GeometricElt_free_functions.hxx
// HappyHeart
//
// Created by Sebastien Gilles on 28/11/14.
......
......@@ -24,6 +24,7 @@ GeometricElements/Tetrahedron4.cpp
GeometricElements/Triangle3.cpp
GeometricElements/Triangle6.cpp
GeometricElt.cpp
GeometricElt_free_functions.cpp
GeometricMeshRegion.cpp
GeometricMeshRegion_Connectivity.cpp
GeometricMeshRegion__Ensight.cpp
......
......@@ -16,7 +16,7 @@
#include "Geometry/GeometricMeshRegion.hpp"
#include "Geometry/GeometricMeshRegion_Connectivity.hpp"
#include "Geometry/GeometricElement_free_functions.hpp"
#include "Geometry/GeometricElt_free_functions.hpp"
int main(int argc, char** argv)
......
......@@ -38,7 +38,17 @@ test_coloring = env.Program('test_coloring', main_coloring_src,
LIBPATH=env['LIBPATH'])
list_exec.extend((test, test_ondomatic_numbering, test_coloring))
main_jacobian_src = Split('''
Geometry/main_test_jacobian.cpp
''')
test_jacobian = env.Program('test_jacobian', main_jacobian_src,
LIBS=all_libs,
LIBPATH=env['LIBPATH'])
list_exec.extend((test, test_ondomatic_numbering, test_coloring, test_jacobian))
Return('list_exec')
......@@ -24,7 +24,6 @@
# include "Geometry/GeometricMeshRegion.hpp"
# include "Geometry/GeometricElement_free_functions.hpp
# include "Geometry/GeometricReferenceElements/Traits/Topology/Triangle.hpp"
# include "Geometry/GeometricReferenceElements/Traits/Topology/Point.hpp"
# include "Geometry/GeometricReferenceElements/Traits/Topology/Quadrangle.hpp"
......
Supports Markdown
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