56th / drops Goto Github PK

Hello, Professor. I installed drops and its related dependencies, but when I execute make surfactant, I get an error.

/src/surfactant/surfactant.cpp: In function ‘void Strategy(DROPS::MultiGridCL&, DROPS::AdapTriangCL&, DROPS::LevelsetP2CL&)’:
/home/test/Desktop/drops-1/drops-1/src/surfactant/surfactant.cpp:840:43: error: cannot convert ‘DROPS::InstatScalarFunction {aka std::function<double(const DROPS::SVectorCL<3>&, double)>}’ to ‘dist_funT {aka double (*)(const DROPS::SVectorCL<3>&, double)}’ for argument ‘3’ to ‘void LSInit(const DROPS::MultiGridCL&, DROPS::VecDescCL&, dist_funT, double)’
     LSInit( mg, lset.Phi, the_lset_fun, 0.);

I haven't modified any code. What is the problem?

Add parameter "Surface.Params.Torus.Axis" to json and to torus ctor. Right now axis is "fixed" to z, i.e. level-set/dist func depends on (x, y).

We need the following:
"Surface.Params.Torus.Axis" = 0 -> phi = phi(x[1], x[2])
"Surface.Params.Torus.Axis" = 1 -> phi = phi(x[0], x[2])
"Surface.Params.Torus.Axis" = 2 -> phi = phi(x[0], x[1])

Will be useful for Rayleigh-Taylor instability test and maybe in the future.