Commit 303497a5 authored by GILLES Sebastien's avatar GILLES Sebastien

#1473 Make the case 'Parallel' (which writes the prepartitioned data in the...

#1473 Make the case 'Parallel' (which writes the prepartitioned data in the output directory) work. I hd to modify the interface of WritePartitionData: there was no need to add a subdir and a subcript about mesh and rank.
parent ed16dd85
......@@ -58,7 +58,7 @@ thus Doxygen can't connect the dot with the provided parameter).
## Utilities / ThirdParty
- Feature #1453 PetscVector: enrich the way a vector can be built with more reloading from files.
- Feature #1453 PetscVector: enrich the way a vector can be built with more reloading from files.
- Bug #1455: Vector::InitFromSequentialFile didn't work due to "filler" lines in Matlab format.
- Bug #1452: Reloading Petsc Vector didn't work as expected.
......
......@@ -3473,6 +3473,7 @@
BE3B364F1D9183A700DB81A3 /* Ensight4Stokes */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Ensight4Stokes; sourceTree = BUILT_PRODUCTS_DIR; };
BE3B366D1D9183C200DB81A3 /* Ensight4Heat */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Ensight4Heat; sourceTree = BUILT_PRODUCTS_DIR; };
BE3B368B1D9183FD00DB81A3 /* Ensight4RivlinCube */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Ensight4RivlinCube; sourceTree = BUILT_PRODUCTS_DIR; };
BE3B7E2822F02AFE00F76A79 /* demo_test.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_test.lua; sourceTree = "<group>"; };
BE3D12B91D9B1FFB00F900F5 /* KspConvergenceReason.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KspConvergenceReason.cpp; sourceTree = "<group>"; };
BE3D12BA1D9B1FFB00F900F5 /* KspConvergenceReason.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = KspConvergenceReason.hpp; sourceTree = "<group>"; };
BE3D12BB1D9B1FFB00F900F5 /* KspConvergenceReason.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = KspConvergenceReason.hxx; sourceTree = "<group>"; };
......@@ -5539,6 +5540,7 @@
BE0AFB7220750C570089FD9D /* CMakeLists.txt */,
BEB0C6171EC3054500D62905 /* README */,
BE6EA6201EC330820085E651 /* demo_input_hyperelasticity.lua */,
BE3B7E2822F02AFE00F76A79 /* demo_test.lua */,
BECEF93522DF7B0200D0DDE7 /* demo_result_directory_start_time.lua */,
137F2B091E38B22900BD6083 /* InputData.hpp */,
137F2B0A1E38B22900BD6083 /* main.cpp */,
......@@ -68,6 +68,10 @@
</CommandLineArgument>
<CommandLineArgument
argument = "-i ${HOME}/Codes/MoReFEM/CoreLibrary/Sources/ModelInstances/Hyperelasticity/demo_result_directory_start_time.lua"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-i ${HOME}/Codes/MoReFEM/CoreLibrary/Sources/ModelInstances/Hyperelasticity/demo_test.lua"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
......
......@@ -46,7 +46,7 @@ namespace MoReFEM::Internal::InputDataNS::ParallelismNS
const std::string& Policy::DefaultValue()
{
static std::string ret("'Parallel'");
static std::string ret("'ParallelNoWrite'");
return ret;
}
......
......@@ -1041,8 +1041,6 @@ namespace MoReFEM
}
} // namespace anonymous
......
......@@ -42,10 +42,8 @@ namespace MoReFEM::Advanced::MeshNS
const std::string& output_directory,
::MoReFEM::MeshNS::Format format)
{
const auto rank = mpi.GetRank<int>();
std::ostringstream oconv;
oconv << output_directory << "/Mesh_" << mesh.GetUniqueId() << "/mesh_" << rank << '.';
oconv << output_directory << "/mesh" << '.';
using namespace ::MoReFEM::MeshNS;
......@@ -75,7 +73,7 @@ namespace MoReFEM::Advanced::MeshNS
} // switch
oconv.str("");
oconv << output_directory << "/Mesh_" << mesh.GetUniqueId() << "/mesh_data_" << rank << ".lua";
oconv << output_directory << "/mesh_data.lua";
partition_data_file_ = oconv.str();
std::ofstream out;
......
......@@ -595,7 +595,8 @@ namespace MoReFEM
auto& system_solution = GetNonCstSystemSolution(displacement_numbering_subset);
const auto& velocity_previous_time_iteration = GetVectorCurrentVelocity();
Wrappers::Petsc::AXPY(GetTimeManager().GetTimeStep(), velocity_previous_time_iteration, system_solution, __FILE__, __LINE__);
Wrappers::Petsc::AXPY(GetTimeManager().GetTimeStep(), velocity_previous_time_iteration, system_solution,
__FILE__, __LINE__);
system_solution.UpdateGhosts(__FILE__, __LINE__);
}
......
This diff is collapsed.
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