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

#1399 Mostly cosmetic and coding style changes.

parent d297f965
......@@ -2757,7 +2757,7 @@
13D6A66F1EA9F4CF0050363A /* ScalarParameterFromFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScalarParameterFromFile.cpp; sourceTree = "<group>"; };
13D6A6701EA9F4CF0050363A /* ScalarParameterFromFile.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScalarParameterFromFile.hpp; sourceTree = "<group>"; };
13D6A6711EA9F4CF0050363A /* ScalarParameterFromFile.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScalarParameterFromFile.hxx; sourceTree = "<group>"; };
13DC8B311F2B408400F490B3 /* demo_input_test_domain_list_in_coords.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_input_test_domain_list_in_coords.lua; sourceTree = "<group>"; };
13DC8B311F2B408400F490B3 /* demo.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo.lua; sourceTree = "<group>"; };
13DC8B321F2B408400F490B3 /* InputData.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = InputData.hpp; sourceTree = "<group>"; };
13DC8B331F2B408400F490B3 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
13DC8B341F2B408400F490B3 /* Model.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Model.cpp; sourceTree = "<group>"; };
......@@ -3294,6 +3294,10 @@
BE1D44A822560BF000911391 /* Mpi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mpi.cpp; sourceTree = "<group>"; };
BE1D44AE22560CD100911391 /* Environment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Environment.cpp; sourceTree = "<group>"; };
BE1D44B022560CE100911391 /* Environment.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Environment.hpp; sourceTree = "<group>"; };
BE1D44BD225B462800911391 /* cylinderBug.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = cylinderBug.lua; sourceTree = "<group>"; };
BE1D44BE225B462800911391 /* cylinderOK.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = cylinderOK.lua; sourceTree = "<group>"; };
BE1D44BF225B906600911391 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BE1D44C0225B907000911391 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; 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>"; };
BE1EBAFD1CA0957300EC0EAA /* main_test_coloring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main_test_coloring.cpp; path = Coloring/main_test_coloring.cpp; sourceTree = "<group>"; };
......@@ -4406,6 +4410,11 @@
BEB0C6161EC304EF00D62905 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
BEB0C6171EC3054500D62905 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
BEB0C6181EC3054E00D62905 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
BEB1B555225C9D25001DCCC3 /* cylinderOK_ensight.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = cylinderOK_ensight.lua; sourceTree = "<group>"; };
BEB1B557225C9DD8001DCCC3 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BEB1B559225CB155001DCCC3 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BEB1B55C225CB156001DCCC3 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
BEB1B55E225CB156001DCCC3 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
BEB291831CA02E5600A74738 /* main_interpolator_P1_P1b.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main_interpolator_P1_P1b.cpp; sourceTree = "<group>"; };
BEB309251DACE63C006C8A00 /* ParameterInstance.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ParameterInstance.hpp; sourceTree = "<group>"; };
BEB309261DACE63C006C8A00 /* ParameterInstance.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ParameterInstance.hxx; sourceTree = "<group>"; };
......@@ -5416,8 +5425,9 @@
13DC8B301F2B408400F490B3 /* DomainListInCoords */ = {
isa = PBXGroup;
children = (
BE1D44C0225B907000911391 /* CMakeLists.txt */,
BEFC98501F5085200025A424 /* README */,
13DC8B311F2B408400F490B3 /* demo_input_test_domain_list_in_coords.lua */,
13DC8B311F2B408400F490B3 /* demo.lua */,
13DC8B321F2B408400F490B3 /* InputData.hpp */,
13DC8B331F2B408400F490B3 /* main.cpp */,
13DC8B341F2B408400F490B3 /* Model.cpp */,
......@@ -6696,7 +6706,9 @@
BE372DCE18C47F1100127212 /* Geometry */ = {
isa = PBXGroup;
children = (
BE1D44BF225B906600911391 /* CMakeLists.txt */,
BEA263AF1A28D0C6001802B6 /* main_test_jacobian.cpp */,
BEB1B556225C9DAC001DCCC3 /* EnsightMeditMesh */,
13DC8B301F2B408400F490B3 /* DomainListInCoords */,
BE8C80FA1EA12E2900FDC7D8 /* LightweightDomainList */,
BE1EBAFB1CA0954C00EC0EAA /* Coloring */,
......@@ -7986,6 +7998,9 @@
BE63B4911A31C20E003A6523 /* Elasticity */ = {
isa = PBXGroup;
children = (
BE1D44BD225B462800911391 /* cylinderBug.lua */,
BE1D44BE225B462800911391 /* cylinderOK.lua */,
BEB1B555225C9D25001DCCC3 /* cylinderOK_ensight.lua */,
BE964C7D206E8E3B00B9ED1E /* CMakeLists.txt */,
BEB0C6161EC304EF00D62905 /* README */,
BE6EA61E1EC32FFB0085E651 /* demo_input_elasticity_3d.lua */,
......@@ -8769,6 +8784,7 @@
BE8C80FA1EA12E2900FDC7D8 /* LightweightDomainList */ = {
isa = PBXGroup;
children = (
BEB1B557225C9DD8001DCCC3 /* CMakeLists.txt */,
BEFC98511F50859C0025A424 /* README */,
BE8C80FB1EA12E2900FDC7D8 /* demo_input_test_lightweight_domain_list.lua */,
BE8C80FC1EA12E2900FDC7D8 /* InputData.hpp */,
......@@ -9309,6 +9325,16 @@
path = Exceptions;
sourceTree = "<group>";
};
BEB1B556225C9DAC001DCCC3 /* EnsightMeditMesh */ = {
isa = PBXGroup;
children = (
BEB1B55C225CB156001DCCC3 /* README.md */,
BEB1B559225CB155001DCCC3 /* CMakeLists.txt */,
BEB1B55E225CB156001DCCC3 /* main.cpp */,
);
path = EnsightMeditMesh;
sourceTree = "<group>";
};
BEB309221DACE63C006C8A00 /* Internal */ = {
isa = PBXGroup;
children = (
......@@ -62,12 +62,24 @@
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "-i ${HOME}/Codes/MoReFEM/CoreLibrary/Sources/ModelInstances/Elasticity/demo_input_elasticity.lua"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-i ${HOME}/Codes/MoReFEM/CoreLibrary/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d.lua"
isEnabled = "YES">
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-i ${HOME}/Codes/MoReFEM/CoreLibrary/Sources/ModelInstances/Elasticity/demo_input_elasticity.lua"
argument = "-i ${HOME}/Codes/MoReFEM/CoreLibrary/Sources/ModelInstances/Elasticity/cylinderBug.lua"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-i ${HOME}/Codes/MoReFEM/CoreLibrary/Sources/ModelInstances/Elasticity/cylinderOK.lua"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-i ${HOME}/Codes/MoReFEM/CoreLibrary/Sources/ModelInstances/Elasticity/cylinderOK_ensight.lua"
isEnabled = "NO">
</CommandLineArgument>
</CommandLineArguments>
......
......@@ -42,7 +42,7 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
......@@ -64,6 +64,14 @@
<CommandLineArguments>
<CommandLineArgument
argument = "-i /Volumes/Data/${USER}/MoReFEM/Results/Elasticity/3D/input_data.lua"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-i /Volumes/Data/${USER}/MoReFEM/Results/CylinderBug/input_data.lua"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-i /Volumes/Data/${USER}/MoReFEM/Results/CylinderOK/input_data.lua"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
......
......@@ -37,9 +37,6 @@ namespace MoReFEM
//! Convenient alias.
using self = InitialConditionGate;
//! Friendship to section parent.
using parent = Crtp::Section<self, NoEnclosingSection>;
......
......@@ -182,6 +182,7 @@ namespace MoReFEM
void FEltSpace::SetFEltList(const Mesh& mesh, const Domain& domain)
{
std::cout << "SetFEltList for domain " << domain.GetUniqueId() << std::endl;
const auto felt_space_dimension = GetDimension();
const auto&& bag = mesh.BagOfEltType(felt_space_dimension);
......@@ -193,9 +194,15 @@ namespace MoReFEM
{
assert(!(!geometric_type_ptr));
if (domain.GetUniqueId() == 3)
std::cout << "FELT 0" << std::endl;
if (!domain.DoRefGeomEltMatchCriteria(*geometric_type_ptr))
continue;
if (domain.GetUniqueId() == 3)
std::cout << "FELT 10" << std::endl;
auto&& ref_felt_space_ptr =
std::make_unique<const Internal::RefFEltNS::RefLocalFEltSpace>(geometric_type_ptr,
unknown_storage,
......@@ -213,9 +220,14 @@ namespace MoReFEM
static_cast<std::size_t>(geometric_elt_range.second - geometric_elt_range.first);
local_felt_space_list.reserve(Ngeometric_elt_in_range);
if (domain.GetUniqueId() == 3)
std::cout << "FELT 20" << std::endl;
for (auto it = geometric_elt_range.first; it != geometric_elt_range.second; ++it)
{
if (domain.GetUniqueId() == 3)
std::cout << "FELT 30" << std::endl;
const auto& geometric_elt_ptr = *it;
assert(!(!geometric_elt_ptr));
const auto& geometric_elt = *geometric_elt_ptr;
......@@ -223,16 +235,23 @@ namespace MoReFEM
if (domain.IsGeometricEltInside(geometric_elt))
{
if (domain.GetUniqueId() == 3)
std::cout << "FELT 35" << std::endl;
auto&& ptr = new LocalFEltSpace(*ref_felt_space_ptr, geometric_elt_ptr);
local_felt_space_list.insert({ geometric_elt.GetIndex(), LocalFEltSpace::shared_ptr(ptr)});
}
}
if (domain.GetUniqueId() == 3)
std::cout << "FELT 40" << std::endl;
assert(Ngeometric_elt_in_range >= local_felt_space_list.size()); // equal if no domain restriction applied.
if (local_felt_space_list.empty()) // might happen if for instance RefGeomElt not considered in the domain.
continue;
if (domain.GetUniqueId() == 3)
std::cout << "FELT 50" << std::endl;
felt_list_per_type.push_back(std::make_pair(std::move(ref_felt_space_ptr), local_felt_space_list));
}
......
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