Skip to content

Commit

Permalink
Compiles without tests
Browse files Browse the repository at this point in the history
  • Loading branch information
lmdiazangulo authored and carlosgonzalez-elemwave committed Jun 28, 2023
1 parent 2ea0ab8 commit 8555f58
Show file tree
Hide file tree
Showing 81 changed files with 763 additions and 259 deletions.
83 changes: 82 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,88 @@
{
"files.associations": {
"memory": "cpp",
"iostream": "cpp"
"iostream": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"cctype": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"filesystem": "cpp",
"format": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"functional": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"istream": "cpp",
"iterator": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"mutex": "cpp",
"new": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"ranges": "cpp",
"ratio": "cpp",
"set": "cpp",
"source_location": "cpp",
"span": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"string": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"utility": "cpp",
"valarray": "cpp",
"variant": "cpp",
"vector": "cpp",
"xfacet": "cpp",
"xhash": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xmemory": "cpp",
"xstddef": "cpp",
"xstring": "cpp",
"xtr1common": "cpp",
"xtree": "cpp",
"xutility": "cpp"
},
"cmake.generator": "Ninja",
"cmake.additionalCompilerSearchDirs": [
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ option(OPENSEMBA_ENABLE_TESTS OFF)

message(STATUS "OPEMSEMBA_ENABLE_TESTS: " ${OPENSEMBA_ENABLE_TESTS})

include_directories(src/ src/core/)
include_directories(src/)

add_subdirectory(src/core)
add_subdirectory(src/parsers)
Expand Down
14 changes: 7 additions & 7 deletions src/core/ProblemDescription.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once

#include "geometry/Grid.h"
#include "physicalModel/Bound.h"
#include "source/Group.h"
#include "outputRequest/Group.h"
#include "model/Model.h"
#include <nlohmann/json.hpp>

#include "nlohmann/json.hpp"
#include "filesystem/Project.h"
#include "core/geometry/Grid.h"
#include "core/physicalModel/Bound.h"
#include "core/source/Group.h"
#include "core/outputRequest/Group.h"
#include "core/model/Model.h"
#include "core/filesystem/Project.h"

namespace SEMBA {

Expand Down
1 change: 1 addition & 0 deletions src/core/class/GroupIdentifiableUnique.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <memory>
#include <set>
#include <iterator>
#include <vector>

namespace SEMBA {
namespace Class {
Expand Down
5 changes: 3 additions & 2 deletions src/core/geometry/BoundTerminations.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

#include <array>
#include <memory>
#include "geometry/element/Element.h"
#include "physicalModel/Bound.h"

#include "core/geometry/element/Element.h"
#include "core/physicalModel/Bound.h"

namespace SEMBA {
namespace Geometry {
Expand Down
4 changes: 2 additions & 2 deletions src/core/geometry/Box.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <exception>
#include <utility>

#include "math/vector/Cartesian.h"
#include "Grid.h"
#include "core/math/vector/Cartesian.h"
#include "core/geometry/Grid.h"

namespace SEMBA {
namespace Geometry {
Expand Down
4 changes: 2 additions & 2 deletions src/core/geometry/Grid.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <algorithm>
#include <array>

#include "Box.h"
#include "math/util/Real.h"
#include "core/geometry/Box.h"
#include "core/math/util/Real.h"

namespace SEMBA {
namespace Geometry {
Expand Down
11 changes: 5 additions & 6 deletions src/core/geometry/coordinate/Coordinate.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

#include <memory>

#include "geometry/Grid.h"
#include "math/vector/Cartesian.h"

#include "class/Class.h"
#include "class/Identifiable.h"
#include "class/Identification.h"
#include "core/geometry/Grid.h"
#include "core/math/vector/Cartesian.h"
#include "core/class/Class.h"
#include "core/class/Identifiable.h"
#include "core/class/Identification.h"

namespace SEMBA {
namespace Geometry {
Expand Down
3 changes: 2 additions & 1 deletion src/core/geometry/coordinate/Group.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
#pragma warning(disable:4250)
#endif

#include "core/class/GroupIdentifiableUnique.h"

#include "Coordinate.h"
#include "class/GroupIdentifiableUnique.h"

namespace SEMBA {
namespace Geometry {
Expand Down
1 change: 1 addition & 0 deletions src/core/geometry/element/Element.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "Element.h"

#include <algorithm>
#include <vector>

namespace SEMBA {
namespace Geometry {
Expand Down
19 changes: 9 additions & 10 deletions src/core/geometry/element/Element.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#pragma once

#include "math/vector/Cartesian.h"
#include "geometry/Box.h"
#include "geometry/Grid.h"
#include "geometry/coordinate/Group.h"
#include "geometry/layer/Group.h"
#include "physicalModel/Group.h"

#include "class/Class.h"
#include "class/Identifiable.h"
#include "class/Identification.h"
#include "core/math/vector/Cartesian.h"
#include "core/physicalModel/Group.h"
#include "core/geometry/Box.h"
#include "core/geometry/Grid.h"
#include "core/geometry/coordinate/Group.h"
#include "core/geometry/layer/Group.h"
#include "core/class/Class.h"
#include "core/class/Identifiable.h"
#include "core/class/Identification.h"

#include <algorithm>

Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/element/Group.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "Surface.h"
#include "Volume.h"

#include "class/GroupIdentifiableUnique.h"
#include "core/class/GroupIdentifiableUnique.h"

namespace SEMBA {
namespace Geometry {
Expand Down
5 changes: 1 addition & 4 deletions src/core/geometry/element/Line.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@


#pragma once

#include "math/simplex/Line.h"

#include "core/math/simplex/Line.h"
#include "Element.h"

namespace SEMBA {
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/element/LineConformal.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "geometry/coordinate/Conformal.h"
#include "core/geometry/coordinate/Conformal.h"

#include "Line2.h"

Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/element/Tetrahedron.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "math/simplex/Tetrahedron.h"
#include "core/math/simplex/Tetrahedron.h"
#include "Triangle3.h"
#include "Volume.h"

Expand Down
4 changes: 1 addition & 3 deletions src/core/geometry/element/Triangle.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@


#pragma once

#include "math/simplex/Triangle.h"
#include "core/math/simplex/Triangle.h"

#include "Surface.h"

Expand Down
5 changes: 1 addition & 4 deletions src/core/geometry/element/Volume.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@


#pragma once

#include <exception>

#include "math/simplex/Simplex.h"
#include "core/math/simplex/Simplex.h"
#include "Surface.h"

#include "Element.h"

namespace SEMBA {
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/graph/Connectivities.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "geometry/element/Group.h"
#include "core/geometry/element/Group.h"

#include "Vertices.h"

Expand Down
3 changes: 2 additions & 1 deletion src/core/geometry/graph/Vertices.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#pragma once

#include "core/geometry/coordinate/Coordinate.h"

#include "Graph.h"
#include "geometry/coordinate/Coordinate.h"

namespace SEMBA {
namespace Geometry {
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/layer/Group.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "Layer.h"
#include "class/GroupIdentifiableUnique.h"
#include "core/class/GroupIdentifiableUnique.h"

namespace SEMBA {
namespace Geometry {
Expand Down
7 changes: 4 additions & 3 deletions src/core/geometry/layer/Layer.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
#include <string>
#include <memory>

#include "class/Class.h"
#include "class/Identifiable.h"
#include "class/Identification.h"
#include "core/class/Identifiable.h"
#include "core/class/Identification.h"

namespace SEMBA {
namespace Geometry {
Expand Down Expand Up @@ -45,6 +44,8 @@ class Layer final : public virtual Class::Class,
static std::string spaceToUnderscore(std::string rhs);
};



} /* namespace Layer */

typedef Layer::Id LayerId;
Expand Down
2 changes: 0 additions & 2 deletions src/core/geometry/mesh/Geometric.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


#include "Geometric.h"

namespace SEMBA {
Expand Down
2 changes: 2 additions & 0 deletions src/core/geometry/mesh/Geometric.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "core/geometry/Grid.h"

#include "Unstructured.h"

namespace SEMBA {
Expand Down
19 changes: 8 additions & 11 deletions src/core/geometry/mesh/Mesh.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
#pragma once

#include "math/Types.h"
#include "geometry/Box.h"

#include "class/Class.h"
#include "class/Identifiable.h"
#include "class/Identification.h"

#include "geometry/element/Element.h"
#include "geometry/element/Group.h"

#include "physicalModel/Group.h"
#include "core/math/Types.h"
#include "core/geometry/Box.h"
#include "core/class/Class.h"
#include "core/class/Identifiable.h"
#include "core/class/Identification.h"
#include "core/geometry/element/Element.h"
#include "core/geometry/element/Group.h"
#include "core/physicalModel/Group.h"

namespace SEMBA {
namespace Geometry {
Expand Down
2 changes: 0 additions & 2 deletions src/core/geometry/mesh/Structured.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


#include "Unstructured.h"
#include "Structured.h"

Expand Down
13 changes: 6 additions & 7 deletions src/core/geometry/mesh/Structured.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

#pragma once

#include <exception>

#include "geometry/element/Hexahedron8.h"

#include "Mesh.h"
#include "geometry/Grid.h"
#include "geometry/BoundTerminations.h"
#include "geometry/coordinate/Group.h"
#include "geometry/element/Group.h"
#include "geometry/layer/Group.h"
#include "core/geometry/Grid.h"
#include "core/geometry/BoundTerminations.h"
#include "core/geometry/coordinate/Group.h"
#include "core/geometry/element/Group.h"
#include "core/geometry/layer/Group.h"

namespace SEMBA {
namespace Geometry {
Expand Down
Loading

0 comments on commit 8555f58

Please sign in to comment.