Commit 55a1b6e9 authored by Benoît LÉ's avatar Benoît LÉ

Modifications to take into account modifications in xPostProcessingManager API

+ update of dam_3pt_bending main.cc
parent 5674ef64
......@@ -91,8 +91,9 @@ void Display::stepOut(string str)
}
TLSPostProcessing::TLSPostProcessing(const xParseData& parse_data_, xexport::xExport& pexport_, xEntityFilter filter)
: xPostProcessingManager(parse_data_, pexport_, filter)
: xPostProcessingManager(pexport_, filter)
{
initExportManager(parse_data_, "export_manager", parse_data_.getInt("nb_step_max"));
}
void TLSPostProcessing::archiveSave(int step)
......
......@@ -289,7 +289,7 @@ TLSGeom::TLSGeom(xData& data, const xParseData& parse_data, PreProcessing& pre_p
xIntegrationRuleBasic(integ_order)); // TODO to change in a near futur 08/01/16
// PARA : warning if use of something else then xAcceptAll for filter, it will have to be coherent across process
post_pro.init(*comp_mesh);
post_pro.initSensors(*comp_mesh, parse_data, "export_sensors_label", "export_sensors_point");
}
TLSGeom::~TLSGeom()
......@@ -1092,7 +1092,7 @@ void TLSGeom::cutCrack(const xEval<double>& eval_phi_minus_lc)
}
// para : getpartion with integ_mesh to be checked
createIntegrationPoints();
post_pro.reinit(getMesh());
post_pro.reinitMesh(getMesh());
}
void TLSGeom::cleanCrack()
......
......@@ -15,15 +15,21 @@ struct MeasureDisp
{
}
void operator()(int step) { post_pro.exportOnTime("CMOD", (double)step, eval_disp_1); }
void operator()(int step)
{
std::cout << " totototo " << std::endl;
post_pro.exportOnTime("CMOD", (double)step, eval_disp_1);
}
xfem::xExtractCompVector<> comp_1;
xfem::xEvalField<xfem::xExtractCompVector<>> eval_disp_1;
xtensor::xExtractCompVector<> comp_1;
xfem::xEvalField<xtensor::xExtractCompVector<>> eval_disp_1;
TLSPostProcessing& post_pro;
};
int main(int argc, char* argv[])
{
xtool::xMPIEnv::init(argc, argv);
RegisterMaterials();
std::string data_filename, archive_filename;
......@@ -33,9 +39,10 @@ int main(int argc, char* argv[])
xParseData parse_data;
ReadData(data_filename, data, parse_data);
xexport::xExportGmshAscii pexport;
PreProcessing pre_pro(archive_filename);
TLSPostProcessing post_pro(parse_data);
TLSGeom tls_geom(data, parse_data, pre_pro, post_pro);
TLSPostProcessing post_pro(parse_data, pexport);
TLSGeom tls_geom(data, parse_data, pre_pro, post_pro, MPI_COMM_WORLD);
TLSSolver tls_solver(tls_geom, parse_data, pre_pro, post_pro);
QSFormulation formulation(tls_geom, tls_solver, data, parse_data, pre_pro, post_pro);
Algorithm algorithm(formulation, parse_data);
......@@ -43,5 +50,8 @@ int main(int argc, char* argv[])
formulation.addMeasureFunction(MeasureDisp(formulation.getDispField(), post_pro));
algorithm.run(pre_pro.getStep());
return 0;
// wait every destruction done
MPI_Barrier(MPI_COMM_WORLD);
return xtool::xMPIEnv::finalize();
}
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