Commit 4d400357 authored by Antonio Cervone's avatar Antonio Cervone
Browse files

fix new structure module compilation with clang

parent be160539
......@@ -1301,7 +1301,7 @@ template <typename Mesh, typename SolverType>
void
StructuralOperator<Mesh, SolverType>::initialize ( const function& d0, const function& w0, const function& a0 )
{
M_FESpace->interpolate (d0, *M_disp, 0.0);
M_FESpace->interpolate ( static_cast<typename FESpace<Mesh, MapEpetra>::function_Type> ( d0 ), *M_disp, 0.0);
//M_FESpace->interpolate(w0, *M_vel , 0.0);
// M_FESpace->interpolate(a0, *M_acc , 0.0);
}
......
......@@ -392,13 +392,8 @@ problem::run()
for ( UInt previousPass = 0; previousPass < dataProblem->dataTimeAdvance()->orderBDF() ; previousPass++)
{
Real previousTimeStep = -previousPass * dt;
// <<<<<<< HEAD
feSpace->interpolate (uexact, *U, previousTimeStep );
feSpace->interpolate (static_cast<FESpace_type::function_Type> (uexact ), *U, previousTimeStep );
uv0.push_back (U);
// =======
// feSpace->interpolate( static_cast<FESpace_type::function_Type>( uexact ), *U, previousTimeStep );
// uv0.push_back(*U);
//>>>>>>> master
}
}
......
......@@ -385,13 +385,8 @@ problem::run()
for ( UInt previousPass = 0; previousPass < dataProblem->dataTimeAdvance()->orderBDF() ; previousPass++)
{
Real previousTimeStep = -previousPass * dt;
// <<<<<<< HEAD
feSpace->interpolate (uexact, *U, previousTimeStep );
feSpace->interpolate (static_cast<FESpace_type::function_Type> ( uexact ), *U, previousTimeStep );
uv0.push_back (U);
// =======
// feSpace->interpolate( static_cast<FESpace_type::function_Type>( uexact ), *U, previousTimeStep);
// uv0.push_back(*U);
//>>>>>>> master
}
}
......
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