Commit 045ec045 authored by Benoît LÉ's avatar Benoît LÉ

Modifications to take into account modifications in xFastMarching

Corresponding to commit 362685b2 in Xfiles
parent 0749965d
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
#ifdef HAVE_FASTMARCHING #ifdef HAVE_FASTMARCHING
#include "meshinterfacexRegion.h" #include "meshinterfacexRegion.h"
#include "FM.h" #include "FM.h"
#include "FMEntityStorage.h"
template < typename T >
using datamanagerFM_t = xfastmarching::entitystorage < xfastmarching::meshinterfacexRegion, AOMD::mVertex,T >;
#endif #endif
// std // std
#include <functional> #include <functional>
...@@ -96,7 +99,7 @@ void FastMarchingReinit(std::function<double (AOMD::mVertex*)> get_val, ...@@ -96,7 +99,7 @@ void FastMarchingReinit(std::function<double (AOMD::mVertex*)> get_val,
xfastmarching::entitytovertexiteratorconvertor<ITERKNOWNV> trial_known_volatil_conv_begin(known_volatil_begin); xfastmarching::entitytovertexiteratorconvertor<ITERKNOWNV> trial_known_volatil_conv_begin(known_volatil_begin);
xfastmarching::entitytovertexiteratorconvertor<ITERKNOWNV> trial_known_volatil_conv_end(known_volatil_end); xfastmarching::entitytovertexiteratorconvertor<ITERKNOWNV> trial_known_volatil_conv_end(known_volatil_end);
xfastmarching::entitytovertexiteratorconvertor<ITERKNOWNT> known_conv_it(known_it); xfastmarching::entitytovertexiteratorconvertor<ITERKNOWNT> known_conv_it(known_it);
xfastmarching::fmeik(mi, ls, trial_known_conv_begin, trial_known_conv_end,trial_known_volatil_conv_begin, trial_known_volatil_conv_end, known_conv_it, f_func, epsilon_ratio, gls); xfastmarching::fmeik<datamanagerFM_t>(mi, ls, trial_known_conv_begin, trial_known_conv_end,trial_known_volatil_conv_begin, trial_known_volatil_conv_end, known_conv_it, f_func, epsilon_ratio, gls);
for(auto it=region.begin(0); it!=region.end(0); ++it) { for(auto it=region.begin(0); it!=region.end(0); ++it) {
auto v=static_cast<AOMD::mVertex*>(*it); auto v=static_cast<AOMD::mVertex*>(*it);
double val; double val;
...@@ -145,7 +148,7 @@ void FastMarchingModeExtension(std::function<double (AOMD::mVertex*)> get_val, ...@@ -145,7 +148,7 @@ void FastMarchingModeExtension(std::function<double (AOMD::mVertex*)> get_val,
std::vector<const AOMD::mVertex*> vec; std::vector<const AOMD::mVertex*> vec;
vec.reserve(nb_modes); vec.reserve(nb_modes);
xfastmarching::entitytovertexiteratorconvertor<std::back_insert_iterator<std::vector<const AOMD::mVertex*>>> dummy_it(std::back_inserter(vec)); xfastmarching::entitytovertexiteratorconvertor<std::back_insert_iterator<std::vector<const AOMD::mVertex*>>> dummy_it(std::back_inserter(vec));
fmeik(mi, ls, known_conv_begin, known_conv_end,known_volatil_conv_begin, known_volatil_conv_end, dummy_it, f_func, epsilon_ratio, gls, vn); xfastmarching::fmeik<datamanagerFM_t>(mi, ls, known_conv_begin, known_conv_end,known_volatil_conv_begin, known_volatil_conv_end, dummy_it, f_func, epsilon_ratio, gls, vn);
int j=0; int j=0;
for(auto it=region.begin(0); it!=region.end(0); ++it, ++j) { for(auto it=region.begin(0); it!=region.end(0); ++it, ++j) {
auto v=static_cast<AOMD::mVertex*>(*it); auto v=static_cast<AOMD::mVertex*>(*it);
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include "meshinterfacexRegion.h" #include "meshinterfacexRegion.h"
//#include "FastMarching.h" //#include "FastMarching.h"
#include "FM.h" #include "FM.h"
#include "FMEntityStorage.h"
#endif #endif
using namespace xfem; using namespace xfem;
......
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