Commit a22c444f authored by jonas.kusch's avatar jonas.kusch
Browse files

fixed stuff from merge

parent 08bbc9ad
Pipeline #117705 failed with stages
in 27 minutes and 2 seconds
......@@ -93,7 +93,6 @@ CSDSolverTrafoFP::CSDSolverTrafoFP( Config* settings ) : SNSolver( settings ) {
}
std::cout<<"];"<<std::endl;*/
}
// recompute scattering kernel. TODO: add this to kernel function
for( unsigned p = 0; p < _nq; ++p ) {
......@@ -103,13 +102,8 @@ CSDSolverTrafoFP::CSDSolverTrafoFP( Config* settings ) : SNSolver( settings ) {
_scatteringKernel( p, p ) = _weights[p];
}
<<<<<<< HEAD
_density = Vector( _nCells, 1.0 );
_density = std::vector<double>( _nCells, 1.0 );
// exit(EXIT_SUCCESS);
=======
_density = std::vector<double> ( _nCells, 1.0 );
//exit(EXIT_SUCCESS);
>>>>>>> Resolved inconsistencies in _density declaration, corrected minor error in test cases
}
void CSDSolverTrafoFP::Solve() {
......
Supports Markdown
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